diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 554cc4a287..10ec7a5a78 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1153,7 +1153,7 @@
 	<string name="type.historic.tomb">سياحة</string>
 	<string name="type.internet_access">واي فاي</string>
 	<string name="type.internet_access.wlan">واي فاي</string>
-	<string name="type.landuse.basin">مياه</string>
+	<string name="type.landuse.basin">حوض المياه</string>
 	<string name="type.landuse.cemetery">مقبرة</string>
 	<string name="type.landuse.cemetery.christian">مقبرة</string>
 	<string name="type.landuse.churchyard">فناء الكنيسة</string>
@@ -1205,14 +1205,17 @@
 	<string name="type.natural.glacier">كتلة جليدية</string>
 	<string name="type.natural.grassland">ملعب</string>
 	<string name="type.natural.water.lake">بحيرة</string>
-	<string name="type.natural.peak">قمة</string>
 	<string name="type.natural.water.pond">بركة</string>
+	<string name="type.natural.water.reservoir">خزان</string>
+	<string name="type.natural.water.basin">حوض المياه</string>
+	<string name="type.natural.water.river">نهر</string>
+	<string name="type.natural.peak">قمة</string>
 	<string name="type.natural.scrub">أَيْكَة</string>
 	<string name="type.natural.spring">ينبوع</string>
 	<string name="type.natural.strait">مضيق</string>
 	<string name="type.natural.tree">شجرة</string>
 	<string name="type.natural.volcano">بركان</string>
-	<string name="type.natural.water">مياه</string>
+	<string name="type.natural.water">مسطح مائي</string>
 	<string name="type.natural.wetland">منطقة رطبة</string>
 	<string name="type.office">مكتب</string>
 	<string name="type.office.company">مكتب شركة</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index c11d0000fe..40b8ea34a5 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -850,9 +850,28 @@
 	<string name="type.barrier.lift_gate">Шлагбаўм</string>
 	<string name="type.barrier.swing_gate">Шлагбаўм</string>
 	<string name="type.healthcare.laboratory">Медыцынская лабараторыя</string>
+	<string name="type.landuse.basin">Рэзервуар</string>
 	<string name="type.leisure.picnic_table">Стол для пікніка</string>
 	<string name="type.man_made.silo">Сілас</string>
 	<string name="type.man_made.storage_tank">Рэзервуар</string>
 	<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.pond">Сажалка</string>
+	<string name="type.natural.water.reservoir">Вадасховішча</string>
+	<string name="type.natural.water.basin">Рэзервуар</string>
+	<string name="type.natural.water.river">Рака</string>
+	<string name="type.natural.land">Суша</string>
+	<string name="type.natural.meadow">Луг</string>
+	<string name="type.natural.orchard">Сад</string>
+	<string name="type.natural.peak">Вяршыня</string>
 	<string name="type.natural.saddle">Седлавіна</string>
+	<string name="type.natural.water">Вадаём</string>
+	<string name="type.waterway.river">Рака</string>
+	<string name="type.waterway.river.tunnel">Рака</string>
+	<string name="type.waterway.riverbank">Рака</string>
+	<string name="type.waterway.stream">Рака</string>
+	<string name="type.waterway.stream.ephemeral">Рака</string>
+	<string name="type.waterway.stream.intermittent">Рака</string>
+	<string name="type.waterway.stream.tunnel">Рака</string>
 </resources>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 5279728ed0..7f8f65326f 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1147,7 +1147,7 @@
 	<string name="type.historic.ruins">Ruiny</string>
 	<string name="type.historic.ship">Pamětihodnost</string>
 	<string name="type.historic.tomb">Pamětihodnost</string>
-	<string name="type.landuse.basin">Voda</string>
+	<string name="type.landuse.basin">Vodní nádrž</string>
 	<string name="type.landuse.cemetery">Hřbitov</string>
 	<string name="type.landuse.cemetery.christian">Hřbitov</string>
 	<string name="type.landuse.churchyard">Nádvoří kostela</string>
@@ -1199,14 +1199,17 @@
 	<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.peak">Hora</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>
+	<string name="type.natural.water.river">Řeka</string>
+	<string name="type.natural.peak">Hora</string>
 	<string name="type.natural.scrub">Křoviny</string>
 	<string name="type.natural.spring">Pramen</string>
 	<string name="type.natural.strait">Průliv</string>
 	<string name="type.natural.tree">Strom</string>
 	<string name="type.natural.volcano">Sopka</string>
-	<string name="type.natural.water">Voda</string>
+	<string name="type.natural.water">Vodní plocha</string>
 	<string name="type.natural.wetland">Mokřadní oblast</string>
 	<string name="type.office">Kancelář</string>
 	<string name="type.office.company">Kancelář společnosti</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 262f94e7b9..5f7c90a141 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1140,7 +1140,7 @@
 	<string name="type.historic.ruins">Ruiner</string>
 	<string name="type.historic.ship">Turisme</string>
 	<string name="type.historic.tomb">Turisme</string>
-	<string name="type.landuse.basin">Vand</string>
+	<string name="type.landuse.basin">Vandbassin</string>
 	<string name="type.landuse.cemetery">Kirkegård</string>
 	<string name="type.landuse.cemetery.christian">Kirkegård</string>
 	<string name="type.landuse.churchyard">Kirkegård</string>
@@ -1190,14 +1190,17 @@
 	<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.peak">Bjerg</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>
+	<string name="type.natural.water.river">Flod</string>
+	<string name="type.natural.peak">Bjerg</string>
 	<string name="type.natural.scrub">Kratbevokset område</string>
 	<string name="type.natural.spring">Kilde</string>
 	<string name="type.natural.strait">Stræde</string>
 	<string name="type.natural.tree">Træ</string>
 	<string name="type.natural.volcano">Vulkan</string>
-	<string name="type.natural.water">Vand</string>
+	<string name="type.natural.water">Vandmasse</string>
 	<string name="type.natural.wetland">Vådområde</string>
 	<string name="type.office">Kontor</string>
 	<string name="type.office.company">Selskabskontor</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 203050d15b..6004ba0bde 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1170,7 +1170,7 @@
 	<string name="type.historic.ruins">Ruinen</string>
 	<string name="type.historic.ship">Schiff</string>
 	<string name="type.historic.tomb">Grabstätte</string>
-	<string name="type.landuse.basin">Wasserfläche</string>
+	<string name="type.landuse.basin">Wasserbecken</string>
 	<string name="type.landuse.cemetery">Friedhof</string>
 	<string name="type.landuse.cemetery.christian">Friedhof</string>
 	<string name="type.landuse.churchyard">Kirchenhof</string>
@@ -1220,8 +1220,11 @@
 	<string name="type.natural.glacier">Gletscher</string>
 	<string name="type.natural.grassland">Grasland</string>
 	<string name="type.natural.water.lake">See</string>
-	<string name="type.natural.peak">Berg</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>
+	<string name="type.natural.water.river">Fluss</string>
+	<string name="type.natural.peak">Berg</string>
 	<string name="type.natural.scrub">Dickicht</string>
 	<string name="type.natural.spring">Quelle</string>
 	<string name="type.natural.strait">Meerenge</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index c7de5300e7..2931f25eed 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1141,7 +1141,7 @@
 	<string name="type.historic.tomb">Αξιοθέατο</string>
 	<string name="type.internet_access">Ίντερνετ</string>
 	<string name="type.internet_access.wlan">Ίντερνετ</string>
-	<string name="type.landuse.basin">Νερό</string>
+	<string name="type.landuse.basin">Μια λεκάνη νερού</string>
 	<string name="type.landuse.cemetery">Νεκροταφείο</string>
 	<string name="type.landuse.cemetery.christian">Νεκροταφείο</string>
 	<string name="type.landuse.churchyard">Αυλόγυρος εκκλησίας</string>
@@ -1193,14 +1193,17 @@
 	<string name="type.natural.glacier">Παγετώνας</string>
 	<string name="type.natural.grassland">Λιβάδι</string>
 	<string name="type.natural.water.lake">Λίμνη</string>
-	<string name="type.natural.peak">Κορυφή</string>
 	<string name="type.natural.water.pond">Δεξαμενή</string>
+	<string name="type.natural.water.reservoir">Δεξαμενή</string>
+	<string name="type.natural.water.basin">Μια λεκάνη νερού</string>
+	<string name="type.natural.water.river">Ποταμός</string>
+	<string name="type.natural.peak">Κορυφή</string>
 	<string name="type.natural.scrub">Θαμνώδες περιοχή</string>
 	<string name="type.natural.spring">Πηγή νερού</string>
 	<string name="type.natural.strait">Πορθμός</string>
 	<string name="type.natural.tree">Δέντρο</string>
 	<string name="type.natural.volcano">Ηφαίστειο</string>
-	<string name="type.natural.water">Νερό</string>
+	<string name="type.natural.water">Σώμα νερού</string>
 	<string name="type.natural.wetland">Υγρότοπος</string>
 	<string name="type.office">Γραφείο</string>
 	<string name="type.office.company">Γραφείο επιχείρησης</string>
diff --git a/android/res/values-en-rGB/strings.xml b/android/res/values-en-rGB/strings.xml
index 05d5b8d80b..5201fa71bf 100644
--- a/android/res/values-en-rGB/strings.xml
+++ b/android/res/values-en-rGB/strings.xml
@@ -12,4 +12,7 @@
 	<string name="measurement_units_summary">Choose between miles and kilometres</string>
 	<!-- Search category -->
 	<string name="fuel">Petrol</string>
+
+	<!-- SECTION: Types -->
+	<string name="type.highway.elevator">Lift</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 78f134d526..c9a1727d5d 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -941,7 +941,7 @@
 	<string name="type.amenity.veterinary">Clínica veterinaria</string>
 	<string name="type.amenity.waste_basket">Papelera</string>
 	<string name="type.amenity.waste_disposal">Basura</string>
-	<string name="type.amenity.water_point">Fuente de agua potable</string>
+	<string name="type.amenity.water_point">Fuente de agua</string>
 	<string name="type.barrier.block">Bloque</string>
 	<string name="type.barrier.bollard">Bolardo</string>
 	<string name="type.barrier.border_control">Control de fronteras</string>
@@ -1217,14 +1217,17 @@
 	<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.peak">Cima</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>
+	<string name="type.natural.water.river">Río</string>
+	<string name="type.natural.peak">Cima</string>
 	<string name="type.natural.scrub">Matorrales</string>
 	<string name="type.natural.spring">Manantial</string>
 	<string name="type.natural.strait">Estrecho</string>
 	<string name="type.natural.tree">Árbol</string>
 	<string name="type.natural.volcano">Volcán</string>
-	<string name="type.natural.water">Cuenca</string>
+	<string name="type.natural.water">Cuerpo de agua</string>
 	<string name="type.natural.wetland">Terreno pantanoso</string>
 	<string name="type.office">Oficina</string>
 	<string name="type.office.company">Oficina</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index dedb3c7a82..95fd65c197 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -1055,7 +1055,7 @@
 	<string name="type.historic.tomb">گردشگری</string>
 	<string name="type.internet_access">وای فای</string>
 	<string name="type.internet_access.wlan">وای فای</string>
-	<string name="type.landuse.basin">اب</string>
+	<string name="type.landuse.basin">حوضه آب</string>
 	<string name="type.landuse.cemetery">قبرستان</string>
 	<string name="type.landuse.cemetery.christian">قبرستان</string>
 	<string name="type.landuse.churchyard">حیاط کلیسا</string>
@@ -1105,14 +1105,17 @@
 	<string name="type.natural.glacier">یخچال طبیعی</string>
 	<string name="type.natural.grassland">کشتزار</string>
 	<string name="type.natural.water.lake">دریاچه</string>
-	<string name="type.natural.peak">قله</string>
 	<string name="type.natural.water.pond">تالاب</string>
+	<string name="type.natural.water.reservoir">مخزن</string>
+	<string name="type.natural.water.basin">حوضه آب</string>
+	<string name="type.natural.water.river">رودخانه</string>
+	<string name="type.natural.peak">قله</string>
 	<string name="type.natural.scrub">بوته زار</string>
 	<string name="type.natural.spring">چشمه</string>
 	<string name="type.natural.strait">تنگه</string>
 	<string name="type.natural.tree">درخت</string>
 	<string name="type.natural.volcano">اتشفشان</string>
-	<string name="type.natural.water">اب</string>
+	<string name="type.natural.water">پهنه آبی</string>
 	<string name="type.natural.wetland">ناحیه تالابی</string>
 	<string name="type.office">اداره</string>
 	<string name="type.office.company">دفتر شرکت</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index c2cdf62036..8fba87e051 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -1165,7 +1165,7 @@
 	<string name="type.historic.ruins">Rauniot</string>
 	<string name="type.historic.ship">Nähtävyydet</string>
 	<string name="type.historic.tomb">Nähtävyydet</string>
-	<string name="type.landuse.basin">Vesi</string>
+	<string name="type.landuse.basin">Vesisäiliö</string>
 	<string name="type.landuse.cemetery">Hautausmaa</string>
 	<string name="type.landuse.cemetery.christian">Hautausmaa</string>
 	<string name="type.landuse.churchyard">Kirkon piha</string>
@@ -1217,14 +1217,17 @@
 	<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.peak">Huippu</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>
+	<string name="type.natural.water.river">Joki</string>
+	<string name="type.natural.peak">Huippu</string>
 	<string name="type.natural.scrub">Tiheiköt</string>
 	<string name="type.natural.spring">Lähde</string>
 	<string name="type.natural.strait">Salmi</string>
 	<string name="type.natural.tree">Puu</string>
 	<string name="type.natural.volcano">Tulivuori</string>
-	<string name="type.natural.water">Vesi</string>
+	<string name="type.natural.water">Vesimuodostuma</string>
 	<string name="type.natural.wetland">Suoperäinen seutu</string>
 	<string name="type.office">Toimisto</string>
 	<string name="type.office.company">Yhtiön toimisto</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 89ef64ebf5..2402e0be62 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1208,7 +1208,7 @@
 	<string name="type.historic.wayside_shrine">Oratoire</string>
 	<string name="type.junction.roundabout">Rond-point</string>
 	<string name="type.landuse.allotments">Jardins familiaux</string>
-	<string name="type.landuse.basin">Eau</string>
+	<string name="type.landuse.basin">Réservoir</string>
 	<string name="type.landuse.brownfield">Friche industrielle</string>
 	<string name="type.landuse.cemetery">Cimetière</string>
 	<string name="type.landuse.cemetery.christian">Cimetière</string>
@@ -1287,9 +1287,12 @@
 	<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.pond">Étang</string>
+	<string name="type.natural.water.reservoir">Réservoir</string>
+	<string name="type.natural.water.basin">Réservoir</string>
+	<string name="type.natural.water.river">Rivière</string>
 	<string name="type.natural.peak">Sommet</string>
 	<string name="type.natural.saddle">Col de montagne</string>
-	<string name="type.natural.water.pond">Étang</string>
 	<string name="type.natural.rock">Rocher</string>
 	<string name="type.natural.scrub">Fourré</string>
 	<string name="type.natural.spring">Source</string>
@@ -1297,7 +1300,7 @@
 	<string name="type.natural.tree">Arbre</string>
 	<string name="type.natural.tree_row">Rangée d\'arbre</string>
 	<string name="type.natural.volcano">Volcan</string>
-	<string name="type.natural.water">Eau</string>
+	<string name="type.natural.water">Étendue d\'eau</string>
 	<string name="type.natural.wetland">Zone humide</string>
 	<string name="type.natural.wetland.bog">Tourbière</string>
 	<string name="type.natural.wetland.marsh">Marais</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index c2ba027968..16fbcbc619 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1147,7 +1147,7 @@
 	<string name="type.historic.ruins">Romok</string>
 	<string name="type.historic.ship">Túrizmus</string>
 	<string name="type.historic.tomb">Túrizmus</string>
-	<string name="type.landuse.basin">Víz</string>
+	<string name="type.landuse.basin">Vízgyűjtő</string>
 	<string name="type.landuse.cemetery">Temető</string>
 	<string name="type.landuse.cemetery.christian">Temető</string>
 	<string name="type.landuse.churchyard">Templomtér</string>
@@ -1198,14 +1198,17 @@
 	<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.peak">Csúcs</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>
+	<string name="type.natural.water.river">Folyó</string>
+	<string name="type.natural.peak">Csúcs</string>
 	<string name="type.natural.scrub">Cserjés</string>
 	<string name="type.natural.spring">Forrás</string>
 	<string name="type.natural.strait">Szoros</string>
 	<string name="type.natural.tree">Fa</string>
 	<string name="type.natural.volcano">Tűzhányó</string>
-	<string name="type.natural.water">Víz</string>
+	<string name="type.natural.water">Vizek</string>
 	<string name="type.natural.wetland">Vizes terület</string>
 	<string name="type.office">Hivatal</string>
 	<string name="type.office.company">Vállalati iroda</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index fcdf9067dd..ecc9800a6f 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -1145,7 +1145,7 @@
 	<string name="type.historic.ruins">Reruntuhan</string>
 	<string name="type.historic.ship">Pemandangan</string>
 	<string name="type.historic.tomb">Pemandangan</string>
-	<string name="type.landuse.basin">Air</string>
+	<string name="type.landuse.basin">Sebuah baskom air</string>
 	<string name="type.landuse.cemetery">Pemakaman</string>
 	<string name="type.landuse.cemetery.christian">Pemakaman</string>
 	<string name="type.landuse.churchyard">Halaman gereja</string>
@@ -1196,14 +1196,17 @@
 	<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.peak">Puncak</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>
+	<string name="type.natural.water.river">Sungai</string>
+	<string name="type.natural.peak">Puncak</string>
 	<string name="type.natural.scrub">Semak</string>
 	<string name="type.natural.spring">Mata air</string>
 	<string name="type.natural.strait">Selat</string>
 	<string name="type.natural.tree">Pohon</string>
 	<string name="type.natural.volcano">Gunung berapi</string>
-	<string name="type.natural.water">Air</string>
+	<string name="type.natural.water">Perairan</string>
 	<string name="type.natural.wetland">Area lahan basah</string>
 	<string name="type.office">Kantor</string>
 	<string name="type.office.company">Kantor perusahaan</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 3ea46f8413..d237e2890a 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -1139,7 +1139,7 @@
 	<string name="type.historic.ruins">Rovine</string>
 	<string name="type.historic.ship">Turistico</string>
 	<string name="type.historic.tomb">Turistico</string>
-	<string name="type.landuse.basin">Bacino</string>
+	<string name="type.landuse.basin">Bacino d\'acqua</string>
 	<string name="type.landuse.cemetery">Cimitero</string>
 	<string name="type.landuse.cemetery.christian">Cimitero</string>
 	<string name="type.landuse.churchyard">Sagrato della chiesa</string>
@@ -1191,15 +1191,18 @@
 	<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.pond">Stagno</string>
+	<string name="type.natural.water.reservoir">Serbatoio</string>
+	<string name="type.natural.water.basin">Bacino d\'acqua</string>
+	<string name="type.natural.water.river">Fiume</string>
 	<string name="type.natural.peak">Monte</string>
 	<string name="type.natural.saddle">Sella</string>
-	<string name="type.natural.water.pond">Stagno</string>
 	<string name="type.natural.scrub">Boscaglia</string>
 	<string name="type.natural.spring">Sorgente</string>
 	<string name="type.natural.strait">Stretto</string>
 	<string name="type.natural.tree">Albero</string>
 	<string name="type.natural.volcano">Vulcano</string>
-	<string name="type.natural.water">Bacino</string>
+	<string name="type.natural.water">Corpo d\'acqua</string>
 	<string name="type.natural.wetland">Terreno paludoso</string>
 	<string name="type.office">Ufficio</string>
 	<string name="type.office.company">Ufficio aziendale</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index aba5b3b33c..b99272e316 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1194,7 +1194,7 @@
 	<string name="type.junction.roundabout">ラウンドアバウト</string>
 	<string name="type.landuse">土地利用</string>
 	<string name="type.landuse.allotments">市民農園</string>
-	<string name="type.landuse.basin">遊水地</string>
+	<string name="type.landuse.basin">水地</string>
 	<string name="type.landuse.brownfield">再開発用地</string>
 	<string name="type.landuse.cemetery">墓地</string>
 	<string name="type.landuse.cemetery.christian">キリスト教墓地</string>
@@ -1288,11 +1288,14 @@
 	<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.pond">池</string>
+	<string name="type.natural.water.reservoir">貯水池</string>
+	<string name="type.natural.water.basin">水地</string>
+	<string name="type.natural.water.river">河川</string>
 	<string name="type.natural.land">陸地</string>
 	<string name="type.natural.meadow">牧草地</string>
 	<string name="type.natural.orchard">果樹園</string>
 	<string name="type.natural.peak">山頂</string>
-	<string name="type.natural.water.pond">池</string>
 	<string name="type.natural.rock">岩</string>
 	<string name="type.natural.scrub">雑木林</string>
 	<string name="type.natural.spring">泉</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 46b28a4f1a..52e5404a28 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1201,14 +1201,17 @@
 	<string name="type.natural.glacier">빙하</string>
 	<string name="type.natural.grassland">밭</string>
 	<string name="type.natural.water.lake">호수</string>
-	<string name="type.natural.peak">산</string>
 	<string name="type.natural.water.pond">연못이</string>
+	<string name="type.natural.water.reservoir">저수지</string>
+	<string name="type.natural.water.basin">저수지</string>
+	<string name="type.natural.water.river">강</string>
+	<string name="type.natural.peak">산</string>
 	<string name="type.natural.scrub">관목지</string>
 	<string name="type.natural.spring">샘</string>
 	<string name="type.natural.strait">해협</string>
 	<string name="type.natural.tree">나무</string>
 	<string name="type.natural.volcano">화산</string>
-	<string name="type.natural.water">저수지</string>
+	<string name="type.natural.water">수역</string>
 	<string name="type.natural.wetland">습지 구역</string>
 	<string name="type.office">사무실</string>
 	<string name="type.office.company">회사</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index ad9b386b8e..6e34d538da 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -1122,7 +1122,7 @@
 	<string name="type.historic.ruins">Ruiner</string>
 	<string name="type.historic.ship">Severdigheter</string>
 	<string name="type.historic.tomb">Severdigheter</string>
-	<string name="type.landuse.basin">Vann</string>
+	<string name="type.landuse.basin">Vannvask</string>
 	<string name="type.landuse.cemetery">Gravplass</string>
 	<string name="type.landuse.cemetery.christian">Gravplass</string>
 	<string name="type.landuse.churchyard">Kirkegård</string>
@@ -1173,14 +1173,17 @@
 	<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.peak">Høydepunkt</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>
+	<string name="type.natural.water.river">Elv</string>
+	<string name="type.natural.peak">Høydepunkt</string>
 	<string name="type.natural.scrub">Myr</string>
 	<string name="type.natural.spring">Vår</string>
 	<string name="type.natural.strait">Sund</string>
 	<string name="type.natural.tree">Tre</string>
 	<string name="type.natural.volcano">Vulkan</string>
-	<string name="type.natural.water">Vann</string>
+	<string name="type.natural.water">Vassmasse</string>
 	<string name="type.natural.wetland">Våtmarksområde</string>
 	<string name="type.office">Kontor</string>
 	<string name="type.office.company">Firmakontor</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 685c91bd61..1c87b5d97e 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1143,6 +1143,7 @@
 	<string name="type.historic.ruins">Ruïne</string>
 	<string name="type.historic.ship">Toerisme</string>
 	<string name="type.historic.tomb">Toerisme</string>
+	<string name="type.landuse.basin">Waterbassin</string>
 	<string name="type.landuse.cemetery">Begraafplaats</string>
 	<string name="type.landuse.cemetery.christian">Begraafplaats</string>
 	<string name="type.landuse.churchyard">Kerkhof</string>
@@ -1200,11 +1201,14 @@
 	<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.pond">Plas</string>
+	<string name="type.natural.water.reservoir">Reservoir</string>
+	<string name="type.natural.water.basin">Waterbassin</string>
+	<string name="type.natural.water.river">Rivier</string>
 	<string name="type.natural.land">Land</string>
 	<string name="type.natural.meadow">Weiland</string>
 	<string name="type.natural.orchard">Boomgaard</string>
 	<string name="type.natural.peak">Top</string>
-	<string name="type.natural.water.pond">Plas</string>
 	<string name="type.natural.rock">Steen</string>
 	<string name="type.natural.scrub">Kreupel bos</string>
 	<string name="type.natural.spring">Bron</string>
@@ -1213,7 +1217,7 @@
 	<string name="type.natural.tree_row">Bomenrij</string>
 	<string name="type.natural.vineyard">Wijngaard</string>
 	<string name="type.natural.volcano">Vulkaan</string>
-	<string name="type.natural.water">Water</string>
+	<string name="type.natural.water">Waterlichaam</string>
 	<string name="type.natural.wetland">Moerasland</string>
 	<string name="type.natural.wetland.bog">Moeras</string>
 	<string name="type.natural.wetland.marsh">Moeras</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 4bd9e3acc3..de7c35c58a 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1222,7 +1222,7 @@
 	<string name="type.junction.roundabout">Rondo</string>
 	<string name="type.landuse">Zagospodarowanie ziemi</string>
 	<string name="type.landuse.allotments">Działki</string>
-	<string name="type.landuse.basin">Woda</string>
+	<string name="type.landuse.basin">Zbiornik</string>
 	<string name="type.landuse.brownfield">Teren do zabudowy</string>
 	<string name="type.landuse.cemetery">Cmentarz</string>
 	<string name="type.landuse.cemetery.christian">Cmentarz chrześcijański</string>
@@ -1312,10 +1312,13 @@
 	<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.pond">Staw</string>
+	<string name="type.natural.water.reservoir">Zbiornik</string>
+	<string name="type.natural.water.basin">Zbiornik</string>
+	<string name="type.natural.water.river">Rzeka</string>
 	<string name="type.natural.meadow">Łąka</string>
 	<string name="type.natural.orchard">Sad</string>
 	<string name="type.natural.peak">Szczyt</string>
-	<string name="type.natural.water.pond">Staw</string>
 	<string name="type.natural.rock">Skała</string>
 	<string name="type.natural.scrub">Zarośla</string>
 	<string name="type.natural.spring">Źródło</string>
@@ -1324,7 +1327,7 @@
 	<string name="type.natural.tree_row">Rząd drzew</string>
 	<string name="type.natural.vineyard">Winnica</string>
 	<string name="type.natural.volcano">Wulkan</string>
-	<string name="type.natural.water">Woda</string>
+	<string name="type.natural.water">Akwen</string>
 	<string name="type.natural.wetland">Tereny podmokłe</string>
 	<string name="type.natural.wetland.bog">Torfowisko</string>
 	<string name="type.natural.wetland.marsh">Moczary</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 112fae8bd9..27ad4a7906 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -1231,7 +1231,7 @@
 	<string name="type.junction.roundabout">Rotatória</string>
 	<string name="type.landuse">Uso do solo</string>
 	<string name="type.landuse.allotments">Horta comunitária</string>
-	<string name="type.landuse.basin">Água</string>
+	<string name="type.landuse.basin">Reservatório</string>
 	<string name="type.landuse.brownfield">Terreno industrial devoluto</string>
 	<string name="type.landuse.cemetery">Cemitério</string>
 	<string name="type.landuse.cemetery.christian">Cemitério cristão</string>
@@ -1302,7 +1302,7 @@
 	<string name="type.man_made.lighthouse">Farol</string>
 	<string name="type.man_made.pier">Píer</string>
 	<string name="type.man_made.pipeline">Pipeline</string>
-	<string name="type.man_made.pipeline.overground">Pipeline subterrâneo</string>
+	<string name="type.man_made.pipeline.overground">Pipeline aéreo</string>
 	<string name="type.man_made.surveillance">Câmara de vigilância</string>
 	<string name="type.man_made.tower">Torre</string>
 	<string name="type.man_made.wastewater_plant">Estação de tratamento de esgoto</string>
@@ -1327,11 +1327,13 @@
 	<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.pond">Lagoa</string>
+	<string name="type.natural.water.basin">Reservatório</string>
+	<string name="type.natural.water.river">Rio</string>
 	<string name="type.natural.land">Campo</string>
 	<string name="type.natural.meadow">Pradaria</string>
 	<string name="type.natural.orchard">Pomar</string>
 	<string name="type.natural.peak">Pico</string>
-	<string name="type.natural.water.pond">Lagoa</string>
 	<string name="type.natural.rock">Rochedo</string>
 	<string name="type.natural.scrub">Matagal</string>
 	<string name="type.natural.spring">Nascente</string>
@@ -1340,7 +1342,7 @@
 	<string name="type.natural.tree_row">Linha de árvores</string>
 	<string name="type.natural.vineyard">Vinha</string>
 	<string name="type.natural.volcano">Vulcão</string>
-	<string name="type.natural.water">Água</string>
+	<string name="type.natural.water">Corpo de água</string>
 	<string name="type.natural.wetland">Zona úmida</string>
 	<string name="type.natural.wetland.bog">Zona úmida</string>
 	<string name="type.natural.wetland.marsh">Zona úmida</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 7dd2666b13..b551069a3f 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -1237,7 +1237,7 @@
 	<string name="type.junction.roundabout">Rotunda</string>
 	<string name="type.landuse">Uso do solo</string>
 	<string name="type.landuse.allotments">Horta comunitária</string>
-	<string name="type.landuse.basin">Água</string>
+	<string name="type.landuse.basin">Reservatório</string>
 	<string name="type.landuse.brownfield">Terreno industrial devoluto</string>
 	<string name="type.landuse.cemetery">Cemitério</string>
 	<string name="type.landuse.cemetery.christian">Cemitério cristão</string>
@@ -1308,7 +1308,7 @@
 	<string name="type.man_made.lighthouse">Farol</string>
 	<string name="type.man_made.pier">Pontão</string>
 	<string name="type.man_made.pipeline">Pipeline</string>
-	<string name="type.man_made.pipeline.overground">Pipeline subterrâneo</string>
+	<string name="type.man_made.pipeline.overground">Pipeline aéreo</string>
 	<string name="type.man_made.surveillance">Câmara de vigilância</string>
 	<string name="type.man_made.tower">Torre</string>
 	<string name="type.man_made.wastewater_plant">Estação de tratamento de águas residuais</string>
@@ -1333,11 +1333,14 @@
 	<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.pond">Lagoa</string>
+	<string name="type.natural.water.reservoir">Reservatório</string>
+	<string name="type.natural.water.basin">Reservatório</string>
+	<string name="type.natural.water.river">Rio</string>
 	<string name="type.natural.land">Campo</string>
 	<string name="type.natural.meadow">Pradaria</string>
 	<string name="type.natural.orchard">Pomar</string>
 	<string name="type.natural.peak">Pico</string>
-	<string name="type.natural.water.pond">Lagoa</string>
 	<string name="type.natural.rock">Rochedo</string>
 	<string name="type.natural.scrub">Matagal</string>
 	<string name="type.natural.spring">Nascente</string>
@@ -1346,7 +1349,7 @@
 	<string name="type.natural.tree_row">Linha de árvores</string>
 	<string name="type.natural.vineyard">Vinha</string>
 	<string name="type.natural.volcano">Vulcão</string>
-	<string name="type.natural.water">Água</string>
+	<string name="type.natural.water">Corpo de água</string>
 	<string name="type.natural.wetland">Zona úmida</string>
 	<string name="type.natural.wetland.bog">Zona úmida</string>
 	<string name="type.natural.wetland.marsh">Zona úmida</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index b455c03631..c43004e468 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -1137,7 +1137,7 @@
 	<string name="type.historic.ruins">Ruine</string>
 	<string name="type.historic.ship">Obiective turistice</string>
 	<string name="type.historic.tomb">Obiective turistice</string>
-	<string name="type.landuse.basin">Apă</string>
+	<string name="type.landuse.basin">Bazin de apă</string>
 	<string name="type.landuse.cemetery">Cimitir</string>
 	<string name="type.landuse.cemetery.christian">Cimitir</string>
 	<string name="type.landuse.churchyard">Curtea Bisericii</string>
@@ -1189,8 +1189,11 @@
 	<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.peak">Munte</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>
+	<string name="type.natural.water.river">Râu</string>
+	<string name="type.natural.peak">Munte</string>
 	<string name="type.natural.scrub">Boschet</string>
 	<string name="type.natural.spring">Primăvară</string>
 	<string name="type.natural.strait">Strâmtoare</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index b56cec63fc..0605c7be35 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -898,9 +898,9 @@
 	<string name="type.amenity.college">Колледж</string>
 	<string name="type.amenity.community_centre">Культурно-досуговый центр</string>
 	<string name="type.amenity.courthouse">Суд</string>
-	<string name="type.amenity.dentist">Стоматолог</string>
+	<string name="type.amenity.dentist">Стоматология</string>
 	<string name="type.amenity.doctors">Врач</string>
-	<string name="type.amenity.drinking_water">Питьевой фонтан</string>
+	<string name="type.amenity.drinking_water">Питьевая вода</string>
 	<string name="type.amenity.driving_school">Автошкола</string>
 	<string name="type.office.diplomatic">Посольство</string>
 	<string name="type.amenity.fast_food">Фастфуд</string>
@@ -937,7 +937,7 @@
 	<string name="type.amenity.pharmacy">Аптека</string>
 	<string name="type.amenity.place_of_worship">Храм</string>
 	<string name="type.amenity.place_of_worship.buddhist">Храм</string>
-	<string name="type.amenity.place_of_worship.christian">Храм</string>
+	<string name="type.amenity.place_of_worship.christian">Церковь</string>
 	<string name="type.amenity.place_of_worship.hindu">Храм</string>
 	<string name="type.amenity.place_of_worship.jewish">Синагога</string>
 	<string name="type.amenity.place_of_worship.muslim">Мечеть</string>
@@ -945,10 +945,10 @@
 	<string name="type.amenity.place_of_worship.taoist">Храм</string>
 	<string name="type.amenity.police">Полиция</string>
 	<string name="type.amenity.post_box">Почтовый ящик</string>
-	<string name="type.amenity.post_office">Почтовое отделение</string>
+	<string name="type.amenity.post_office">Почта</string>
 	<string name="type.amenity.prison">Тюрьма</string>
 	<string name="type.amenity.pub">Паб</string>
-	<string name="type.amenity.public_bookcase">Книжный шкаф</string>
+	<string name="type.amenity.public_bookcase">Книгообмен</string>
 	<string name="type.amenity.recycling">Приём вторсырья</string>
 	<string name="type.amenity.recycling_container">Контейнер для вторсырья</string>
 	<string name="type.recycling.toxic">Ядовитые отходы</string>
@@ -977,20 +977,20 @@
 	<string name="type.amenity.veterinary">Ветеринарная клиника</string>
 	<string name="type.amenity.waste_basket">Урна</string>
 	<string name="type.amenity.waste_disposal">Мусорный контейнер</string>
-	<string name="type.amenity.water_point">Выдача питьевой воды</string>
+	<string name="type.amenity.water_point">Заправка водой</string>
 	<string name="type.barrier">Преграда</string>
 	<string name="type.barrier.block">Блок</string>
 	<string name="type.barrier.bollard">Столбик</string>
 	<string name="type.barrier.border_control">Погранконтроль</string>
 	<string name="type.barrier.chain">Цепь</string>
 	<string name="type.barrier.city_wall">Городская стена</string>
-	<string name="type.barrier.cycle_barrier">Ограждение, предотвращающее проезд велосипедов</string>
+	<string name="type.barrier.cycle_barrier">Велосипедный барьер</string>
 	<string name="type.barrier.entrance">Проход</string>
 	<string name="type.barrier.fence">Забор</string>
 	<string name="type.barrier.gate">Ворота</string>
 	<string name="type.barrier.hedge">Живая изгородь</string>
 	<string name="type.barrier.lift_gate">Шлагбаум</string>
-	<string name="type.barrier.retaining_wall">Стена, удерживающая от осыпания</string>
+	<string name="type.barrier.retaining_wall">Поддерживающая стена</string>
 	<string name="type.barrier.stile">Перелаз</string>
 	<string name="type.barrier.swing_gate">Шлагбаум</string>
 	<string name="type.barrier.toll_booth">Пункт оплаты</string>
@@ -1021,7 +1021,7 @@
 	<string name="type.building.address">Здание</string>
 	<string name="type.building.garage">Гараж</string>
 	<string name="type.building.has_parts">Здание</string>
-	<string name="type.building.train_station">Ж/д станция</string>
+	<string name="type.building.train_station">Ж/д вокзал</string>
 	<string name="type.building.warehouse">Склад</string>
 	<string name="type.craft">Мастерская</string>
 	<string name="type.craft.brewery">Крафтовое пиво</string>
@@ -1041,11 +1041,11 @@
 	<string name="type.cuisine.argentinian">Аргентинская кухня</string>
 	<string name="type.cuisine.asian">Азиатская кухня</string>
 	<string name="type.cuisine.austrian">Австрийская кухня</string>
-	<string name="type.cuisine.bagel">Бубличная</string>
+	<string name="type.cuisine.bagel">Бeйглы</string>
 	<string name="type.cuisine.balkan">Балканская кухня</string>
 	<string name="type.cuisine.barbecue">Барбекю</string>
 	<string name="type.cuisine.bavarian">Баварская кухня</string>
-	<string name="type.cuisine.beef_bowl">Рис и говядина</string>
+	<string name="type.cuisine.beef_bowl">Говядина</string>
 	<string name="type.cuisine.brazilian">Бразильская кухня</string>
 	<string name="type.cuisine.breakfast">Завтраки</string>
 	<string name="type.cuisine.burger">Бургеры</string>
@@ -1138,17 +1138,17 @@
 	<string name="type.highway.cycleway.permissive">Велодорожка</string>
 	<string name="type.highway.cycleway.tunnel">Велодорожка</string>
 	<string name="type.highway.elevator">Лифт</string>
-	<string name="type.highway.footway">Дорожка</string>
-	<string name="type.highway.footway.alpine_hiking">Дорожка</string>
-	<string name="type.highway.footway.area">Дорожка</string>
-	<string name="type.highway.footway.bridge">Дорожка</string>
-	<string name="type.highway.footway.demanding_alpine_hiking">Дорожка</string>
-	<string name="type.highway.footway.demanding_mountain_hiking">Дорожка</string>
-	<string name="type.highway.footway.difficult_alpine_hiking">Дорожка</string>
-	<string name="type.highway.footway.hiking">Дорожка</string>
-	<string name="type.highway.footway.mountain_hiking">Дорожка</string>
-	<string name="type.highway.footway.permissive">Дорожка</string>
-	<string name="type.highway.footway.tunnel">Дорожка</string>
+	<string name="type.highway.footway">Пешеходная дорожка</string>
+	<string name="type.highway.footway.alpine_hiking">Пешеходная дорожка</string>
+	<string name="type.highway.footway.area">Пешеходная дорожка</string>
+	<string name="type.highway.footway.bridge">Пешеходная дорожка</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Пешеходная дорожка</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Пешеходная дорожка</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Пешеходная дорожка</string>
+	<string name="type.highway.footway.hiking">Пешеходная дорожка</string>
+	<string name="type.highway.footway.mountain_hiking">Пешеходная дорожка</string>
+	<string name="type.highway.footway.permissive">Пешеходная дорожка</string>
+	<string name="type.highway.footway.tunnel">Пешеходная дорожка</string>
 	<string name="type.highway.ford">Брод</string>
 	<string name="type.highway.living_street">Улица</string>
 	<string name="type.highway.living_street.bridge">Улица</string>
@@ -1236,20 +1236,20 @@
 	<string name="type.highway.unclassified.area">Улица</string>
 	<string name="type.highway.unclassified.bridge">Улица</string>
 	<string name="type.highway.unclassified.tunnel">Улица</string>
-	<string name="type.historic">Историческое место</string>
-	<string name="type.historic.archaeological_site">Раскопки</string>
-	<string name="type.historic.battlefield">Место исторического сражения</string>
-	<string name="type.historic.boundary_stone">Пограничный знак</string>
+	<string name="type.historic">Исторический объект</string>
+	<string name="type.historic.archaeological_site">Археологический памятник</string>
+	<string name="type.historic.battlefield">Поле боя</string>
+	<string name="type.historic.boundary_stone">Пограничный камень</string>
 	<string name="type.historic.castle">Замок</string>
 	<string name="type.historic.castle.defensive">Замок</string>
 	<string name="type.historic.castle.stately">Замок</string>
 	<string name="type.historic.citywalls">Городская стена</string>
 	<string name="type.historic.fort">Форт</string>
-	<string name="type.historic.memorial">Памятник</string>
-	<string name="type.historic.memorial.plaque">Памятник</string>
-	<string name="type.historic.memorial.sculpture">Памятник</string>
-	<string name="type.historic.memorial.statue">Памятник</string>
-	<string name="type.historic.monument">Монумент</string>
+	<string name="type.historic.memorial">Мемориал</string>
+	<string name="type.historic.memorial.plaque">Памятная доска</string>
+	<string name="type.historic.memorial.sculpture">Скульптура</string>
+	<string name="type.historic.memorial.statue">Статуя</string>
+	<string name="type.historic.monument">Памятник</string>
 	<string name="type.historic.ruins">Руины</string>
 	<string name="type.historic.ship">Корабль</string>
 	<string name="type.historic.tomb">Гробница</string>
@@ -1261,8 +1261,8 @@
 	<string name="type.junction.roundabout">Кольцо</string>
 	<string name="type.landuse">Землепользование</string>
 	<string name="type.landuse.allotments">Земельные участки</string>
-	<string name="type.landuse.basin">Водоём</string>
-	<string name="type.landuse.brownfield">Земли для застройки</string>
+	<string name="type.landuse.basin">Резервуар</string>
+	<string name="type.landuse.brownfield">Земля для застройки</string>
 	<string name="type.landuse.cemetery">Кладбище</string>
 	<string name="type.landuse.cemetery.christian">Христианское кладбище</string>
 	<string name="type.landuse.churchyard">Церковный двор</string>
@@ -1278,12 +1278,12 @@
 	<string name="type.landuse.forest.mixed">Смешанный лес</string>
 	<string name="type.landuse.garages">Гаражи</string>
 	<string name="type.landuse.grass">Газон</string>
-	<string name="type.landuse.greenfield">Район под застройку</string>
+	<string name="type.landuse.greenfield">Земля для застройки</string>
 	<string name="type.landuse.greenhouse_horticulture">Теплицы</string>
 	<string name="type.landuse.industrial">Промзона</string>
 	<string name="type.landuse.landfill">Свалка</string>
 	<string name="type.landuse.meadow">Луг</string>
-	<string name="type.landuse.military">Военные объекты</string>
+	<string name="type.landuse.military">Военная зона</string>
 	<string name="type.landuse.orchard">Сад</string>
 	<string name="type.landuse.quarry">Карьер</string>
 	<string name="type.landuse.railway">Железнодорожные сооружения</string>
@@ -1321,28 +1321,28 @@
 	<string name="type.leisure.sports_centre.swimming">Плавательный бассейн</string>
 	<string name="type.leisure.sports_centre.yoga">Йога-центр</string>
 	<string name="type.leisure.stadium">Стадион</string>
-	<string name="type.leisure.swimming_pool">Бассейн</string>
+	<string name="type.leisure.swimming_pool">Плавательный бассейн</string>
 	<string name="type.leisure.track">Беговая дорожка</string>
 	<string name="type.leisure.water_park">Аквапарк</string>
 	<string name="type.man_made">Искусственное сооружение</string>
 	<string name="type.man_made.breakwater">Волнорез</string>
-	<string name="type.man_made.cairn">Пирамидка из камней</string>
+	<string name="type.man_made.cairn">Тур</string>
 	<string name="type.man_made.chimney">Заводская труба</string>
 	<string name="type.man_made.cutline">Просека</string>
 	<string name="type.man_made.lighthouse">Маяк</string>
 	<string name="type.man_made.pier">Пирс</string>
 	<string name="type.man_made.pipeline">Трубопровод</string>
-	<string name="type.man_made.pipeline.overground">Трубопровод над землёй</string>
+	<string name="type.man_made.pipeline.overground">Наземный трубопровод</string>
 	<string name="type.man_made.silo">Элеватор</string>
 	<string name="type.man_made.storage_tank">Резервуар</string>
 	<string name="type.man_made.surveillance">Камера наблюдения</string>
 	<string name="type.man_made.tower">Башня</string>
 	<string name="type.man_made.wastewater_plant">Очистные сооружения</string>
-	<string name="type.man_made.water_tap">Колонка с водой</string>
+	<string name="type.man_made.water_tap">Водопроводный кран</string>
 	<string name="type.man_made.water_tower">Водонапорная башня</string>
 	<string name="type.man_made.water_well">Колодец</string>
 	<string name="type.man_made.windmill">Ветряная мельница</string>
-	<string name="type.man_made.works">Промышленные строения</string>
+	<string name="type.man_made.works">Промышленное производство</string>
 	<string name="type.military">Военные объекты</string>
 	<string name="type.military.bunker">Бункер</string>
 	<string name="type.mountain_pass">Перевал</string>
@@ -1350,6 +1350,8 @@
 	<string name="type.natural.bare_rock">Скалы</string>
 	<string name="type.natural.bay">Залив</string>
 	<string name="type.natural.beach">Пляж</string>
+	<string name="type.natural.beach.sand">Песчаный пляж</string>
+	<string name="type.natural.beach.gravel">Галечный пляж</string>
 	<string name="type.natural.cape">Мыс</string>
 	<string name="type.natural.cave_entrance">Пещера</string>
 	<string name="type.natural.cliff">Обрыв</string>
@@ -1360,12 +1362,15 @@
 	<string name="type.natural.heath">Пустошь</string>
 	<string name="type.natural.hot_spring">Горячий источник</string>
 	<string name="type.natural.water.lake">Озеро</string>
-	<string name="type.natural.land">Земля</string>
+	<string name="type.natural.water.pond">Пруд</string>
+	<string name="type.natural.water.reservoir">Водохранилище</string>
+	<string name="type.natural.water.basin">Резервуар</string>
+	<string name="type.natural.water.river">Река</string>
+	<string name="type.natural.land">Суша</string>
 	<string name="type.natural.meadow">Луг</string>
-	<string name="type.natural.orchard">Фруктовый сад</string>
+	<string name="type.natural.orchard">Сад</string>
 	<string name="type.natural.peak">Гора</string>
 	<string name="type.natural.saddle">Седловина</string>
-	<string name="type.natural.water.pond">Пруд</string>
 	<string name="type.natural.rock">Камень</string>
 	<string name="type.natural.scrub">Заросли</string>
 	<string name="type.natural.spring">Родник</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 8b1217ee9c..e9bf99d9b3 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1147,7 +1147,7 @@
 	<string name="type.historic.ruins">Zrúcanina</string>
 	<string name="type.historic.ship">Pamätihodnosť</string>
 	<string name="type.historic.tomb">Pamätihodnosť</string>
-	<string name="type.landuse.basin">Voda</string>
+	<string name="type.landuse.basin">Vodná nádrž</string>
 	<string name="type.landuse.cemetery">Cintorín</string>
 	<string name="type.landuse.cemetery.christian">Cintorín</string>
 	<string name="type.landuse.churchyard">Cintorín</string>
@@ -1197,8 +1197,11 @@
 	<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.peak">Hora</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>
+	<string name="type.natural.water.river">Rieka</string>
+	<string name="type.natural.peak">Hora</string>
 	<string name="type.natural.scrub">Krovie</string>
 	<string name="type.natural.spring">Prameň</string>
 	<string name="type.natural.strait">Prieliv</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 1075443967..b8e8b07024 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1142,7 +1142,7 @@
 	<string name="type.historic.ruins">Ruiner</string>
 	<string name="type.historic.ship">Attraktion</string>
 	<string name="type.historic.tomb">Attraktion</string>
-	<string name="type.landuse.basin">Vatten</string>
+	<string name="type.landuse.basin">Vattenbassäng</string>
 	<string name="type.landuse.cemetery">Begravningsplats</string>
 	<string name="type.landuse.cemetery.christian">Begravningsplats</string>
 	<string name="type.landuse.churchyard">Kyrkogård</string>
@@ -1193,8 +1193,11 @@
 	<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.peak">Bergstopp</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>
+	<string name="type.natural.water.river">Flod</string>
+	<string name="type.natural.peak">Bergstopp</string>
 	<string name="type.natural.scrub">Ruggen</string>
 	<string name="type.natural.spring">Vattenkälla</string>
 	<string name="type.natural.strait">Sund</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index f67eef1a12..9c7acfac1c 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -1153,7 +1153,7 @@
 	<string name="type.historic.tomb">สถานที่ท่องเที่ยว</string>
 	<string name="type.internet_access">อินเทอร์เน็ต</string>
 	<string name="type.internet_access.wlan">อินเทอร์เน็ต</string>
-	<string name="type.landuse.basin">น้ำ</string>
+	<string name="type.landuse.basin">อ่างน้ำ</string>
 	<string name="type.landuse.cemetery">สุสาน</string>
 	<string name="type.landuse.cemetery.christian">สุสาน</string>
 	<string name="type.landuse.churchyard">บริเวณโบสถ์</string>
@@ -1205,14 +1205,17 @@
 	<string name="type.natural.glacier">ธารน้ำแข็ง</string>
 	<string name="type.natural.grassland">ทุ่งหญ้า</string>
 	<string name="type.natural.water.lake">ทะเลสาบ</string>
-	<string name="type.natural.peak">จุดสูงสุด</string>
 	<string name="type.natural.water.pond">บ่อ</string>
+	<string name="type.natural.water.reservoir">อ่างเก็บน้ำ</string>
+	<string name="type.natural.water.basin">อ่างน้ำ</string>
+	<string name="type.natural.water.river">แม่น้ำ</string>
+	<string name="type.natural.peak">จุดสูงสุด</string>
 	<string name="type.natural.scrub">ป่าละเมาะ</string>
 	<string name="type.natural.spring">ฤดูใบไม้ผลิ</string>
 	<string name="type.natural.strait">ช่องแคบ</string>
 	<string name="type.natural.tree">ต้นไม้</string>
 	<string name="type.natural.volcano">ภูเขาไฟ</string>
-	<string name="type.natural.water">น้ำ</string>
+	<string name="type.natural.water">แหล่งน้ำ</string>
 	<string name="type.natural.wetland">พื้นที่น้ำท่วมขัง</string>
 	<string name="type.office">สำนักงาน</string>
 	<string name="type.office.company">สำนักงานบริษัท</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index a85e36a26d..c191e05510 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1146,7 +1146,7 @@
 	<string name="type.historic.ruins">Harabeler</string>
 	<string name="type.historic.ship">Görülecek yerler</string>
 	<string name="type.historic.tomb">Görülecek yerler</string>
-	<string name="type.landuse.basin">Su</string>
+	<string name="type.landuse.basin">Bir su havzası</string>
 	<string name="type.landuse.cemetery">Mezarlık</string>
 	<string name="type.landuse.cemetery.christian">Mezarlık</string>
 	<string name="type.landuse.churchyard">Kilise Bölgesi</string>
@@ -1197,14 +1197,16 @@
 	<string name="type.natural.glacier">Buzul</string>
 	<string name="type.natural.grassland">Yeşillik</string>
 	<string name="type.natural.water.lake">Göl</string>
-	<string name="type.natural.peak">Zirve</string>
 	<string name="type.natural.water.pond">Gölet</string>
+	<string name="type.natural.water.reservoir">Rezervuar</string>
+	<string name="type.natural.water.basin">Bir su havzası</string>
+	<string name="type.natural.water.river">Nehir</string>
+	<string name="type.natural.peak">Zirve</string>
 	<string name="type.natural.scrub">Çalılık</string>
 	<string name="type.natural.spring">Pınar</string>
 	<string name="type.natural.strait">Boğaz</string>
 	<string name="type.natural.tree">Arbre</string>
 	<string name="type.natural.volcano">Volcan</string>
-	<string name="type.natural.water">Su</string>
 	<string name="type.natural.wetland">Sulak alan</string>
 	<string name="type.office">Ofis</string>
 	<string name="type.office.company">Şirket bürosu</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 25f176a8f5..710444657d 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -828,8 +828,12 @@
 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Канатна дорога</string>
 	<string name="type.aeroway.aerodrome">Аеропорт</string>
-	<string name="type.aeroway.aerodrome.international">Аеропорт</string>
+	<string name="type.aeroway.aerodrome.international">Міжнародний аеропорт</string>
+	<string name="type.aeroway.apron">Перон</string>
+	<string name="type.aeroway.gate">Вихід на посадку</string>
 	<string name="type.aeroway.helipad">Майданчик для гелікоптерів</string>
+	<string name="type.aeroway.runway">Злітно-посадкова смуга</string>
+	<string name="type.aeroway.terminal">Термінал</string>
 	<string name="type.amenity">Об’єкти інфраструктури</string>
 	<string name="type.amenity.arts_centre">Центр мистецтв</string>
 	<string name="type.amenity.atm">Банкомат</string>
@@ -846,16 +850,16 @@
 	<string name="type.amenity.cafe">Кафе</string>
 	<string name="type.amenity.car_rental">Прокат авто</string>
 	<string name="type.amenity.car_sharing">Каршерінг</string>
-	<string name="type.amenity.car_wash">Автомийна</string>
+	<string name="type.amenity.car_wash">Автомийка</string>
 	<string name="type.amenity.casino">Казино</string>
 	<string name="type.amenity.charging_station">Зарядна станція</string>
 	<string name="type.amenity.childcare">Дитяча кімната</string>
-	<string name="type.amenity.cinema">Кіно</string>
+	<string name="type.amenity.cinema">Кінотеатр</string>
 	<string name="type.amenity.clinic">Поліклініка</string>
 	<string name="type.amenity.college">Коледж</string>
 	<string name="type.amenity.community_centre">Центр культури та дозвілля, Дім культури</string>
 	<string name="type.amenity.courthouse">Суд</string>
-	<string name="type.amenity.dentist">Стоматолог</string>
+	<string name="type.amenity.dentist">Стоматологія</string>
 	<string name="type.amenity.doctors">Лікар</string>
 	<string name="type.amenity.drinking_water">Питна вода</string>
 	<string name="type.amenity.driving_school">Автошкола</string>
@@ -863,6 +867,7 @@
 	<string name="type.amenity.fast_food">Фастфуд</string>
 	<string name="type.amenity.ferry_terminal">Пором</string>
 	<string name="type.amenity.fire_station">Пожежна частина</string>
+	<string name="type.amenity.food_court">Ресторанний двір</string>
 	<string name="type.amenity.fountain">Фонтан</string>
 	<string name="type.amenity.fuel">Заправка</string>
 	<string name="type.amenity.grave_yard">Цвинтар</string>
@@ -873,7 +878,7 @@
 	<string name="type.amenity.internet_cafe">Інтернет-кафе</string>
 	<string name="type.amenity.kindergarten">Дитячий садок</string>
 	<string name="type.amenity.library">Бібліотека</string>
-	<string name="type.amenity.marketplace">Ринок</string>
+	<string name="type.amenity.marketplace">Ринкова площа</string>
 	<string name="type.amenity.motorcycle_parking">Парковка для мотоциклів</string>
 	<string name="type.amenity.nightclub">Нічний клуб</string>
 	<string name="type.amenity.nursing_home">Будинок для людей похилого віку</string>
@@ -901,9 +906,10 @@
 	<string name="type.amenity.place_of_worship.taoist">Храм</string>
 	<string name="type.amenity.police">Міліція</string>
 	<string name="type.amenity.post_box">Поштова скринька</string>
-	<string name="type.amenity.post_office">Поштове відділення</string>
+	<string name="type.amenity.post_office">Пошта</string>
+	<string name="type.amenity.prison">В\'язниця</string>
 	<string name="type.amenity.pub">Паб</string>
-	<string name="type.amenity.public_bookcase">Книги</string>
+	<string name="type.amenity.public_bookcase">Книгообмін</string>
 	<string name="type.amenity.recycling">Прийом вторсировини</string>
 	<string name="type.amenity.recycling_container">Контейнер для вторсировини</string>
 	<string name="type.recycling.toxic">Отруйні відходи</string>
@@ -931,23 +937,48 @@
 	<string name="type.amenity.veterinary">Ветеринарна клініка</string>
 	<string name="type.amenity.waste_basket">Бак для сміття</string>
 	<string name="type.amenity.waste_disposal">Сміттєвий контейнер</string>
-	<string name="type.amenity.water_point">Пункт постачання води</string>
+	<string name="type.amenity.water_point">Заправка водою</string>
+	<string name="type.barrier">Перешкода</string>
 	<string name="type.barrier.block">Блок</string>
 	<string name="type.barrier.bollard">Стовпчик</string>
 	<string name="type.barrier.border_control">Прикордонний контроль</string>
 	<string name="type.barrier.chain">Ланцюг</string>
+	<string name="type.barrier.city_wall">Міська стіна</string>
+	<string name="type.barrier.cycle_barrier">Велосипедна перешкода</string>
 	<string name="type.barrier.entrance">Прохід</string>
+	<string name="type.barrier.fence">Огорожа</string>
 	<string name="type.barrier.gate">Ворота</string>
 	<string name="type.barrier.lift_gate">Шлагбаум</string>
 	<string name="type.barrier.stile">Перелаз</string>
 	<string name="type.barrier.swing_gate">Шлагбаум</string>
 	<string name="type.barrier.toll_booth">Пункт оплати</string>
+	<string name="type.barrier.wall">Стіна</string>
+	<string name="type.boundary">Кордон</string>
+	<string name="type.boundary.administrative">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.10">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.11">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.2">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.4">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.4.state">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.5">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.6">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.7">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.8">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.9">Адміністративний поділ</string>
+	<string name="type.boundary.administrative.city">Межа міста</string>
+	<string name="type.boundary.administrative.country">Кордон країни</string>
+	<string name="type.boundary.administrative.county">Поділ округа</string>
+	<string name="type.boundary.administrative.nation">Національний кордон</string>
+	<string name="type.boundary.administrative.region">Областний поділ</string>
+	<string name="type.boundary.administrative.suburb">Приміська межа</string>
 	<string name="type.boundary.national_park">Національний парк</string>
 	<string name="type.building">Будівля</string>
 	<string name="type.building.address">Будівля</string>
 	<string name="type.building.garage">Гараж</string>
 	<string name="type.building.has_parts">Будівля</string>
 	<string name="type.building.train_station">Залізничний вокзал</string>
+	<string name="type.building.warehouse">Склад</string>
+	<string name="type.craft">Майстерня</string>
 	<string name="type.craft.brewery">Пивоварня</string>
 	<string name="type.craft.carpenter">Столяр</string>
 	<string name="type.craft.electrician">Електрик</string>
@@ -965,7 +996,7 @@
 	<string name="type.cuisine.argentinian">Аргентинська кухня</string>
 	<string name="type.cuisine.asian">Азіатська кухня</string>
 	<string name="type.cuisine.austrian">Австрійська кухня</string>
-	<string name="type.cuisine.bagel">Випічка</string>
+	<string name="type.cuisine.bagel">Бейґель</string>
 	<string name="type.cuisine.balkan">Балканська кухня</string>
 	<string name="type.cuisine.barbecue">Барбекю</string>
 	<string name="type.cuisine.bavarian">Баварська кухня</string>
@@ -979,8 +1010,8 @@
 	<string name="type.cuisine.chicken">Страви з курки</string>
 	<string name="type.cuisine.chinese">Китайська кухня</string>
 	<string name="type.cuisine.coffee_shop">Кава</string>
-	<string name="type.cuisine.crepe">Креп</string>
-	<string name="type.cuisine.croatian">Сербська кухня</string>
+	<string name="type.cuisine.crepe">Млинці</string>
+	<string name="type.cuisine.croatian">Хорватська кухня</string>
 	<string name="type.cuisine.curry">Каррі</string>
 	<string name="type.cuisine.deli">Делікатеси</string>
 	<string name="type.cuisine.diner">Дайнер</string>
@@ -1012,14 +1043,14 @@
 	<string name="type.cuisine.lao">Лаоська кухня</string>
 	<string name="type.cuisine.lebanese">Ліванська кухня</string>
 	<string name="type.cuisine.local">Місцева кухня</string>
-	<string name="type.cuisine.malagasy">Малагасійська кухня</string>
+	<string name="type.cuisine.malagasy">Мадагаскарська кухня</string>
 	<string name="type.cuisine.malaysian">Малайзійська кухня</string>
 	<string name="type.cuisine.mediterranean">Середземноморська кухня</string>
 	<string name="type.cuisine.mexican">Мексиканська кухня</string>
 	<string name="type.cuisine.moroccan">Марокканська кухня</string>
 	<string name="type.cuisine.noodles">Вермішель</string>
 	<string name="type.cuisine.oriental">Східна кухня</string>
-	<string name="type.cuisine.pancake">Млинці</string>
+	<string name="type.cuisine.pancake">Млинцева</string>
 	<string name="type.cuisine.pasta">Паста</string>
 	<string name="type.cuisine.persian">Перська кухня</string>
 	<string name="type.cuisine.peruvian">Перуанська кухня</string>
@@ -1051,6 +1082,11 @@
 	<string name="type.healthcare.laboratory">Медична лабораторія</string>
 	<string name="type.highway.bus_stop">Зупинка</string>
 	<string name="type.highway.construction">Дорога, що будується</string>
+	<string name="type.highway.cycleway">Велодоріжка</string>
+	<string name="type.highway.cycleway.bridge">Велодоріжка</string>
+	<string name="type.highway.cycleway.permissive">Велодоріжка</string>
+	<string name="type.highway.cycleway.tunnel">Велодоріжка</string>
+	<string name="type.highway.elevator">Ліфт</string>
 	<string name="type.highway.footway">Пішохідна доріжка</string>
 	<string name="type.highway.footway.alpine_hiking">Пішохідна доріжка</string>
 	<string name="type.highway.footway.area">Пішохідна доріжка</string>
@@ -1116,7 +1152,7 @@
 	<string name="type.highway.service.driveway">Вулиця</string>
 	<string name="type.highway.service.parking_aisle">Вулиця</string>
 	<string name="type.highway.service.tunnel">Вулиця</string>
-	<string name="type.highway.speed_camera">Камера безпеки дорожнього руху</string>
+	<string name="type.highway.speed_camera">Камера швидкості</string>
 	<string name="type.highway.steps">Пішохідна доріжка</string>
 	<string name="type.highway.steps.bridge">Пішохідна доріжка</string>
 	<string name="type.highway.steps.tunnel">Пішохідна доріжка</string>
@@ -1148,38 +1184,66 @@
 	<string name="type.highway.unclassified.area">Вулиця</string>
 	<string name="type.highway.unclassified.bridge">Вулиця</string>
 	<string name="type.highway.unclassified.tunnel">Вулиця</string>
-	<string name="type.historic.archaeological_site">Розкопки</string>
+	<string name="type.historic">Історичний об\'єкт</string>
+	<string name="type.historic.archaeological_site">Пам\'ятка археології</string>
+	<string name="type.historic.battlefield">Поле битви</string>
+	<string name="type.historic.boundary_stone">Прикордонний камінь</string>
 	<string name="type.historic.castle">Замок</string>
 	<string name="type.historic.castle.defensive">Замок</string>
 	<string name="type.historic.castle.stately">Замок</string>
+	<string name="type.historic.citywalls">Міська стіна</string>
+	<string name="type.historic.fort">Форт</string>
 	<string name="type.historic.memorial">Меморіал</string>
-	<string name="type.historic.memorial.plaque">Меморіал</string>
-	<string name="type.historic.memorial.sculpture">Меморіал</string>
-	<string name="type.historic.memorial.statue">Меморіал</string>
+	<string name="type.historic.memorial.plaque">Дошка пам\'яті</string>
+	<string name="type.historic.memorial.sculpture">Скульптура</string>
+	<string name="type.historic.memorial.statue">Статуя</string>
 	<string name="type.historic.monument">Пам\'ятник</string>
 	<string name="type.historic.ruins">Руїни</string>
-	<string name="type.historic.ship">Пам’ятні місця</string>
-	<string name="type.historic.tomb">Пам’ятні місця</string>
+	<string name="type.historic.ship">Корабель</string>
+	<string name="type.historic.tomb">Гробниця</string>
+	<string name="type.historic.wayside_shrine">Святиня</string>
 	<string name="type.internet_access">Інтернет</string>
 	<string name="type.internet_access.wlan">Інтернет</string>
-	<string name="type.landuse.basin">Водоймище</string>
+	<string name="type.junction">Перехрестя</string>
+	<string name="type.junction.roundabout">Кільце</string>
+	<string name="type.landuse.allotments">Земельні ділянки</string>
+	<string name="type.landuse.basin">Резервуар</string>
 	<string name="type.landuse.cemetery">Цвинтар</string>
 	<string name="type.landuse.cemetery.christian">Цвинтар</string>
 	<string name="type.landuse.churchyard">Церковний двір</string>
+	<string name="type.landuse.commercial">Комерційні ділянки</string>
+	<string name="type.landuse.construction">Будівництво</string>
 	<string name="type.landuse.farmland">Сільськогосподарська земля</string>
+	<string name="type.landuse.field">Поле</string>
 	<string name="type.landuse.forest">Ліс</string>
-	<string name="type.landuse.forest.coniferous">Ліс</string>
-	<string name="type.landuse.forest.deciduous">Ліс</string>
-	<string name="type.landuse.forest.mixed">Ліс</string>
+	<string name="type.landuse.forest.coniferous">Хвойний ліс</string>
+	<string name="type.landuse.forest.deciduous">Листяний ліс</string>
+	<string name="type.landuse.forest.mixed">Змішаний ліс</string>
+	<string name="type.landuse.garages">Гаражі</string>
 	<string name="type.landuse.grass">Газон</string>
+	<string name="type.landuse.greenhouse_horticulture">Теплиці</string>
+	<string name="type.landuse.industrial">Промзона</string>
 	<string name="type.landuse.landfill">Звалище</string>
+	<string name="type.landuse.meadow">Луг</string>
+	<string name="type.landuse.military">Військова зона</string>
+	<string name="type.landuse.orchard">Сад</string>
+	<string name="type.landuse.quarry">Кар\'єр</string>
 	<string name="type.landuse.railway">Залізничні споруди</string>
 	<string name="type.landuse.reservoir">Водоймище</string>
+	<string name="type.landuse.residential">Житлова зона</string>
+	<string name="type.landuse.retail">Зона торгівлі</string>
+	<string name="type.landuse.salt_pond">Соляний став</string>
+	<string name="type.landuse.village_green">Парк</string>
+	<string name="type.landuse.vineyard">Виноградник</string>
+	<string name="type.leisure">Місце відпочинку</string>
 	<string name="type.leisure.dog_park">Місце для вигулу собак</string>
 	<string name="type.leisure.fitness_centre">Фітнес-зал</string>
-	<string name="type.leisure.fitness_station">Фітнес-зал</string>
+	<string name="type.leisure.fitness_station">Спортивні знаряддя</string>
 	<string name="type.leisure.garden">Садок</string>
 	<string name="type.leisure.golf_course">Майданчик для гольфу</string>
+	<string name="type.leisure.ice_rink">Каток</string>
+	<string name="type.leisure.landscape_reserve">Ландшафтний заповідник</string>
+	<string name="type.leisure.marina">Пристань</string>
 	<string name="type.leisure.nature_reserve">Заповідник</string>
 	<string name="type.leisure.park">Парк</string>
 	<string name="type.leisure.park.no.access">Парк</string>
@@ -1188,38 +1252,57 @@
 	<string name="type.leisure.picnic_table">Стіл для пікніка</string>
 	<string name="type.leisure.pitch">Спортмайданчик</string>
 	<string name="type.leisure.playground">Дитячий майданчик</string>
+	<string name="type.leisure.recreation_ground">Зона для відпочинку</string>
 	<string name="type.leisure.sauna">Сауна</string>
+	<string name="type.leisure.slipway">Шлюпковий спуск</string>
 	<string name="type.leisure.sports_centre">Спорткомплекс</string>
-	<string name="type.leisure.sports_centre.climbing">Спортивний скеледром</string>
+	<string name="type.leisure.sports_centre.climbing">Скеледром</string>
 	<string name="type.leisure.sports_centre.shooting">Тир</string>
-	<string name="type.leisure.sports_centre.swimming">Басейн</string>
+	<string name="type.leisure.sports_centre.swimming">Басейн для плавання</string>
 	<string name="type.leisure.sports_centre.yoga">Студія йоги</string>
 	<string name="type.leisure.stadium">Стадіон</string>
-	<string name="type.leisure.swimming_pool">Басейн</string>
+	<string name="type.leisure.swimming_pool">Басейн для плавання</string>
+	<string name="type.leisure.track">Бігова доріжка</string>
 	<string name="type.leisure.water_park">Аквапарк</string>
+	<string name="type.man_made">Штучна споруда</string>
+	<string name="type.man_made.breakwater">Хвилеріз</string>
+	<string name="type.man_made.cairn">Тур</string>
 	<string name="type.man_made.chimney">Заводська труба</string>
+	<string name="type.man_made.cutline">Просіка</string>
 	<string name="type.man_made.lighthouse">Маяк</string>
+	<string name="type.man_made.pier">Пірс</string>
+	<string name="type.man_made.pipeline">Трубопровід</string>
 	<string name="type.man_made.silo">Силос</string>
 	<string name="type.man_made.storage_tank">Резервуар</string>
 	<string name="type.man_made.surveillance">Камера спостереження</string>
 	<string name="type.man_made.tower">Вежа</string>
+	<string name="type.man_made.wastewater_plant">Очистні споруди</string>
 	<string name="type.man_made.water_tap">Водопровідний кран</string>
 	<string name="type.man_made.water_tower">Водонапірна вежа</string>
 	<string name="type.man_made.water_well">Криниця</string>
-	<string name="type.man_made.windmill">Вітряк</string>
+	<string name="type.man_made.windmill">Вітряний млин</string>
+	<string name="type.man_made.works">Промислове виробництво</string>
 	<string name="type.military.bunker">Бункер</string>
 	<string name="type.mountain_pass">Перевал</string>
 	<string name="type.natural.bay">Затока</string>
 	<string name="type.natural.beach">Пляж</string>
+	<string name="type.natural.beach.sand">Піщаний пляж</string>
+	<string name="type.natural.beach.gravel">Гальковий пляж</string>
 	<string name="type.natural.cape">Мис</string>
 	<string name="type.natural.cave_entrance">Печера</string>
 	<string name="type.natural.geyser">Гейзер</string>
 	<string name="type.natural.glacier">Льодовик</string>
 	<string name="type.natural.grassland">Поле</string>
 	<string name="type.natural.water.lake">Озеро</string>
+	<string name="type.natural.water.pond">Ставок</string>
+	<string name="type.natural.water.reservoir">Водосховище</string>
+	<string name="type.natural.water.basin">Резервуар</string>
+	<string name="type.natural.water.river">Річка</string>
+	<string name="type.natural.land">Суша</string>
+	<string name="type.natural.meadow">Луг</string>
+	<string name="type.natural.orchard">Сад</string>
 	<string name="type.natural.peak">Гора</string>
 	<string name="type.natural.saddle">Сідловина</string>
-	<string name="type.natural.water.pond">Ставок</string>
 	<string name="type.natural.scrub">Зарості</string>
 	<string name="type.natural.spring">Джерело</string>
 	<string name="type.natural.strait">Протока</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 86592bf265..07c7b809e7 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -1148,7 +1148,7 @@
 	<string name="type.historic.ruins">Phế tích</string>
 	<string name="type.historic.ship">Diểm tham quan</string>
 	<string name="type.historic.tomb">Diểm tham quan</string>
-	<string name="type.landuse.basin">Nước</string>
+	<string name="type.landuse.basin">Một chậu nước</string>
 	<string name="type.landuse.cemetery">Bãi tha ma</string>
 	<string name="type.landuse.cemetery.christian">Bãi tha ma</string>
 	<string name="type.landuse.churchyard">Nhà thờ</string>
@@ -1200,14 +1200,17 @@
 	<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.peak">Đỉnh</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>
+	<string name="type.natural.water.river">Sông</string>
+	<string name="type.natural.peak">Đỉnh</string>
 	<string name="type.natural.scrub">Bụi rậm</string>
 	<string name="type.natural.spring">Suối</string>
 	<string name="type.natural.strait">Eo biển</string>
 	<string name="type.natural.tree">Cây</string>
 	<string name="type.natural.volcano">Núi lửa</string>
-	<string name="type.natural.water">Nước</string>
+	<string name="type.natural.water">Thủy vực</string>
 	<string name="type.natural.wetland">Khu vực đầm lầy</string>
 	<string name="type.office">Văn phòng</string>
 	<string name="type.office.company">Văn phòng công ty</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 8de04c527a..a52a9aaea6 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1236,14 +1236,17 @@
 	<string name="type.natural.glacier">冰川</string>
 	<string name="type.natural.grassland">田野</string>
 	<string name="type.natural.water.lake">湖泊</string>
-	<string name="type.natural.peak">山峰</string>
 	<string name="type.natural.water.pond">潭</string>
+	<string name="type.natural.water.reservoir">水庫</string>
+	<string name="type.natural.water.basin">水庫</string>
+	<string name="type.natural.water.river">河流</string>
+	<string name="type.natural.peak">山峰</string>
 	<string name="type.natural.scrub">叢林</string>
 	<string name="type.natural.spring">泉水</string>
 	<string name="type.natural.strait">海峽</string>
 	<string name="type.natural.tree">樹</string>
 	<string name="type.natural.volcano">火山</string>
-	<string name="type.natural.water">水庫</string>
+	<string name="type.natural.water">水體</string>
 	<string name="type.natural.wetland">沼澤</string>
 	<string name="type.office">辦公室</string>
 	<string name="type.office.company">公司辦公室</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 24f2148648..b80b123dca 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -1227,7 +1227,7 @@
 	<string name="type.junction.roundabout">环岛</string>
 	<string name="type.landuse">土地利用要素</string>
 	<string name="type.landuse.allotments">市民农园</string>
-	<string name="type.landuse.basin">水</string>
+	<string name="type.landuse.basin">水盆地</string>
 	<string name="type.landuse.brownfield">棕土</string>
 	<string name="type.landuse.cemetery">墓地</string>
 	<string name="type.landuse.cemetery.christian">基督教墓地</string>
@@ -1317,8 +1317,11 @@
 	<string name="type.natural.heath">荒野</string>
 	<string name="type.natural.hot_spring">温泉</string>
 	<string name="type.natural.water.lake">湖</string>
-	<string name="type.natural.peak">峰</string>
 	<string name="type.natural.water.pond">池塘</string>
+	<string name="type.natural.water.reservoir">水库</string>
+	<string name="type.natural.water.basin">水盆地</string>
+	<string name="type.natural.water.river">河流</string>
+	<string name="type.natural.peak">峰</string>
 	<string name="type.natural.rock">岩石</string>
 	<string name="type.natural.scrub">灌木丛</string>
 	<string name="type.natural.spring">泉水</string>
@@ -1326,7 +1329,7 @@
 	<string name="type.natural.tree">树</string>
 	<string name="type.natural.tree_row">树列</string>
 	<string name="type.natural.volcano">火山</string>
-	<string name="type.natural.water">水</string>
+	<string name="type.natural.water">水體</string>
 	<string name="type.natural.wetland">湿地</string>
 	<string name="type.natural.wetland.bog">泥炭地</string>
 	<string name="type.natural.wetland.marsh">沼泽地</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index e192b96c22..dfa8af877d 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1258,9 +1258,9 @@
 	<string name="type.historic.citywalls">City Wall</string>
 	<string name="type.historic.fort">Fort</string>
 	<string name="type.historic.memorial">Memorial</string>
-	<string name="type.historic.memorial.plaque">Memorial</string>
-	<string name="type.historic.memorial.sculpture">Memorial</string>
-	<string name="type.historic.memorial.statue">Memorial</string>
+	<string name="type.historic.memorial.plaque">Commemorative plaque</string>
+	<string name="type.historic.memorial.sculpture">Sculpture</string>
+	<string name="type.historic.memorial.statue">Statue</string>
 	<string name="type.historic.monument">Monument</string>
 	<string name="type.historic.ruins">Ruins</string>
 	<string name="type.historic.ship">Ship</string>
@@ -1286,7 +1286,7 @@
 	<string name="type.junction.roundabout">Roundabout</string>
 	<string name="type.landuse">Landuse</string>
 	<string name="type.landuse.allotments">Allotments</string>
-	<string name="type.landuse.basin">Water</string>
+	<string name="type.landuse.basin">Basin</string>
 	<string name="type.landuse.brownfield">Brownfield</string>
 	<string name="type.landuse.cemetery">Graveyard</string>
 	<string name="type.landuse.cemetery.christian">Christian Graveyard</string>
@@ -1367,7 +1367,7 @@
 	<string name="type.man_made.water_tower">Water Tower</string>
 	<string name="type.man_made.water_well">Water Well</string>
 	<string name="type.man_made.windmill">Windmill</string>
-	<string name="type.man_made.works">Works</string>
+	<string name="type.man_made.works">Industrial Works</string>
 	<string name="type.mapswithme">mapswithme</string>
 	<string name="type.mapswithme.grid">mapswithme-grid</string>
 	<string name="type.military">Military</string>
@@ -1377,6 +1377,8 @@
 	<string name="type.natural.bare_rock">Bare Rock</string>
 	<string name="type.natural.bay">Bay</string>
 	<string name="type.natural.beach">Beach</string>
+	<string name="type.natural.beach.sand">Sandy Beach</string>
+	<string name="type.natural.beach.gravel">Gravel Beach</string>
 	<string name="type.natural.cape">Cape</string>
 	<string name="type.natural.cave_entrance">Cave</string>
 	<string name="type.natural.cliff">Cliff</string>
@@ -1387,12 +1389,15 @@
 	<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.pond">Pond</string>
+	<string name="type.natural.water.reservoir">Reservoir</string>
+	<string name="type.natural.water.basin">Basin</string>
+	<string name="type.natural.water.river">River</string>
 	<string name="type.natural.land">Land</string>
 	<string name="type.natural.meadow">Meadow</string>
 	<string name="type.natural.orchard">Orchard</string>
 	<string name="type.natural.peak">Peak</string>
 	<string name="type.natural.saddle">Mountain Saddle</string>
-	<string name="type.natural.water.pond">Pond</string>
 	<string name="type.natural.rock">Rock</string>
 	<string name="type.natural.scrub">Scrub</string>
 	<string name="type.natural.spring">Spring</string>
@@ -1401,7 +1406,7 @@
 	<string name="type.natural.tree_row">Tree Row</string>
 	<string name="type.natural.vineyard">Vineyard</string>
 	<string name="type.natural.volcano">Volcano</string>
-	<string name="type.natural.water">Water</string>
+	<string name="type.natural.water">Water body</string>
 	<string name="type.natural.wetland">Wetland</string>
 	<string name="type.natural.wetland.bog">Wetland</string>
 	<string name="type.natural.wetland.marsh">Wetland</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 616f69154e..d32c22a741 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "مياه";
+"type.landuse.basin" = "حوض المياه";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "طاحونة هواء";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "شاطئ";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "رأس";
 
 "type.natural.cave_entrance" = "كهف";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "بحيرة";
 
+"type.natural.water.pond" = "بركة";
+
+"type.natural.water.reservoir" = "خزان";
+
+"type.natural.water.basin" = "حوض المياه";
+
+"type.natural.water.river" = "نهر";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "بركة";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "أَيْكَة";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "بركان";
 
-"type.natural.water" = "مياه";
+"type.natural.water" = "مسطح مائي";
 
 "type.natural.wetland" = "منطقة رطبة";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 597cb83e6c..76259abe5b 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -2265,11 +2265,11 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.plaque" = "Memorial";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
-"type.historic.memorial.sculpture" = "Memorial";
+"type.historic.memorial.sculpture" = "Sculpture";
 
-"type.historic.memorial.statue" = "Memorial";
+"type.historic.memorial.statue" = "Statue";
 
 "type.historic.monument" = "Monument";
 
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Water";
+"type.landuse.basin" = "Рэзервуар";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Windmill";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Beach";
 
+"type.natural.beach.sand" = "Пяшчаны пляж";
+
+"type.natural.beach.gravel" = "Галечны пляж";
+
 "type.natural.cape" = "Cape";
 
 "type.natural.cave_entrance" = "Cave";
@@ -2523,18 +2527,24 @@
 
 "type.natural.water.lake" = "Lake";
 
-"type.natural.land" = "Land";
+"type.natural.water.pond" = "Сажалка";
 
-"type.natural.meadow" = "Meadow";
+"type.natural.water.reservoir" = "Вадасховішча";
 
-"type.natural.orchard" = "Orchard";
+"type.natural.water.basin" = "Рэзервуар";
 
-"type.natural.peak" = "Peak";
+"type.natural.water.river" = "Рака";
+
+"type.natural.land" = "Суша";
+
+"type.natural.meadow" = "Луг";
+
+"type.natural.orchard" = "Сад";
+
+"type.natural.peak" = "Вяршыня";
 
 "type.natural.saddle" = "Седлавіна";
 
-"type.natural.water.pond" = "Pond";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Scrub";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Вадаём";
 
 "type.natural.wetland" = "Wetland";
 
@@ -3143,19 +3153,19 @@
 
 "type.waterway.lock_gate" = "Lock Gate";
 
-"type.waterway.river" = "River";
+"type.waterway.river" = "Рака";
 
-"type.waterway.river.tunnel" = "River";
+"type.waterway.river.tunnel" = "Рака";
 
-"type.waterway.riverbank" = "River";
+"type.waterway.riverbank" = "Рака";
 
-"type.waterway.stream" = "River";
+"type.waterway.stream" = "Рака";
 
-"type.waterway.stream.ephemeral" = "River";
+"type.waterway.stream.ephemeral" = "Рака";
 
-"type.waterway.stream.intermittent" = "River";
+"type.waterway.stream.intermittent" = "Рака";
 
-"type.waterway.stream.tunnel" = "River";
+"type.waterway.stream.tunnel" = "Рака";
 
 "type.waterway.waterfall" = "Waterfall";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index ff1b8449bf..24a686cf62 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -2265,11 +2265,11 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.plaque" = "Memorial";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
-"type.historic.memorial.sculpture" = "Memorial";
+"type.historic.memorial.sculpture" = "Sculpture";
 
-"type.historic.memorial.statue" = "Memorial";
+"type.historic.memorial.statue" = "Statue";
 
 "type.historic.monument" = "Monument";
 
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Water";
+"type.landuse.basin" = "Резервоар";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Windmill";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Beach";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cape";
 
 "type.natural.cave_entrance" = "Cave";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.pond" = "Pond";
+
+"type.natural.water.reservoir" = "Резервоар";
+
+"type.natural.water.basin" = "Резервоар";
+
+"type.natural.water.river" = "River";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Pond";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Scrub";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Воден басейн";
 
 "type.natural.wetland" = "Wetland";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 65fb9479ee..938c95f1c6 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Voda";
+"type.landuse.basin" = "Vodní nádrž";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Větrný mlýn";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Pláž";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Mys";
 
 "type.natural.cave_entrance" = "Jeskyně";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Jezero";
 
+"type.natural.water.pond" = "Rybník";
+
+"type.natural.water.reservoir" = "Nádrž";
+
+"type.natural.water.basin" = "Vodní nádrž";
+
+"type.natural.water.river" = "Řeka";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Rybník";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Křoviny";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Sopka";
 
-"type.natural.water" = "Voda";
+"type.natural.water" = "Vodní plocha";
 
 "type.natural.wetland" = "Mokřadní oblast";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 3da6019966..7235c8b639 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Vand";
+"type.landuse.basin" = "Vandbassin";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Vindmølle";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Strand";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Tange";
 
 "type.natural.cave_entrance" = "Hule";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Sø";
 
+"type.natural.water.pond" = "Dam";
+
+"type.natural.water.reservoir" = "Reservoir";
+
+"type.natural.water.basin" = "Vandbassin";
+
+"type.natural.water.river" = "Flod";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Dam";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Kratbevokset område";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Vulkan";
 
-"type.natural.water" = "Vand";
+"type.natural.water" = "Vandmasse";
 
 "type.natural.wetland" = "Vådområde";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 3aa4360135..2176836cb4 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Wasserfläche";
+"type.landuse.basin" = "Wasserbecken";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Windmühle";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Strand";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Kap";
 
 "type.natural.cave_entrance" = "Höhle";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "See";
 
+"type.natural.water.pond" = "Teich";
+
+"type.natural.water.reservoir" = "Reservoir";
+
+"type.natural.water.basin" = "Wasserbecken";
+
+"type.natural.water.river" = "Fluss";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Teich";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Dickicht";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 974a59dd31..3fb6903f26 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Νερό";
+"type.landuse.basin" = "Μια λεκάνη νερού";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Ανεμόμυλος";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Παραλία";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Ακρωτήρι";
 
 "type.natural.cave_entrance" = "Σπήλαιο";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Λίμνη";
 
+"type.natural.water.pond" = "Δεξαμενή";
+
+"type.natural.water.reservoir" = "Δεξαμενή";
+
+"type.natural.water.basin" = "Μια λεκάνη νερού";
+
+"type.natural.water.river" = "Ποταμός";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Δεξαμενή";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Θαμνώδες περιοχή";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Ηφαίστειο";
 
-"type.natural.water" = "Νερό";
+"type.natural.water" = "Σώμα νερού";
 
 "type.natural.wetland" = "Υγρότοπος";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 287a7aa540..dd4fa7ce02 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -2043,7 +2043,7 @@
 
 "type.highway.cycleway.tunnel" = "Bike Path";
 
-"type.highway.elevator" = "Elevator";
+"type.highway.elevator" = "Lift";
 
 "type.highway.footway" = "Path";
 
@@ -2265,11 +2265,11 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.plaque" = "Memorial";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
-"type.historic.memorial.sculpture" = "Memorial";
+"type.historic.memorial.sculpture" = "Sculpture";
 
-"type.historic.memorial.statue" = "Memorial";
+"type.historic.memorial.statue" = "Statue";
 
 "type.historic.monument" = "Monument";
 
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Water";
+"type.landuse.basin" = "Basin";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Windmill";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Beach";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cape";
 
 "type.natural.cave_entrance" = "Cave";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.pond" = "Pond";
+
+"type.natural.water.reservoir" = "Reservoir";
+
+"type.natural.water.basin" = "Basin";
+
+"type.natural.water.river" = "River";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Pond";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Scrub";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Water body";
 
 "type.natural.wetland" = "Wetland";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index d4465329c0..e60bbc07a9 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -2265,11 +2265,11 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.plaque" = "Memorial";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
-"type.historic.memorial.sculpture" = "Memorial";
+"type.historic.memorial.sculpture" = "Sculpture";
 
-"type.historic.memorial.statue" = "Memorial";
+"type.historic.memorial.statue" = "Statue";
 
 "type.historic.monument" = "Monument";
 
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Water";
+"type.landuse.basin" = "Basin";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Windmill";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Beach";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cape";
 
 "type.natural.cave_entrance" = "Cave";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.pond" = "Pond";
+
+"type.natural.water.reservoir" = "Reservoir";
+
+"type.natural.water.basin" = "Basin";
+
+"type.natural.water.river" = "River";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Pond";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Scrub";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Water body";
 
 "type.natural.wetland" = "Wetland";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index d0c7347c56..b7335d7855 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -2265,11 +2265,11 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.plaque" = "Memorial";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
-"type.historic.memorial.sculpture" = "Memorial";
+"type.historic.memorial.sculpture" = "Sculpture";
 
-"type.historic.memorial.statue" = "Memorial";
+"type.historic.memorial.statue" = "Statue";
 
 "type.historic.monument" = "Monument";
 
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Water";
+"type.landuse.basin" = "Basin";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Windmill";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Beach";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cabo";
 
 "type.natural.cave_entrance" = "Cave";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.pond" = "Pond";
+
+"type.natural.water.reservoir" = "Reservoir";
+
+"type.natural.water.basin" = "Basin";
+
+"type.natural.water.river" = "River";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Pond";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Maleza";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Water body";
 
 "type.natural.wetland" = "Tierra pantanosa";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 3338d7e5e5..2928fc975b 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1723,7 +1723,7 @@
 
 "type.amenity.waste_disposal" = "Basura";
 
-"type.amenity.water_point" = "Fuente de agua potable";
+"type.amenity.water_point" = "Fuente de agua";
 
 "type.barrier" = "Barrier";
 
@@ -2265,11 +2265,11 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.plaque" = "Memorial";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
-"type.historic.memorial.sculpture" = "Memorial";
+"type.historic.memorial.sculpture" = "Sculpture";
 
-"type.historic.memorial.statue" = "Memorial";
+"type.historic.memorial.statue" = "Statue";
 
 "type.historic.monument" = "Monumento";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Molino";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Playa";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cabo";
 
 "type.natural.cave_entrance" = "Cueva";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.pond" = "Estanque";
+
+"type.natural.water.reservoir" = "Embalse";
+
+"type.natural.water.basin" = "Cuenca";
+
+"type.natural.water.river" = "Río";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Estanque";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Matorrales";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcán";
 
-"type.natural.water" = "Cuenca";
+"type.natural.water" = "Cuerpo de agua";
 
 "type.natural.wetland" = "Terreno pantanoso";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index e49ae28ba5..3bf2780731 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "اب";
+"type.landuse.basin" = "حوضه آب";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "توربین بادی";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "ساحل";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "دماغه";
 
 "type.natural.cave_entrance" = "غار";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "دریاچه";
 
+"type.natural.water.pond" = "تالاب";
+
+"type.natural.water.reservoir" = "مخزن";
+
+"type.natural.water.basin" = "حوضه آب";
+
+"type.natural.water.river" = "رودخانه";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "تالاب";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "بوته زار";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "اتشفشان";
 
-"type.natural.water" = "اب";
+"type.natural.water" = "پهنه آبی";
 
 "type.natural.wetland" = "ناحیه تالابی";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 6bf342dfd4..3ab87e6c6c 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Vesi";
+"type.landuse.basin" = "Vesisäiliö";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Tuulimylly";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Ranta";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Niemeke";
 
 "type.natural.cave_entrance" = "Luola";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Järvi";
 
+"type.natural.water.pond" = "Lampi";
+
+"type.natural.water.reservoir" = "Säiliö";
+
+"type.natural.water.basin" = "Vesisäiliö";
+
+"type.natural.water.river" = "Joki";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Lampi";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Tiheiköt";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Tulivuori";
 
-"type.natural.water" = "Vesi";
+"type.natural.water" = "Vesimuodostuma";
 
 "type.natural.wetland" = "Suoperäinen seutu";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 9e95f981a1..76434da9b8 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Jardins familiaux";
 
-"type.landuse.basin" = "Eau";
+"type.landuse.basin" = "Réservoir";
 
 "type.landuse.brownfield" = "Friche industrielle";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Moulin à vent";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Plage";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cap";
 
 "type.natural.cave_entrance" = "Grotte";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lac";
 
+"type.natural.water.pond" = "Étang";
+
+"type.natural.water.reservoir" = "Réservoir";
+
+"type.natural.water.basin" = "Réservoir";
+
+"type.natural.water.river" = "Rivière";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Col de montagne";
 
-"type.natural.water.pond" = "Étang";
-
 "type.natural.rock" = "Rocher";
 
 "type.natural.scrub" = "Fourré";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcan";
 
-"type.natural.water" = "Eau";
+"type.natural.water" = "Étendue d'eau";
 
 "type.natural.wetland" = "Zone humide";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index df6830fd39..d7c793409e 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Víz";
+"type.landuse.basin" = "Vízgyűjtő";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Szélmalom";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Strand";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Hegytető";
 
 "type.natural.cave_entrance" = "Barlang";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Tó";
 
+"type.natural.water.pond" = "Tavacska";
+
+"type.natural.water.reservoir" = "Rezervoár";
+
+"type.natural.water.basin" = "Vízgyűjtő";
+
+"type.natural.water.river" = "Folyó";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Tavacska";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Cserjés";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Tűzhányó";
 
-"type.natural.water" = "Víz";
+"type.natural.water" = "Vizek";
 
 "type.natural.wetland" = "Vizes terület";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index faf6f025b1..fcdb625112 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Air";
+"type.landuse.basin" = "Sebuah baskom air";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Kincir angin";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Pantai";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Tanjung";
 
 "type.natural.cave_entrance" = "Gua";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Danau";
 
+"type.natural.water.pond" = "Kolam";
+
+"type.natural.water.reservoir" = "Waduk";
+
+"type.natural.water.basin" = "Sebuah baskom air";
+
+"type.natural.water.river" = "Sungai";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Kolam";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Semak";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Gunung berapi";
 
-"type.natural.water" = "Air";
+"type.natural.water" = "Perairan";
 
 "type.natural.wetland" = "Area lahan basah";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 2073aa6f51..0fdc10ebab 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Bacino";
+"type.landuse.basin" = "Bacino d'acqua";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Mulino a vento";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Spiaggia";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Capo";
 
 "type.natural.cave_entrance" = "Grotta";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.pond" = "Stagno";
+
+"type.natural.water.reservoir" = "Serbatoio";
+
+"type.natural.water.basin" = "Bacino d'acqua";
+
+"type.natural.water.river" = "Fiume";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Sella";
 
-"type.natural.water.pond" = "Stagno";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Boscaglia";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Vulcano";
 
-"type.natural.water" = "Bacino";
+"type.natural.water" = "Corpo d'acqua";
 
 "type.natural.wetland" = "Terreno paludoso";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 2d2855bb98..3caabaec66 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "市民農園";
 
-"type.landuse.basin" = "遊水地";
+"type.landuse.basin" = "水地";
 
 "type.landuse.brownfield" = "再開発用地";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "ビーチ";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "岬";
 
 "type.natural.cave_entrance" = "洞窟";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "湖";
 
+"type.natural.water.pond" = "池";
+
+"type.natural.water.reservoir" = "貯水池";
+
+"type.natural.water.basin" = "水地";
+
+"type.natural.water.river" = "河川";
+
 "type.natural.land" = "陸地";
 
 "type.natural.meadow" = "牧草地";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "池";
-
 "type.natural.rock" = "岩";
 
 "type.natural.scrub" = "雑木林";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 45f29ea876..5e75a1475f 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "풍차";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "바닷가";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "곶";
 
 "type.natural.cave_entrance" = "동굴";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "호수";
 
+"type.natural.water.pond" = "연못이";
+
+"type.natural.water.reservoir" = "저수지";
+
+"type.natural.water.basin" = "저수지";
+
+"type.natural.water.river" = "강";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "연못이";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "관목지";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "화산";
 
-"type.natural.water" = "저수지";
+"type.natural.water" = "수역";
 
 "type.natural.wetland" = "습지 구역";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index be2bd4c4a5..b5c49debd3 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Vann";
+"type.landuse.basin" = "Vannvask";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Vindmølle";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Strand";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Kapp";
 
 "type.natural.cave_entrance" = "Grotte";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Innsjø";
 
+"type.natural.water.pond" = "Dam";
+
+"type.natural.water.reservoir" = "Reservoar";
+
+"type.natural.water.basin" = "Vannvask";
+
+"type.natural.water.river" = "Elv";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Dam";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Myr";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Vulkan";
 
-"type.natural.water" = "Vann";
+"type.natural.water" = "Vassmasse";
 
 "type.natural.wetland" = "Våtmarksområde";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 53269c8b8d..7fe5308ca8 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Water";
+"type.landuse.basin" = "Waterbassin";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Windmolen";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Strand";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Kaap";
 
 "type.natural.cave_entrance" = "Grot";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Meer";
 
+"type.natural.water.pond" = "Plas";
+
+"type.natural.water.reservoir" = "Reservoir";
+
+"type.natural.water.basin" = "Waterbassin";
+
+"type.natural.water.river" = "Rivier";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Weiland";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Plas";
-
 "type.natural.rock" = "Steen";
 
 "type.natural.scrub" = "Kreupel bos";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Vulkaan";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Waterlichaam";
 
 "type.natural.wetland" = "Moerasland";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 0d0730084a..e887e18afb 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Działki";
 
-"type.landuse.basin" = "Woda";
+"type.landuse.basin" = "Zbiornik";
 
 "type.landuse.brownfield" = "Teren do zabudowy";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Młyn wiatrowy";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Plaża";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Przylądek";
 
 "type.natural.cave_entrance" = "Jaskinia";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Jezioro";
 
+"type.natural.water.pond" = "Staw";
+
+"type.natural.water.reservoir" = "Zbiornik";
+
+"type.natural.water.basin" = "Zbiornik";
+
+"type.natural.water.river" = "Rzeka";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Łąka";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Staw";
-
 "type.natural.rock" = "Skała";
 
 "type.natural.scrub" = "Zarośla";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Wulkan";
 
-"type.natural.water" = "Woda";
+"type.natural.water" = "Akwen";
 
 "type.natural.wetland" = "Tereny podmokłe";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 96e0ac48ee..972e66f350 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Horta comunitária";
 
-"type.landuse.basin" = "Água";
+"type.landuse.basin" = "Reservatório";
 
 "type.landuse.brownfield" = "Terreno industrial devoluto";
 
@@ -2463,7 +2463,7 @@
 
 "type.man_made.pipeline" = "Pipeline";
 
-"type.man_made.pipeline.overground" = "Pipeline subterrâneo";
+"type.man_made.pipeline.overground" = "Pipeline aéreo";
 
 "type.man_made.silo" = "Silo";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Praia";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cabo";
 
 "type.natural.cave_entrance" = "Caverna";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.pond" = "Lagoa";
+
+"type.natural.water.reservoir" = "Reservoir";
+
+"type.natural.water.basin" = "Reservatório";
+
+"type.natural.water.river" = "Rio";
+
 "type.natural.land" = "Campo";
 
 "type.natural.meadow" = "Pradaria";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Lagoa";
-
 "type.natural.rock" = "Rochedo";
 
 "type.natural.scrub" = "Matagal";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Vulcão";
 
-"type.natural.water" = "Água";
+"type.natural.water" = "Corpo de água";
 
 "type.natural.wetland" = "Zona úmida";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index b1548f0ff8..3d6b15d041 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Horta comunitária";
 
-"type.landuse.basin" = "Água";
+"type.landuse.basin" = "Reservatório";
 
 "type.landuse.brownfield" = "Terreno industrial devoluto";
 
@@ -2463,7 +2463,7 @@
 
 "type.man_made.pipeline" = "Pipeline";
 
-"type.man_made.pipeline.overground" = "Pipeline subterrâneo";
+"type.man_made.pipeline.overground" = "Pipeline aéreo";
 
 "type.man_made.silo" = "Silo";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Praia";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Cabo";
 
 "type.natural.cave_entrance" = "Caverna";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.pond" = "Lagoa";
+
+"type.natural.water.reservoir" = "Reservatório";
+
+"type.natural.water.basin" = "Reservatório";
+
+"type.natural.water.river" = "Rio";
+
 "type.natural.land" = "Campo";
 
 "type.natural.meadow" = "Pradaria";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Lagoa";
-
 "type.natural.rock" = "Rochedo";
 
 "type.natural.scrub" = "Matagal";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Vulcão";
 
-"type.natural.water" = "Água";
+"type.natural.water" = "Corpo de água";
 
 "type.natural.wetland" = "Zona úmida";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 2791e13c2b..21c9cab733 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Apă";
+"type.landuse.basin" = "Bazin de apă";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Moară de vânt";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Plajă";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Mantie";
 
 "type.natural.cave_entrance" = "Peșteră";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Lac";
 
+"type.natural.water.pond" = "Heleșteu";
+
+"type.natural.water.reservoir" = "Rezervor";
+
+"type.natural.water.basin" = "Bazin de apă";
+
+"type.natural.water.river" = "Râu";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Heleșteu";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Boschet";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 839d7790df..649a2ed739 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1565,11 +1565,11 @@
 
 "type.amenity.courthouse" = "Суд";
 
-"type.amenity.dentist" = "Стоматолог";
+"type.amenity.dentist" = "Стоматология";
 
 "type.amenity.doctors" = "Врач";
 
-"type.amenity.drinking_water" = "Питьевой фонтан";
+"type.amenity.drinking_water" = "Питьевая вода";
 
 "type.amenity.driving_school" = "Автошкола";
 
@@ -1643,7 +1643,7 @@
 
 "type.amenity.place_of_worship.buddhist" = "Храм";
 
-"type.amenity.place_of_worship.christian" = "Храм";
+"type.amenity.place_of_worship.christian" = "Церковь";
 
 "type.amenity.place_of_worship.hindu" = "Храм";
 
@@ -1659,13 +1659,13 @@
 
 "type.amenity.post_box" = "Почтовый ящик";
 
-"type.amenity.post_office" = "Почтовое отделение";
+"type.amenity.post_office" = "Почта";
 
 "type.amenity.prison" = "Тюрьма";
 
 "type.amenity.pub" = "Паб";
 
-"type.amenity.public_bookcase" = "Книжный шкаф";
+"type.amenity.public_bookcase" = "Книгообмен";
 
 "type.amenity.recycling" = "Приём вторсырья";
 
@@ -1723,7 +1723,7 @@
 
 "type.amenity.waste_disposal" = "Мусорный контейнер";
 
-"type.amenity.water_point" = "Выдача питьевой воды";
+"type.amenity.water_point" = "Заправка водой";
 
 "type.barrier" = "Преграда";
 
@@ -1737,7 +1737,7 @@
 
 "type.barrier.city_wall" = "Городская стена";
 
-"type.barrier.cycle_barrier" = "Ограждение, предотвращающее проезд велосипедов";
+"type.barrier.cycle_barrier" = "Велосипедный барьер";
 
 "type.barrier.entrance" = "Проход";
 
@@ -1749,7 +1749,7 @@
 
 "type.barrier.lift_gate" = "Шлагбаум";
 
-"type.barrier.retaining_wall" = "Стена, удерживающая от осыпания";
+"type.barrier.retaining_wall" = "Поддерживающая стена";
 
 "type.barrier.stile" = "Перелаз";
 
@@ -1811,7 +1811,7 @@
 
 "type.building.has_parts" = "Здание";
 
-"type.building.train_station" = "Ж/д станция";
+"type.building.train_station" = "Ж/д вокзал";
 
 "type.building.warehouse" = "Склад";
 
@@ -1851,7 +1851,7 @@
 
 "type.cuisine.austrian" = "Австрийская кухня";
 
-"type.cuisine.bagel" = "Бубличная";
+"type.cuisine.bagel" = "Бeйглы";
 
 "type.cuisine.balkan" = "Балканская кухня";
 
@@ -1859,7 +1859,7 @@
 
 "type.cuisine.bavarian" = "Баварская кухня";
 
-"type.cuisine.beef_bowl" = "Рис и говядина";
+"type.cuisine.beef_bowl" = "Говядина";
 
 "type.cuisine.brazilian" = "Бразильская кухня";
 
@@ -2045,27 +2045,27 @@
 
 "type.highway.elevator" = "Лифт";
 
-"type.highway.footway" = "Дорожка";
+"type.highway.footway" = "Пешеходная дорожка";
 
-"type.highway.footway.alpine_hiking" = "Дорожка";
+"type.highway.footway.alpine_hiking" = "Пешеходная дорожка";
 
-"type.highway.footway.area" = "Дорожка";
+"type.highway.footway.area" = "Пешеходная дорожка";
 
-"type.highway.footway.bridge" = "Дорожка";
+"type.highway.footway.bridge" = "Пешеходная дорожка";
 
-"type.highway.footway.demanding_alpine_hiking" = "Дорожка";
+"type.highway.footway.demanding_alpine_hiking" = "Пешеходная дорожка";
 
-"type.highway.footway.demanding_mountain_hiking" = "Дорожка";
+"type.highway.footway.demanding_mountain_hiking" = "Пешеходная дорожка";
 
-"type.highway.footway.difficult_alpine_hiking" = "Дорожка";
+"type.highway.footway.difficult_alpine_hiking" = "Пешеходная дорожка";
 
-"type.highway.footway.hiking" = "Дорожка";
+"type.highway.footway.hiking" = "Пешеходная дорожка";
 
-"type.highway.footway.mountain_hiking" = "Дорожка";
+"type.highway.footway.mountain_hiking" = "Пешеходная дорожка";
 
-"type.highway.footway.permissive" = "Дорожка";
+"type.highway.footway.permissive" = "Пешеходная дорожка";
 
-"type.highway.footway.tunnel" = "Дорожка";
+"type.highway.footway.tunnel" = "Пешеходная дорожка";
 
 "type.highway.ford" = "Брод";
 
@@ -2245,13 +2245,13 @@
 
 "type.highway.world_towns_level" = "highway-world_towns_level";
 
-"type.historic" = "Историческое место";
+"type.historic" = "Исторический объект";
 
-"type.historic.archaeological_site" = "Раскопки";
+"type.historic.archaeological_site" = "Археологический памятник";
 
-"type.historic.battlefield" = "Место исторического сражения";
+"type.historic.battlefield" = "Поле боя";
 
-"type.historic.boundary_stone" = "Пограничный знак";
+"type.historic.boundary_stone" = "Пограничный камень";
 
 "type.historic.castle" = "Замок";
 
@@ -2263,15 +2263,15 @@
 
 "type.historic.fort" = "Форт";
 
-"type.historic.memorial" = "Памятник";
+"type.historic.memorial" = "Мемориал";
 
-"type.historic.memorial.plaque" = "Памятник";
+"type.historic.memorial.plaque" = "Памятная доска";
 
-"type.historic.memorial.sculpture" = "Памятник";
+"type.historic.memorial.sculpture" = "Скульптура";
 
-"type.historic.memorial.statue" = "Памятник";
+"type.historic.memorial.statue" = "Статуя";
 
-"type.historic.monument" = "Монумент";
+"type.historic.monument" = "Памятник";
 
 "type.historic.ruins" = "Руины";
 
@@ -2321,9 +2321,9 @@
 
 "type.landuse.allotments" = "Земельные участки";
 
-"type.landuse.basin" = "Водоём";
+"type.landuse.basin" = "Резервуар";
 
-"type.landuse.brownfield" = "Земли для застройки";
+"type.landuse.brownfield" = "Земля для застройки";
 
 "type.landuse.cemetery" = "Кладбище";
 
@@ -2355,7 +2355,7 @@
 
 "type.landuse.grass" = "Газон";
 
-"type.landuse.greenfield" = "Район под застройку";
+"type.landuse.greenfield" = "Земля для застройки";
 
 "type.landuse.greenhouse_horticulture" = "Теплицы";
 
@@ -2365,7 +2365,7 @@
 
 "type.landuse.meadow" = "Луг";
 
-"type.landuse.military" = "Военные объекты";
+"type.landuse.military" = "Военная зона";
 
 "type.landuse.orchard" = "Сад";
 
@@ -2441,7 +2441,7 @@
 
 "type.leisure.stadium" = "Стадион";
 
-"type.leisure.swimming_pool" = "Бассейн";
+"type.leisure.swimming_pool" = "Плавательный бассейн";
 
 "type.leisure.track" = "Беговая дорожка";
 
@@ -2451,7 +2451,7 @@
 
 "type.man_made.breakwater" = "Волнорез";
 
-"type.man_made.cairn" = "Пирамидка из камней";
+"type.man_made.cairn" = "Тур";
 
 "type.man_made.chimney" = "Заводская труба";
 
@@ -2463,7 +2463,7 @@
 
 "type.man_made.pipeline" = "Трубопровод";
 
-"type.man_made.pipeline.overground" = "Трубопровод над землёй";
+"type.man_made.pipeline.overground" = "Наземный трубопровод";
 
 "type.man_made.silo" = "Элеватор";
 
@@ -2475,7 +2475,7 @@
 
 "type.man_made.wastewater_plant" = "Очистные сооружения";
 
-"type.man_made.water_tap" = "Колонка с водой";
+"type.man_made.water_tap" = "Водопроводный кран";
 
 "type.man_made.water_tower" = "Водонапорная башня";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Ветряная мельница";
 
-"type.man_made.works" = "Промышленные строения";
+"type.man_made.works" = "Промышленное производство";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Пляж";
 
+"type.natural.beach.sand" = "Песчаный пляж";
+
+"type.natural.beach.gravel" = "Галечный пляж";
+
 "type.natural.cape" = "Мыс";
 
 "type.natural.cave_entrance" = "Пещера";
@@ -2523,18 +2527,24 @@
 
 "type.natural.water.lake" = "Озеро";
 
-"type.natural.land" = "Земля";
+"type.natural.water.pond" = "Пруд";
+
+"type.natural.water.reservoir" = "Водохранилище";
+
+"type.natural.water.basin" = "Резервуар";
+
+"type.natural.water.river" = "Река";
+
+"type.natural.land" = "Суша";
 
 "type.natural.meadow" = "Луг";
 
-"type.natural.orchard" = "Фруктовый сад";
+"type.natural.orchard" = "Сад";
 
 "type.natural.peak" = "Гора";
 
 "type.natural.saddle" = "Седловина";
 
-"type.natural.water.pond" = "Пруд";
-
 "type.natural.rock" = "Камень";
 
 "type.natural.scrub" = "Заросли";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index cc49c56f2e..052c964e75 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Voda";
+"type.landuse.basin" = "Vodná nádrž";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Veterný mlyn";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Beach";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Mys";
 
 "type.natural.cave_entrance" = "Jaskyňa";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Jazero";
 
+"type.natural.water.pond" = "Rybník";
+
+"type.natural.water.reservoir" = "Nádrž";
+
+"type.natural.water.basin" = "Vodná nádrž";
+
+"type.natural.water.river" = "Rieka";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Rybník";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Krovie";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 04dee0b944..cc1327de20 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Vatten";
+"type.landuse.basin" = "Vattenbassäng";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Väderkvarn";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Strand";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Udde";
 
 "type.natural.cave_entrance" = "Grotta";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Sjö";
 
+"type.natural.water.pond" = "Damm";
+
+"type.natural.water.reservoir" = "Reservoar";
+
+"type.natural.water.basin" = "Vattenbassäng";
+
+"type.natural.water.river" = "Flod";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Damm";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Ruggen";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index a742abb904..378ade426b 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "น้ำ";
+"type.landuse.basin" = "อ่างน้ำ";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "กังหันลม";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "ชายหาด";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "พื้นที่ยื่นเข้าไปในน้ำ";
 
 "type.natural.cave_entrance" = "ถ้ำ";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "ทะเลสาบ";
 
+"type.natural.water.pond" = "บ่อ";
+
+"type.natural.water.reservoir" = "อ่างเก็บน้ำ";
+
+"type.natural.water.basin" = "อ่างน้ำ";
+
+"type.natural.water.river" = "แม่น้ำ";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "บ่อ";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "ป่าละเมาะ";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "ภูเขาไฟ";
 
-"type.natural.water" = "น้ำ";
+"type.natural.water" = "แหล่งน้ำ";
 
 "type.natural.wetland" = "พื้นที่น้ำท่วมขัง";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index d5ec7277fe..41c88a5856 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Su";
+"type.landuse.basin" = "Bir su havzası";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Moulin";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Plaj";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Burun";
 
 "type.natural.cave_entrance" = "Mağara";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Göl";
 
+"type.natural.water.pond" = "Gölet";
+
+"type.natural.water.reservoir" = "Rezervuar";
+
+"type.natural.water.basin" = "Bir su havzası";
+
+"type.natural.water.river" = "Nehir";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Gölet";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Çalılık";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Volcan";
 
-"type.natural.water" = "Su";
+"type.natural.water" = "Water body";
 
 "type.natural.wetland" = "Sulak alan";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 1c031b86c3..65043ab753 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1501,19 +1501,19 @@
 
 "type.aeroway.aerodrome" = "Аеропорт";
 
-"type.aeroway.aerodrome.international" = "Аеропорт";
+"type.aeroway.aerodrome.international" = "Міжнародний аеропорт";
 
-"type.aeroway.apron" = "aeroway-apron";
+"type.aeroway.apron" = "Перон";
 
-"type.aeroway.gate" = "Gate";
+"type.aeroway.gate" = "Вихід на посадку";
 
 "type.aeroway.helipad" = "Майданчик для гелікоптерів";
 
-"type.aeroway.runway" = "aeroway-runway";
+"type.aeroway.runway" = "Злітно-посадкова смуга";
 
 "type.aeroway.taxiway" = "aeroway-taxiway";
 
-"type.aeroway.terminal" = "Terminal";
+"type.aeroway.terminal" = "Термінал";
 
 "type.amenity" = "Об’єкти інфраструктури";
 
@@ -1547,7 +1547,7 @@
 
 "type.amenity.car_sharing" = "Каршерінг";
 
-"type.amenity.car_wash" = "Автомийна";
+"type.amenity.car_wash" = "Автомийка";
 
 "type.amenity.casino" = "Казино";
 
@@ -1555,7 +1555,7 @@
 
 "type.amenity.childcare" = "Дитяча кімната";
 
-"type.amenity.cinema" = "Кіно";
+"type.amenity.cinema" = "Кінотеатр";
 
 "type.amenity.clinic" = "Поліклініка";
 
@@ -1565,7 +1565,7 @@
 
 "type.amenity.courthouse" = "Суд";
 
-"type.amenity.dentist" = "Стоматолог";
+"type.amenity.dentist" = "Стоматологія";
 
 "type.amenity.doctors" = "Лікар";
 
@@ -1581,7 +1581,7 @@
 
 "type.amenity.fire_station" = "Пожежна частина";
 
-"type.amenity.food_court" = "Food Court";
+"type.amenity.food_court" = "Ресторанний двір";
 
 "type.amenity.fountain" = "Фонтан";
 
@@ -1603,7 +1603,7 @@
 
 "type.amenity.library" = "Бібліотека";
 
-"type.amenity.marketplace" = "Ринок";
+"type.amenity.marketplace" = "Ринкова площа";
 
 "type.amenity.motorcycle_parking" = "Парковка для мотоциклів";
 
@@ -1659,13 +1659,13 @@
 
 "type.amenity.post_box" = "Поштова скринька";
 
-"type.amenity.post_office" = "Поштове відділення";
+"type.amenity.post_office" = "Пошта";
 
-"type.amenity.prison" = "Prison";
+"type.amenity.prison" = "В'язниця";
 
 "type.amenity.pub" = "Паб";
 
-"type.amenity.public_bookcase" = "Книги";
+"type.amenity.public_bookcase" = "Книгообмін";
 
 "type.amenity.recycling" = "Прийом вторсировини";
 
@@ -1723,9 +1723,9 @@
 
 "type.amenity.waste_disposal" = "Сміттєвий контейнер";
 
-"type.amenity.water_point" = "Пункт постачання води";
+"type.amenity.water_point" = "Заправка водою";
 
-"type.barrier" = "Barrier";
+"type.barrier" = "Перешкода";
 
 "type.barrier.block" = "Блок";
 
@@ -1735,13 +1735,13 @@
 
 "type.barrier.chain" = "Ланцюг";
 
-"type.barrier.city_wall" = "City Wall";
+"type.barrier.city_wall" = "Міська стіна";
 
-"type.barrier.cycle_barrier" = "Cycle Barrier";
+"type.barrier.cycle_barrier" = "Велосипедна перешкода";
 
 "type.barrier.entrance" = "Прохід";
 
-"type.barrier.fence" = "Fence";
+"type.barrier.fence" = "Огорожа";
 
 "type.barrier.gate" = "Ворота";
 
@@ -1757,49 +1757,49 @@
 
 "type.barrier.toll_booth" = "Пункт оплати";
 
-"type.barrier.wall" = "Wall";
+"type.barrier.wall" = "Стіна";
 
-"type.boundary" = "Boundary";
+"type.boundary" = "Кордон";
 
-"type.boundary.administrative" = "boundary-administrative";
+"type.boundary.administrative" = "Адміністративний поділ";
 
-"type.boundary.administrative.10" = "boundary-administrative-10";
+"type.boundary.administrative.10" = "Адміністративний поділ";
 
-"type.boundary.administrative.11" = "boundary-administrative-11";
+"type.boundary.administrative.11" = "Адміністративний поділ";
 
-"type.boundary.administrative.2" = "boundary-administrative-2";
+"type.boundary.administrative.2" = "Адміністративний поділ";
 
 "type.boundary.administrative.3" = "boundary-administrative-3";
 
-"type.boundary.administrative.4" = "boundary-administrative-4";
+"type.boundary.administrative.4" = "Адміністративний поділ";
 
-"type.boundary.administrative.4.state" = "boundary-administrative-4-state";
+"type.boundary.administrative.4.state" = "Адміністративний поділ";
 
-"type.boundary.administrative.5" = "boundary-administrative-5";
+"type.boundary.administrative.5" = "Адміністративний поділ";
 
-"type.boundary.administrative.6" = "boundary-administrative-6";
+"type.boundary.administrative.6" = "Адміністративний поділ";
 
-"type.boundary.administrative.7" = "boundary-administrative-7";
+"type.boundary.administrative.7" = "Адміністративний поділ";
 
-"type.boundary.administrative.8" = "boundary-administrative-8";
+"type.boundary.administrative.8" = "Адміністративний поділ";
 
-"type.boundary.administrative.9" = "boundary-administrative-9";
+"type.boundary.administrative.9" = "Адміністративний поділ";
 
-"type.boundary.administrative.city" = "boundary-administrative-city";
+"type.boundary.administrative.city" = "Межа міста";
 
-"type.boundary.administrative.country" = "boundary-administrative-country";
+"type.boundary.administrative.country" = "Кордон країни";
 
-"type.boundary.administrative.county" = "boundary-administrative-county";
+"type.boundary.administrative.county" = "Поділ округа";
 
 "type.boundary.administrative.municipality" = "boundary-administrative-municipality";
 
-"type.boundary.administrative.nation" = "boundary-administrative-nation";
+"type.boundary.administrative.nation" = "Національний кордон";
 
-"type.boundary.administrative.region" = "boundary-administrative-region";
+"type.boundary.administrative.region" = "Областний поділ";
 
 "type.boundary.administrative.state" = "boundary-administrative-state";
 
-"type.boundary.administrative.suburb" = "boundary-administrative-suburb";
+"type.boundary.administrative.suburb" = "Приміська межа";
 
 "type.boundary.national_park" = "Національний парк";
 
@@ -1813,9 +1813,9 @@
 
 "type.building.train_station" = "Залізничний вокзал";
 
-"type.building.warehouse" = "Warehouse";
+"type.building.warehouse" = "Склад";
 
-"type.craft" = "Craft";
+"type.craft" = "Майстерня";
 
 "type.craft.brewery" = "Пивоварня";
 
@@ -1851,7 +1851,7 @@
 
 "type.cuisine.austrian" = "Австрійська кухня";
 
-"type.cuisine.bagel" = "Випічка";
+"type.cuisine.bagel" = "Бейґель";
 
 "type.cuisine.balkan" = "Балканська кухня";
 
@@ -1879,9 +1879,9 @@
 
 "type.cuisine.coffee_shop" = "Кава";
 
-"type.cuisine.crepe" = "Креп";
+"type.cuisine.crepe" = "Млинці";
 
-"type.cuisine.croatian" = "Сербська кухня";
+"type.cuisine.croatian" = "Хорватська кухня";
 
 "type.cuisine.curry" = "Каррі";
 
@@ -1945,7 +1945,7 @@
 
 "type.cuisine.local" = "Місцева кухня";
 
-"type.cuisine.malagasy" = "Малагасійська кухня";
+"type.cuisine.malagasy" = "Мадагаскарська кухня";
 
 "type.cuisine.malaysian" = "Малайзійська кухня";
 
@@ -1959,7 +1959,7 @@
 
 "type.cuisine.oriental" = "Східна кухня";
 
-"type.cuisine.pancake" = "Млинці";
+"type.cuisine.pancake" = "Млинцева";
 
 "type.cuisine.pasta" = "Паста";
 
@@ -2035,15 +2035,15 @@
 
 "type.highway.construction" = "Дорога, що будується";
 
-"type.highway.cycleway" = "Bike Path";
+"type.highway.cycleway" = "Велодоріжка";
 
-"type.highway.cycleway.bridge" = "Bike Path";
+"type.highway.cycleway.bridge" = "Велодоріжка";
 
-"type.highway.cycleway.permissive" = "Bike Path";
+"type.highway.cycleway.permissive" = "Велодоріжка";
 
-"type.highway.cycleway.tunnel" = "Bike Path";
+"type.highway.cycleway.tunnel" = "Велодоріжка";
 
-"type.highway.elevator" = "Elevator";
+"type.highway.elevator" = "Ліфт";
 
 "type.highway.footway" = "Пішохідна доріжка";
 
@@ -2177,7 +2177,7 @@
 
 "type.highway.services" = "Service on the Road";
 
-"type.highway.speed_camera" = "Камера безпеки дорожнього руху";
+"type.highway.speed_camera" = "Камера швидкості";
 
 "type.highway.steps" = "Пішохідна доріжка";
 
@@ -2245,13 +2245,13 @@
 
 "type.highway.world_towns_level" = "highway-world_towns_level";
 
-"type.historic" = "Historic";
+"type.historic" = "Історичний об'єкт";
 
-"type.historic.archaeological_site" = "Розкопки";
+"type.historic.archaeological_site" = "Пам'ятка археології";
 
-"type.historic.battlefield" = "Battlefield";
+"type.historic.battlefield" = "Поле битви";
 
-"type.historic.boundary_stone" = "Boundary Stone";
+"type.historic.boundary_stone" = "Прикордонний камінь";
 
 "type.historic.castle" = "Замок";
 
@@ -2259,29 +2259,29 @@
 
 "type.historic.castle.stately" = "Замок";
 
-"type.historic.citywalls" = "City Wall";
+"type.historic.citywalls" = "Міська стіна";
 
-"type.historic.fort" = "Fort";
+"type.historic.fort" = "Форт";
 
 "type.historic.memorial" = "Меморіал";
 
-"type.historic.memorial.plaque" = "Меморіал";
+"type.historic.memorial.plaque" = "Дошка пам'яті";
 
-"type.historic.memorial.sculpture" = "Меморіал";
+"type.historic.memorial.sculpture" = "Скульптура";
 
-"type.historic.memorial.statue" = "Меморіал";
+"type.historic.memorial.statue" = "Статуя";
 
 "type.historic.monument" = "Пам'ятник";
 
 "type.historic.ruins" = "Руїни";
 
-"type.historic.ship" = "Пам’ятні місця";
+"type.historic.ship" = "Корабель";
 
-"type.historic.tomb" = "Пам’ятні місця";
+"type.historic.tomb" = "Гробниця";
 
 "type.historic.wayside_cross" = "Christian Cross";
 
-"type.historic.wayside_shrine" = "Shrine";
+"type.historic.wayside_shrine" = "Святиня";
 
 "type.hwtag" = "hwtag";
 
@@ -2313,15 +2313,15 @@
 
 "type.internet_access.wlan" = "Інтернет";
 
-"type.junction" = "Junction";
+"type.junction" = "Перехрестя";
 
-"type.junction.roundabout" = "Roundabout";
+"type.junction.roundabout" = "Кільце";
 
 "type.landuse" = "Landuse";
 
-"type.landuse.allotments" = "Allotments";
+"type.landuse.allotments" = "Земельні ділянки";
 
-"type.landuse.basin" = "Водоймище";
+"type.landuse.basin" = "Резервуар";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2331,9 +2331,9 @@
 
 "type.landuse.churchyard" = "Церковний двір";
 
-"type.landuse.commercial" = "Commercial Area";
+"type.landuse.commercial" = "Комерційні ділянки";
 
-"type.landuse.construction" = "Construction";
+"type.landuse.construction" = "Будівництво";
 
 "type.landuse.farm" = "Farm";
 
@@ -2341,35 +2341,35 @@
 
 "type.landuse.farmyard" = "Farmyard";
 
-"type.landuse.field" = "Field";
+"type.landuse.field" = "Поле";
 
 "type.landuse.forest" = "Ліс";
 
-"type.landuse.forest.coniferous" = "Ліс";
+"type.landuse.forest.coniferous" = "Хвойний ліс";
 
-"type.landuse.forest.deciduous" = "Ліс";
+"type.landuse.forest.deciduous" = "Листяний ліс";
 
-"type.landuse.forest.mixed" = "Ліс";
+"type.landuse.forest.mixed" = "Змішаний ліс";
 
-"type.landuse.garages" = "Garages";
+"type.landuse.garages" = "Гаражі";
 
 "type.landuse.grass" = "Газон";
 
 "type.landuse.greenfield" = "Greenfield";
 
-"type.landuse.greenhouse_horticulture" = "Greenhouse";
+"type.landuse.greenhouse_horticulture" = "Теплиці";
 
-"type.landuse.industrial" = "Industrial Land";
+"type.landuse.industrial" = "Промзона";
 
 "type.landuse.landfill" = "Звалище";
 
-"type.landuse.meadow" = "Meadow";
+"type.landuse.meadow" = "Луг";
 
-"type.landuse.military" = "Military Area";
+"type.landuse.military" = "Військова зона";
 
-"type.landuse.orchard" = "Orchard";
+"type.landuse.orchard" = "Сад";
 
-"type.landuse.quarry" = "Quarry";
+"type.landuse.quarry" = "Кар'єр";
 
 "type.landuse.railway" = "Залізничні споруди";
 
@@ -2377,17 +2377,17 @@
 
 "type.landuse.reservoir" = "Водоймище";
 
-"type.landuse.residential" = "Residential Land";
+"type.landuse.residential" = "Житлова зона";
 
-"type.landuse.retail" = "Retail Land";
+"type.landuse.retail" = "Зона торгівлі";
 
-"type.landuse.salt_pond" = "Pond";
+"type.landuse.salt_pond" = "Соляний став";
 
-"type.landuse.village_green" = "Land";
+"type.landuse.village_green" = "Парк";
 
-"type.landuse.vineyard" = "Vineyard";
+"type.landuse.vineyard" = "Виноградник";
 
-"type.leisure" = "Leisure";
+"type.leisure" = "Місце відпочинку";
 
 "type.leisure.common" = "leisure-common";
 
@@ -2395,17 +2395,17 @@
 
 "type.leisure.fitness_centre" = "Фітнес-зал";
 
-"type.leisure.fitness_station" = "Фітнес-зал";
+"type.leisure.fitness_station" = "Спортивні знаряддя";
 
 "type.leisure.garden" = "Садок";
 
 "type.leisure.golf_course" = "Майданчик для гольфу";
 
-"type.leisure.ice_rink" = "Ice Rink";
+"type.leisure.ice_rink" = "Каток";
 
-"type.leisure.landscape_reserve" = "Landscape Reserve";
+"type.leisure.landscape_reserve" = "Ландшафтний заповідник";
 
-"type.leisure.marina" = "Marina";
+"type.leisure.marina" = "Пристань";
 
 "type.leisure.nature_reserve" = "Заповідник";
 
@@ -2423,45 +2423,45 @@
 
 "type.leisure.playground" = "Дитячий майданчик";
 
-"type.leisure.recreation_ground" = "Recreation Ground";
+"type.leisure.recreation_ground" = "Зона для відпочинку";
 
 "type.leisure.sauna" = "Сауна";
 
-"type.leisure.slipway" = "Slipway";
+"type.leisure.slipway" = "Шлюпковий спуск";
 
 "type.leisure.sports_centre" = "Спорткомплекс";
 
-"type.leisure.sports_centre.climbing" = "Спортивний скеледром";
+"type.leisure.sports_centre.climbing" = "Скеледром";
 
 "type.leisure.sports_centre.shooting" = "Тир";
 
-"type.leisure.sports_centre.swimming" = "Басейн";
+"type.leisure.sports_centre.swimming" = "Басейн для плавання";
 
 "type.leisure.sports_centre.yoga" = "Студія йоги";
 
 "type.leisure.stadium" = "Стадіон";
 
-"type.leisure.swimming_pool" = "Басейн";
+"type.leisure.swimming_pool" = "Басейн для плавання";
 
-"type.leisure.track" = "Track";
+"type.leisure.track" = "Бігова доріжка";
 
 "type.leisure.water_park" = "Аквапарк";
 
-"type.man_made" = "Man Made";
+"type.man_made" = "Штучна споруда";
 
-"type.man_made.breakwater" = "Breakwater";
+"type.man_made.breakwater" = "Хвилеріз";
 
-"type.man_made.cairn" = "Cairn";
+"type.man_made.cairn" = "Тур";
 
 "type.man_made.chimney" = "Заводська труба";
 
-"type.man_made.cutline" = "Cutline";
+"type.man_made.cutline" = "Просіка";
 
 "type.man_made.lighthouse" = "Маяк";
 
-"type.man_made.pier" = "Pier";
+"type.man_made.pier" = "Пірс";
 
-"type.man_made.pipeline" = "Pipeline";
+"type.man_made.pipeline" = "Трубопровід";
 
 "type.man_made.pipeline.overground" = "Overground Pipeline";
 
@@ -2473,7 +2473,7 @@
 
 "type.man_made.tower" = "Вежа";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Очистні споруди";
 
 "type.man_made.water_tap" = "Водопровідний кран";
 
@@ -2481,9 +2481,9 @@
 
 "type.man_made.water_well" = "Криниця";
 
-"type.man_made.windmill" = "Вітряк";
+"type.man_made.windmill" = "Вітряний млин";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Промислове виробництво";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Пляж";
 
+"type.natural.beach.sand" = "Піщаний пляж";
+
+"type.natural.beach.gravel" = "Гальковий пляж";
+
 "type.natural.cape" = "Мис";
 
 "type.natural.cave_entrance" = "Печера";
@@ -2523,18 +2527,24 @@
 
 "type.natural.water.lake" = "Озеро";
 
-"type.natural.land" = "Land";
+"type.natural.water.pond" = "Ставок";
 
-"type.natural.meadow" = "Meadow";
+"type.natural.water.reservoir" = "Водосховище";
 
-"type.natural.orchard" = "Orchard";
+"type.natural.water.basin" = "Резервуар";
+
+"type.natural.water.river" = "Річка";
+
+"type.natural.land" = "Суша";
+
+"type.natural.meadow" = "Луг";
+
+"type.natural.orchard" = "Сад";
 
 "type.natural.peak" = "Гора";
 
 "type.natural.saddle" = "Сідловина";
 
-"type.natural.water.pond" = "Ставок";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Зарості";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 8d803f2e55..9485fea8bb 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Nước";
+"type.landuse.basin" = "Một chậu nước";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "Cối xay gió";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "Bãi biển";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "Áo choàng";
 
 "type.natural.cave_entrance" = "Hang động";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "Hồ";
 
+"type.natural.water.pond" = "Ao";
+
+"type.natural.water.reservoir" = "Hồ chứa";
+
+"type.natural.water.basin" = "Một chậu nước";
+
+"type.natural.water.river" = "Sông";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "Ao";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "Bụi rậm";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "Núi lửa";
 
-"type.natural.water" = "Nước";
+"type.natural.water" = "Thủy vực";
 
 "type.natural.wetland" = "Khu vực đầm lầy";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 9ab0d79420..fb0b466599 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -2321,7 +2321,7 @@
 
 "type.landuse.allotments" = "市民农园";
 
-"type.landuse.basin" = "水";
+"type.landuse.basin" = "水盆地";
 
 "type.landuse.brownfield" = "棕土";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "海滩";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "海角";
 
 "type.natural.cave_entrance" = "洞口";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "湖";
 
+"type.natural.water.pond" = "池塘";
+
+"type.natural.water.reservoir" = "水库";
+
+"type.natural.water.basin" = "水盆地";
+
+"type.natural.water.river" = "河流";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "池塘";
-
 "type.natural.rock" = "岩石";
 
 "type.natural.scrub" = "灌木丛";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "火山";
 
-"type.natural.water" = "水";
+"type.natural.water" = "水體";
 
 "type.natural.wetland" = "湿地";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 259a1850ca..8be4119c7e 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -2483,7 +2483,7 @@
 
 "type.man_made.windmill" = "風車";
 
-"type.man_made.works" = "Works";
+"type.man_made.works" = "Industrial Works";
 
 "type.mapswithme" = "mapswithme";
 
@@ -2503,6 +2503,10 @@
 
 "type.natural.beach" = "海灘";
 
+"type.natural.beach.sand" = "Sandy Beach";
+
+"type.natural.beach.gravel" = "Gravel Beach";
+
 "type.natural.cape" = "海角";
 
 "type.natural.cave_entrance" = "洞穴";
@@ -2523,6 +2527,14 @@
 
 "type.natural.water.lake" = "湖泊";
 
+"type.natural.water.pond" = "潭";
+
+"type.natural.water.reservoir" = "水庫";
+
+"type.natural.water.basin" = "水庫";
+
+"type.natural.water.river" = "河流";
+
 "type.natural.land" = "Land";
 
 "type.natural.meadow" = "Meadow";
@@ -2533,8 +2545,6 @@
 
 "type.natural.saddle" = "Mountain Saddle";
 
-"type.natural.water.pond" = "潭";
-
 "type.natural.rock" = "Rock";
 
 "type.natural.scrub" = "叢林";
@@ -2551,7 +2561,7 @@
 
 "type.natural.volcano" = "火山";
 
-"type.natural.water" = "水庫";
+"type.natural.water" = "水體";
 
 "type.natural.wetland" = "沼澤";