diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index b25edd1b0b..ceb9d125aa 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -681,7 +681,9 @@
 	<string name="type.amenity.fire_station">محطة إطفاء</string>
 	<string name="type.amenity.fountain">نافورة</string>
 	<string name="type.amenity.fuel">محطة وقود</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">مقبرة</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">مقبرة</string>
 	<string name="type.amenity.hospital">عيادة</string>
 	<string name="type.amenity.hunting_stand">منصة صيد</string>
@@ -996,7 +998,9 @@
 	<string name="type.internet_access">واي فاي</string>
 	<string name="type.internet_access.wlan">واي فاي</string>
 	<string name="type.landuse.basin">حوض المياه</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">مقبرة</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">مقبرة</string>
 	<string name="type.landuse.churchyard">فناء الكنيسة</string>
 	<string name="type.landuse.farmland">حقل</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 4ac20d5bc1..af73716564 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -663,6 +663,10 @@
 	<string name="enable_screen_sleep_description">Дазваляе экрану засынаць пасля перыяда бездзеяння.</string>
 
 	<!-- SECTION: Types -->
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.amenity.grave_yard">Могілкі</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.amenity.grave_yard.christian">Хрысціянскія могілкі</string>
 	<string name="type.barrier.chain">Ланцуг</string>
 	<string name="type.barrier.lift_gate">Шлагбаўм</string>
 	<string name="type.barrier.swing_gate">Шлагбаўм</string>
@@ -670,6 +674,10 @@
 
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">Рэзервуар</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.landuse.cemetery">Могілкі</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.landuse.cemetery.christian">Хрысціянскія могілкі</string>
 	<string name="type.leisure.picnic_table">Стол для пікніка</string>
 	<string name="type.man_made.silo">Сілас</string>
 	<string name="type.man_made.storage_tank">Рэзервуар</string>
@@ -687,6 +695,7 @@
 	<string name="type.natural.saddle">Седлавіна</string>
 	<string name="type.natural.water">Вадаём</string>
 	<string name="type.railway.platform">Чыгуначная платформа</string>
+	<string name="type.shop.funeral_directors">Рытуальныя паслугі</string>
 	<string name="type.waterway.river">Рака</string>
 	<string name="type.waterway.river.tunnel">Рака</string>
 	<string name="type.waterway.riverbank">Рака</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 6646fe1782..b323bb8de6 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -678,7 +678,9 @@
 	<string name="type.amenity.fire_station">Hasiči</string>
 	<string name="type.amenity.fountain">Kašna</string>
 	<string name="type.amenity.fuel">Čerpací stanice</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Hřbitov</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Hřbitov</string>
 	<string name="type.amenity.hospital">Nemocnice</string>
 	<string name="type.amenity.hunting_stand">Lovecké stanoviště</string>
@@ -990,7 +992,9 @@
 	<string name="type.historic.ship">Pamětihodnost</string>
 	<string name="type.historic.tomb">Pamětihodnost</string>
 	<string name="type.landuse.basin">Vodní nádrž</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Hřbitov</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Hřbitov</string>
 	<string name="type.landuse.churchyard">Nádvoří kostela</string>
 	<string name="type.landuse.farmland">Orná půda</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index e06417ed64..4a4cc98789 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -677,7 +677,9 @@
 	<string name="type.amenity.fire_station">Brandstation</string>
 	<string name="type.amenity.fountain">Springvand</string>
 	<string name="type.amenity.fuel">Tankstation</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Kirkegård</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Kirkegård</string>
 	<string name="type.amenity.hunting_stand">Jagtsted</string>
 	<string name="type.amenity.ice_cream">Isbod</string>
@@ -983,7 +985,9 @@
 	<string name="type.historic.ship">Turisme</string>
 	<string name="type.historic.tomb">Turisme</string>
 	<string name="type.landuse.basin">Vandbassin</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Kirkegård</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Kirkegård</string>
 	<string name="type.landuse.churchyard">Kirkegård</string>
 	<string name="type.landuse.farmland">Landbrugsjord</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 4466c2204a..10d2bbc5e9 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -706,7 +706,9 @@
 	<string name="type.amenity.fire_station">Feuerwehr</string>
 	<string name="type.amenity.fountain">Springbrunnen</string>
 	<string name="type.amenity.fuel">Tankstelle</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Friedhof</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Friedhof</string>
 	<string name="type.amenity.hospital">Krankenhaus</string>
 	<string name="type.amenity.hunting_stand">Hochsitz</string>
@@ -1060,7 +1062,9 @@
 	<string name="type.landuse.allotments">Kleingarten</string>
 	<string name="type.landuse.basin">Wasserbecken</string>
 	<string name="type.landuse.brownfield">Brachfläche</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Friedhof</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Friedhof</string>
 	<string name="type.landuse.churchyard">Kirchhof</string>
 	<string name="type.landuse.commercial">Gewerbegebiet</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 3e6d154c6b..89e8eff683 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -679,7 +679,9 @@
 	<string name="type.amenity.fire_station">Σταθμός πυρόσβεσης</string>
 	<string name="type.amenity.fountain">Συντριβάνι</string>
 	<string name="type.amenity.fuel">Βενζινάδικο</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Νεκροταφείο</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Νεκροταφείο</string>
 	<string name="type.amenity.hospital">Νοσοκομείο</string>
 	<string name="type.amenity.hunting_stand">Βάση σκόπευσης</string>
@@ -994,7 +996,9 @@
 	<string name="type.internet_access">Ίντερνετ</string>
 	<string name="type.internet_access.wlan">Ίντερνετ</string>
 	<string name="type.landuse.basin">Μια λεκάνη νερού</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Νεκροταφείο</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Νεκροταφείο</string>
 	<string name="type.landuse.churchyard">Αυλόγυρος εκκλησίας</string>
 	<string name="type.landuse.farmland">Αγροτική γη</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 24c95acdec..53c525ee81 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -696,7 +696,9 @@
 	<string name="type.amenity.fire_station">Parque de bomberos</string>
 	<string name="type.amenity.fountain">Fuente</string>
 	<string name="type.amenity.fuel">Gasolinera</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cementerio</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cementerio</string>
 	<string name="type.amenity.hunting_stand">Galería de caza</string>
 	<string name="type.amenity.ice_cream">Heladería</string>
@@ -1002,7 +1004,9 @@
 	<string name="type.historic.ship">Turismo</string>
 	<string name="type.historic.tomb">Turismo</string>
 	<string name="type.landuse.basin">Cuenca</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cementerio</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cementerio</string>
 	<string name="type.landuse.churchyard">Camposanto</string>
 	<string name="type.landuse.farmland">Tierras agrícolas</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 8d18c3ff77..8381c279b4 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -679,7 +679,9 @@
 	<string name="type.amenity.fire_station">ایستگاه اتش نشانی</string>
 	<string name="type.amenity.fountain">فواره</string>
 	<string name="type.amenity.fuel">سوخت</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">قبرستان</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">قبرستان</string>
 	<string name="type.amenity.hospital">بیمارستان</string>
 	<string name="type.amenity.hunting_stand">شکارگاه</string>
@@ -906,7 +908,9 @@
 	<string name="type.internet_access">وای فای</string>
 	<string name="type.internet_access.wlan">وای فای</string>
 	<string name="type.landuse.basin">حوضه آب</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">قبرستان</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">قبرستان</string>
 	<string name="type.landuse.churchyard">حیاط کلیسا</string>
 	<string name="type.landuse.farmland">زمین کشاورزی</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 3437454e0b..13cf44d98b 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -687,7 +687,9 @@
 	<string name="type.amenity.fire_station">Paloasema</string>
 	<string name="type.amenity.fountain">Suihkulähde</string>
 	<string name="type.amenity.fuel">Huoltoasema</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Hautausmaa</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Hautausmaa</string>
 	<string name="type.amenity.hospital">Sairaala</string>
 	<string name="type.amenity.hunting_stand">Metsästyspaikka</string>
@@ -1001,7 +1003,9 @@
 	<string name="type.historic.ship">Nähtävyydet</string>
 	<string name="type.historic.tomb">Nähtävyydet</string>
 	<string name="type.landuse.basin">Vesisäiliö</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Hautausmaa</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Hautausmaa</string>
 	<string name="type.landuse.churchyard">Kirkon piha</string>
 	<string name="type.landuse.farmland">Maatalousmaa</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index ebd0ebd5f2..32bc5d1c1d 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -709,7 +709,9 @@
 	<string name="type.amenity.food_court">Aire de restauration</string>
 	<string name="type.amenity.fountain">Fontaine</string>
 	<string name="type.amenity.fuel">Station-service</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cimetière</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cimetière</string>
 	<string name="type.amenity.hospital">Hôpital</string>
 	<string name="type.amenity.hunting_stand">Mirador</string>
@@ -1044,7 +1046,9 @@
 	<string name="type.landuse.allotments">Jardins familiaux</string>
 	<string name="type.landuse.basin">Réservoir</string>
 	<string name="type.landuse.brownfield">Friche industrielle</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cimetière</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cimetière</string>
 	<string name="type.landuse.churchyard">Cour d\'église</string>
 	<string name="type.landuse.commercial">Zone commerciale</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index f60c058b04..95e6c9ad87 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -677,7 +677,9 @@
 	<string name="type.amenity.fire_station">Tűzoltóság</string>
 	<string name="type.amenity.fountain">Szökőkút</string>
 	<string name="type.amenity.fuel">Benzinkút</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Temető</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Temető</string>
 	<string name="type.amenity.hospital">Kórház</string>
 	<string name="type.amenity.hunting_stand">Vadászles</string>
@@ -989,7 +991,9 @@
 	<string name="type.historic.ship">Túrizmus</string>
 	<string name="type.historic.tomb">Túrizmus</string>
 	<string name="type.landuse.basin">Vízgyűjtő</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Temető</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Temető</string>
 	<string name="type.landuse.churchyard">Templomtér</string>
 	<string name="type.landuse.farmland">Termőföld</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 414e01cf41..e401ac1d54 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -676,7 +676,9 @@
 	<string name="type.amenity.fire_station">Kantor pemadam kebakaran</string>
 	<string name="type.amenity.fountain">Air mancur</string>
 	<string name="type.amenity.fuel">Pompa bensin</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Pemakaman</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Pemakaman</string>
 	<string name="type.amenity.hospital">Rumahsakit</string>
 	<string name="type.amenity.hunting_stand">Lokasi berburu</string>
@@ -986,7 +988,9 @@
 	<string name="type.historic.ship">Pemandangan</string>
 	<string name="type.historic.tomb">Pemandangan</string>
 	<string name="type.landuse.basin">Sebuah baskom air</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Pemakaman</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Pemakaman</string>
 	<string name="type.landuse.churchyard">Halaman gereja</string>
 	<string name="type.landuse.farmland">Lahan pertanian</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index bfc3adde32..4d5548d5ea 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -701,7 +701,9 @@
 	<string name="type.amenity.fire_station">Scuadra antincendio</string>
 	<string name="type.amenity.fountain">Fontana</string>
 	<string name="type.amenity.fuel">Stazione di rifornimento</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cimitero</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cimitero</string>
 	<string name="type.amenity.hospital">Ospedale</string>
 	<string name="type.amenity.hunting_stand">Torre di caccio</string>
@@ -1009,7 +1011,9 @@
 	<string name="type.historic.ship">Turistico</string>
 	<string name="type.historic.tomb">Turistico</string>
 	<string name="type.landuse.basin">Bacino d\'acqua</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cimitero</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cimitero</string>
 	<string name="type.landuse.churchyard">Sagrato della chiesa</string>
 	<string name="type.landuse.farmland">Terreno agricolo</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index bd3e2b89a3..d5d8f7d2c3 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -687,7 +687,9 @@
 	<string name="type.amenity.food_court">フードコート</string>
 	<string name="type.amenity.fountain">噴水</string>
 	<string name="type.amenity.fuel">ガソリンスタンド</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">墓地</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">キリスト教墓地</string>
 	<string name="type.amenity.hospital">病院</string>
 	<string name="type.amenity.hunting_stand">狩猟スタンド</string>
@@ -1047,7 +1049,9 @@
 	<string name="type.landuse.allotments">市民農園</string>
 	<string name="type.landuse.basin">水地</string>
 	<string name="type.landuse.brownfield">再開発用地</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">墓地</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">キリスト教墓地</string>
 	<string name="type.landuse.churchyard">キリスト教教会付属地</string>
 	<string name="type.landuse.commercial">商業用地</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index ac3b576cb1..966cbbd694 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -676,7 +676,9 @@
 	<string name="type.amenity.fire_station">소방서</string>
 	<string name="type.amenity.fountain">분수</string>
 	<string name="type.amenity.fuel">주유소</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">묘소</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">묘소</string>
 	<string name="type.amenity.hospital">병원</string>
 	<string name="type.amenity.hunting_stand">사냥 스탠드</string>
@@ -990,7 +992,9 @@
 	<string name="type.internet_access">인터넷</string>
 	<string name="type.internet_access.wlan">인터넷</string>
 	<string name="type.landuse.basin">저수지</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">묘소</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">묘소</string>
 	<string name="type.landuse.churchyard">교회 마당</string>
 	<string name="type.landuse.farmland">농지</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index e1b47404ad..3e946dc97f 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -675,7 +675,9 @@
 	<string name="type.amenity.fire_station">Brannstasjon</string>
 	<string name="type.amenity.fountain">Fontene</string>
 	<string name="type.amenity.fuel">Bensinstasjon</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Gravplass</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Gravplass</string>
 	<string name="type.amenity.hospital">Sykehus</string>
 	<string name="type.amenity.hunting_stand">Jaktpost</string>
@@ -985,7 +987,9 @@
 	<string name="type.historic.ship">Severdigheter</string>
 	<string name="type.historic.tomb">Severdigheter</string>
 	<string name="type.landuse.basin">Vannvask</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Gravplass</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Gravplass</string>
 	<string name="type.landuse.churchyard">Kirkegård</string>
 	<string name="type.landuse.farmland">Jordbruksområde</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 952a96fc24..2ab48f7843 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -678,7 +678,9 @@
 	<string name="type.amenity.fire_station">Brandweer</string>
 	<string name="type.amenity.fountain">Fontein</string>
 	<string name="type.amenity.fuel">Tankstation</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Begraafplaats</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Begraafplaats</string>
 	<string name="type.amenity.hospital">Ziekenhuis</string>
 	<string name="type.amenity.hunting_stand">Jaagplek</string>
@@ -984,7 +986,9 @@
 	<string name="type.historic.ship">Toerisme</string>
 	<string name="type.historic.tomb">Toerisme</string>
 	<string name="type.landuse.basin">Waterbassin</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Begraafplaats</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Begraafplaats</string>
 	<string name="type.landuse.churchyard">Kerkhof</string>
 	<string name="type.landuse.farmland">Landbouwgrond</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index ddc6377bdf..1b2e276030 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -706,7 +706,9 @@
 	<string name="type.amenity.food_court">Sekcja gastronomiczna</string>
 	<string name="type.amenity.fountain">Fontanna</string>
 	<string name="type.amenity.fuel">Stacja benzynowa</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cmentarz</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cmentarz chrześcijański</string>
 	<string name="type.amenity.hospital">Szpital</string>
 	<string name="type.amenity.hunting_stand">Ambona myśliwska</string>
@@ -1070,7 +1072,9 @@
 	<string name="type.landuse.allotments">Działki</string>
 	<string name="type.landuse.basin">Zbiornik</string>
 	<string name="type.landuse.brownfield">Teren do zabudowy</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cmentarz</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cmentarz chrześcijański</string>
 	<string name="type.landuse.churchyard">Teren kościelny</string>
 	<string name="type.landuse.commercial">Teren handlu i usług</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 19af4e64a5..759bb50c59 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -703,7 +703,9 @@
 	<string name="type.amenity.food_court">Praça de alimentação</string>
 	<string name="type.amenity.fountain">Fonte decorativa</string>
 	<string name="type.amenity.fuel">Posto de combustível</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cemitério</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cemitério cristão</string>
 	<string name="type.amenity.hospital">Hospital</string>
 	<string name="type.amenity.hunting_stand">Estande de caça</string>
@@ -1074,7 +1076,9 @@
 	<string name="type.landuse.allotments">Horta comunitária</string>
 	<string name="type.landuse.basin">Reservatório</string>
 	<string name="type.landuse.brownfield">Terreno industrial devoluto</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cemitério</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cemitério cristão</string>
 	<string name="type.landuse.churchyard">Adro de igreja</string>
 	<string name="type.landuse.commercial">Área comercial</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 8b728d486d..abe4e85a02 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -707,7 +707,9 @@
 	<string name="type.amenity.food_court">Praça de alimentação</string>
 	<string name="type.amenity.fountain">Fonte decorativa</string>
 	<string name="type.amenity.fuel">Posto de combustível</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cemitério</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cemitério cristão</string>
 	<string name="type.amenity.hospital">Hospital</string>
 	<string name="type.amenity.hunting_stand">Posto de caça</string>
@@ -1078,7 +1080,9 @@
 	<string name="type.landuse.allotments">Horta comunitária</string>
 	<string name="type.landuse.basin">Reservatório</string>
 	<string name="type.landuse.brownfield">Terreno industrial devoluto</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cemitério</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cemitério cristão</string>
 	<string name="type.landuse.churchyard">Adro de igreja</string>
 	<string name="type.landuse.commercial">Área comercial</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 834363587a..ca8da1c221 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -700,7 +700,9 @@
 	<string name="type.amenity.fire_station">Unitate de pompieri</string>
 	<string name="type.amenity.fountain">Fântână</string>
 	<string name="type.amenity.fuel">Benzinărie</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cimitir</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cimitir</string>
 	<string name="type.amenity.hospital">Spital</string>
 	<string name="type.amenity.hunting_stand">Stand de vânătoare</string>
@@ -1006,7 +1008,9 @@
 	<string name="type.historic.ship">Obiective turistice</string>
 	<string name="type.historic.tomb">Obiective turistice</string>
 	<string name="type.landuse.basin">Bazin de apă</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cimitir</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cimitir</string>
 	<string name="type.landuse.churchyard">Curtea Bisericii</string>
 	<string name="type.landuse.farmland">Teren arabil</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 0d76652807..7f6c30d02b 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -725,8 +725,10 @@
 	<string name="type.amenity.food_court">Ресторанный дворик</string>
 	<string name="type.amenity.fountain">Фонтан</string>
 	<string name="type.amenity.fuel">Заправка</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Кладбище</string>
-	<string name="type.amenity.grave_yard.christian">Кладбище</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.amenity.grave_yard.christian">Христианское кладбище</string>
 	<string name="type.amenity.hospital">Больница</string>
 	<string name="type.amenity.hunting_stand">Охотничья вышка</string>
 	<string name="type.amenity.ice_cream">Мороженое</string>
@@ -1098,7 +1100,9 @@
 	<string name="type.landuse.allotments">Земельные участки</string>
 	<string name="type.landuse.basin">Резервуар</string>
 	<string name="type.landuse.brownfield">Земля для застройки</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Кладбище</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Христианское кладбище</string>
 	<string name="type.landuse.churchyard">Церковный двор</string>
 	<string name="type.landuse.commercial">Коммерческая застройка</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index e0183dd4bf..08803876aa 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -676,7 +676,9 @@
 	<string name="type.amenity.fire_station">Hasičská stanica</string>
 	<string name="type.amenity.fountain">Fontána</string>
 	<string name="type.amenity.fuel">Benzínová pumpa</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Cintorín</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Cintorín</string>
 	<string name="type.amenity.hospital">Nemocnica</string>
 	<string name="type.amenity.hunting_stand">Lovecké stanovisko</string>
@@ -988,7 +990,9 @@
 	<string name="type.historic.ship">Pamätihodnosť</string>
 	<string name="type.historic.tomb">Pamätihodnosť</string>
 	<string name="type.landuse.basin">Vodná nádrž</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Cintorín</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Cintorín</string>
 	<string name="type.landuse.churchyard">Cintorín</string>
 	<string name="type.landuse.farmland">Pole</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 6761b959a2..bedfbd16d0 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -674,7 +674,9 @@
 	<string name="type.amenity.fire_station">Brandstation</string>
 	<string name="type.amenity.fountain">Fontän</string>
 	<string name="type.amenity.fuel">Bensinstation</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Begravningsplats</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Begravningsplats</string>
 	<string name="type.amenity.hospital">Sjukhus</string>
 	<string name="type.amenity.hunting_stand">Jakttorn</string>
@@ -983,7 +985,9 @@
 	<string name="type.historic.ship">Attraktion</string>
 	<string name="type.historic.tomb">Attraktion</string>
 	<string name="type.landuse.basin">Vattenbassäng</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Begravningsplats</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Begravningsplats</string>
 	<string name="type.landuse.churchyard">Kyrkogård</string>
 	<string name="type.landuse.farmland">Jordbruksmark</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 029e03eafa..1d59d5239f 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -679,7 +679,9 @@
 	<string name="type.amenity.fire_station">สถานีดับเพลิง</string>
 	<string name="type.amenity.fountain">น้ำพุ</string>
 	<string name="type.amenity.fuel">ปั๊มน้ำมัน</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">สุสาน</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">สุสาน</string>
 	<string name="type.amenity.hospital">คลินิก</string>
 	<string name="type.amenity.hunting_stand">จุดล่าสัตว์</string>
@@ -994,7 +996,9 @@
 	<string name="type.internet_access">อินเทอร์เน็ต</string>
 	<string name="type.internet_access.wlan">อินเทอร์เน็ต</string>
 	<string name="type.landuse.basin">อ่างน้ำ</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">สุสาน</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">สุสาน</string>
 	<string name="type.landuse.churchyard">บริเวณโบสถ์</string>
 	<string name="type.landuse.farmland">พื้นที่ทำการเกษตร</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index cbdf2d0dba..bcd573bb16 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -700,7 +700,9 @@
 	<string name="type.amenity.fire_station">Itfaiye</string>
 	<string name="type.amenity.fountain">Çeşme</string>
 	<string name="type.amenity.fuel">Benzin istasyonu</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Mezarlık</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Mezarlık</string>
 	<string name="type.amenity.hospital">Hastane</string>
 	<string name="type.amenity.hunting_stand">Avlanma alanı</string>
@@ -1011,7 +1013,9 @@
 	<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">Bir su havzası</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Mezarlık</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Mezarlık</string>
 	<string name="type.landuse.churchyard">Kilise Bölgesi</string>
 	<string name="type.landuse.farmland">Tarım arazileri</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 82aa929986..a9d23ac1e0 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -706,8 +706,10 @@
 	<string name="type.amenity.food_court">Ресторанний двір</string>
 	<string name="type.amenity.fountain">Фонтан</string>
 	<string name="type.amenity.fuel">Заправка</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Цвинтар</string>
-	<string name="type.amenity.grave_yard.christian">Цвинтар</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.amenity.grave_yard.christian">Християнський цвинтар</string>
 	<string name="type.amenity.hospital">Лікарня</string>
 	<string name="type.amenity.hunting_stand">Мисливська башта</string>
 	<string name="type.amenity.ice_cream">Кіоск з морозивом</string>
@@ -1073,7 +1075,9 @@
 	<string name="type.landuse.allotments">Земельні ділянки</string>
 	<string name="type.landuse.basin">Резервуар</string>
 	<string name="type.landuse.brownfield">Земля для будiвництва</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Цвинтар</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Християнський цвинтар</string>
 	<string name="type.landuse.churchyard">Церковний двір</string>
 	<string name="type.landuse.commercial">Комерційні ділянки</string>
@@ -1348,7 +1352,7 @@
 	<string name="type.shop.erotic">Секс-шоп</string>
 	<string name="type.shop.fabric">Крамниця</string>
 	<string name="type.shop.florist">Магазин квітів</string>
-	<string name="type.shop.funeral_directors">Ритуальна служба</string>
+	<string name="type.shop.funeral_directors">Ритуальні послуги</string>
 	<string name="type.shop.furniture">Магазин меблів</string>
 	<string name="type.shop.garden_centre">Товари для саду</string>
 	<string name="type.shop.gift">Магазин сувенірів</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 65a6ee8fe5..536ab4deda 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -677,7 +677,9 @@
 	<string name="type.amenity.fire_station">Trạm cứu hỏa</string>
 	<string name="type.amenity.fountain">Đài phun nước</string>
 	<string name="type.amenity.fuel">Trạm xăng</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Bãi tha ma</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Bãi tha ma</string>
 	<string name="type.amenity.hospital">Bệnhviện</string>
 	<string name="type.amenity.hunting_stand">Điểm săn bắn</string>
@@ -989,7 +991,9 @@
 	<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">Một chậu nước</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Bãi tha ma</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Bãi tha ma</string>
 	<string name="type.landuse.churchyard">Nhà thờ</string>
 	<string name="type.landuse.farmland">Đất nông nghiệp</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 0c031f59eb..57f9b3331c 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -702,7 +702,9 @@
 	<string name="type.amenity.fire_station">消防局</string>
 	<string name="type.amenity.fountain">噴泉</string>
 	<string name="type.amenity.fuel">加氣站</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">墓地</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">墓地</string>
 	<string name="type.amenity.hospital">醫院</string>
 	<string name="type.amenity.hunting_stand">狩獵場</string>
@@ -1018,7 +1020,9 @@
 	<string name="type.internet_access">互聯網</string>
 	<string name="type.internet_access.wlan">互聯網</string>
 	<string name="type.landuse.basin">水庫</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">墓地</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">基督教墓地</string>
 	<string name="type.landuse.churchyard">教堂庭院</string>
 	<string name="type.landuse.farmland">農業用地</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 38f39cf447..2adcc8c219 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -700,7 +700,9 @@
 	<string name="type.amenity.food_court">美食广场</string>
 	<string name="type.amenity.fountain">喷泉</string>
 	<string name="type.amenity.fuel">加油站</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">墓地</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">墓地</string>
 	<string name="type.amenity.hospital">医院</string>
 	<string name="type.amenity.hunting_stand">狩猎站</string>
@@ -1070,7 +1072,9 @@
 	<string name="type.landuse.allotments">市民农园</string>
 	<string name="type.landuse.basin">水盆地</string>
 	<string name="type.landuse.brownfield">棕土</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">墓地</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">基督教墓地</string>
 	<string name="type.landuse.churchyard">教堂庭院</string>
 	<string name="type.landuse.commercial">商务办公用地</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 72909a254c..7b9243ccec 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -737,8 +737,10 @@
 	<string name="type.amenity.food_court">Food Court</string>
 	<string name="type.amenity.fountain">Fountain</string>
 	<string name="type.amenity.fuel">Gas Station</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Graveyard</string>
-	<string name="type.amenity.grave_yard.christian">Graveyard</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.amenity.grave_yard.christian">Christian Graveyard</string>
 	<string name="type.amenity.hospital">Hospital</string>
 	<string name="type.amenity.hunting_stand">Hunting Stand</string>
 	<string name="type.amenity.ice_cream">Ice Cream Stand</string>
@@ -1125,8 +1127,10 @@
 	<string name="type.landuse.allotments">Allotments</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>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.landuse.cemetery">Cemetery</string>
+	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
+	<string name="type.landuse.cemetery.christian">Christian Cemetery</string>
 	<string name="type.landuse.churchyard">Churchyard</string>
 	<string name="type.landuse.commercial">Commercial Area</string>
 	<string name="type.landuse.construction">Construction</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 43381ed197..c14fa37c41 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "محطة وقود";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "مقبرة";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "مقبرة";
 
 "type.amenity.hospital" = "عيادة";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "مقبرة";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "مقبرة";
 
 "type.landuse.churchyard" = "فناء الكنيسة";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 728f07382a..e24de47458 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1301,9 +1301,11 @@
 
 "type.amenity.fuel" = "Gas Station";
 
-"type.amenity.grave_yard" = "Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.amenity.grave_yard" = "Могілкі";
 
-"type.amenity.grave_yard.christian" = "Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.amenity.grave_yard.christian" = "Хрысціянскія могілкі";
 
 "type.amenity.hospital" = "Hospital";
 
@@ -2075,9 +2077,11 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
-"type.landuse.cemetery" = "Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery" = "Могілкі";
 
-"type.landuse.cemetery.christian" = "Christian Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery.christian" = "Хрысціянскія могілкі";
 
 "type.landuse.churchyard" = "Churchyard";
 
@@ -2647,7 +2651,7 @@
 
 "type.shop.florist" = "Florist’s";
 
-"type.shop.funeral_directors" = "Funeral Directors";
+"type.shop.funeral_directors" = "Рытуальныя паслугі";
 
 "type.shop.furniture" = "Furniture Store";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index e1b38f246c..c5acc26741 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Gas Station";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Graveyard";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Graveyard";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,9 +2077,11 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Graveyard";
 
-"type.landuse.cemetery.christian" = "Christian Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery.christian" = "Graveyard";
 
 "type.landuse.churchyard" = "Churchyard";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 8c357d7982..919c6df42f 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Čerpací stanice";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Hřbitov";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Hřbitov";
 
 "type.amenity.hospital" = "Nemocnice";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Hřbitov";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Hřbitov";
 
 "type.landuse.churchyard" = "Nádvoří kostela";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 5f9d8d79a8..607c510c19 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Tankstation";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Kirkegård";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Kirkegård";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Kirkegård";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Kirkegård";
 
 "type.landuse.churchyard" = "Kirkegård";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index b973d37bb7..19e2e78ec7 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Tankstelle";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Friedhof";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Friedhof";
 
 "type.amenity.hospital" = "Krankenhaus";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brachfläche";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Friedhof";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Friedhof";
 
 "type.landuse.churchyard" = "Kirchhof";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 8f02d28544..aaaa54776c 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Βενζινάδικο";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Νεκροταφείο";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Νεκροταφείο";
 
 "type.amenity.hospital" = "Νοσοκομείο";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Νεκροταφείο";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Νεκροταφείο";
 
 "type.landuse.churchyard" = "Αυλόγυρος εκκλησίας";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index c6d41aba14..d7d9648855 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Gas Station";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Graveyard";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Graveyard";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,9 +2077,11 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Graveyard";
 
-"type.landuse.cemetery.christian" = "Christian Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery.christian" = "Graveyard";
 
 "type.landuse.churchyard" = "Churchyard";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index b52be11a62..09991b9a7d 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1301,9 +1301,11 @@
 
 "type.amenity.fuel" = "Gas Station";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Graveyard";
 
-"type.amenity.grave_yard.christian" = "Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.amenity.grave_yard.christian" = "Christian Graveyard";
 
 "type.amenity.hospital" = "Hospital";
 
@@ -2075,9 +2077,11 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
-"type.landuse.cemetery" = "Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery" = "Cemetery";
 
-"type.landuse.cemetery.christian" = "Christian Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery.christian" = "Christian Cemetery";
 
 "type.landuse.churchyard" = "Churchyard";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 60c61bf9e2..860ea121a3 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Gas Station";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Graveyard";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Graveyard";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,9 +2077,11 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Graveyard";
 
-"type.landuse.cemetery.christian" = "Christian Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery.christian" = "Graveyard";
 
 "type.landuse.churchyard" = "Camposanto";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 8c38c67b2f..9605a30886 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Gasolinera";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cementerio";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cementerio";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cementerio";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cementerio";
 
 "type.landuse.churchyard" = "Camposanto";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 41d4747249..4c3e41790c 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "سوخت";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "قبرستان";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "قبرستان";
 
 "type.amenity.hospital" = "بیمارستان";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "قبرستان";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "قبرستان";
 
 "type.landuse.churchyard" = "حیاط کلیسا";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index ec75357a38..1c6392ec86 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Huoltoasema";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Hautausmaa";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Hautausmaa";
 
 "type.amenity.hospital" = "Sairaala";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Hautausmaa";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Hautausmaa";
 
 "type.landuse.churchyard" = "Kirkon piha";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 27d4d38c60..664c80f936 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Station-service";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cimetière";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cimetière";
 
 "type.amenity.hospital" = "Hôpital";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Friche industrielle";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cimetière";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cimetière";
 
 "type.landuse.churchyard" = "Cour d'église";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index ae6bc2e9e3..061eb97293 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Gas Station";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Graveyard";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Graveyard";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,9 +2077,11 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Graveyard";
 
-"type.landuse.cemetery.christian" = "Christian Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery.christian" = "Graveyard";
 
 "type.landuse.churchyard" = "Churchyard";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index d25d3e68cd..169ba68a8e 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Benzinkút";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Temető";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Temető";
 
 "type.amenity.hospital" = "Kórház";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Temető";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Temető";
 
 "type.landuse.churchyard" = "Templomtér";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index baa8a4c97a..fee72a2301 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Pompa bensin";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Pemakaman";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Pemakaman";
 
 "type.amenity.hospital" = "Rumahsakit";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Pemakaman";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Pemakaman";
 
 "type.landuse.churchyard" = "Halaman gereja";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 97030bc74d..9c485713b2 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Stazione di rifornimento";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cimitero";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cimitero";
 
 "type.amenity.hospital" = "Ospedale";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cimitero";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cimitero";
 
 "type.landuse.churchyard" = "Sagrato della chiesa";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index c3c2c95cde..c07af82558 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "ガソリンスタンド";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "墓地";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "キリスト教墓地";
 
 "type.amenity.hospital" = "病院";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "再開発用地";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "墓地";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "キリスト教墓地";
 
 "type.landuse.churchyard" = "キリスト教教会付属地";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 11c9314970..7b93601d03 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "주유소";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "묘소";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "묘소";
 
 "type.amenity.hospital" = "병원";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "묘소";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "묘소";
 
 "type.landuse.churchyard" = "교회 마당";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index ce7f3d173d..e481ad398f 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Bensinstasjon";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Gravplass";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Gravplass";
 
 "type.amenity.hospital" = "Sykehus";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Gravplass";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Gravplass";
 
 "type.landuse.churchyard" = "Kirkegård";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 9136aef8f7..8758a0598d 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Tankstation";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Begraafplaats";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Begraafplaats";
 
 "type.amenity.hospital" = "Ziekenhuis";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Begraafplaats";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Begraafplaats";
 
 "type.landuse.churchyard" = "Kerkhof";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 788ddfaf14..ecf3050642 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Stacja benzynowa";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cmentarz";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cmentarz chrześcijański";
 
 "type.amenity.hospital" = "Szpital";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Teren do zabudowy";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cmentarz";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cmentarz chrześcijański";
 
 "type.landuse.churchyard" = "Teren kościelny";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index f7b22fcae9..31d97ef78f 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Posto de combustível";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cemitério";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cemitério cristão";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Terreno industrial devoluto";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cemitério";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cemitério cristão";
 
 "type.landuse.churchyard" = "Adro de igreja";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 6588ee2b4d..ae4a2dcb36 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Posto de combustível";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cemitério";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cemitério cristão";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Terreno industrial devoluto";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cemitério";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cemitério cristão";
 
 "type.landuse.churchyard" = "Adro de igreja";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 55d5920848..f4a7ca0105 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Benzinărie";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cimitir";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cimitir";
 
 "type.amenity.hospital" = "Spital";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cimitir";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cimitir";
 
 "type.landuse.churchyard" = "Curtea Bisericii";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 997b969f54..273341cb76 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1301,9 +1301,11 @@
 
 "type.amenity.fuel" = "Заправка";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Кладбище";
 
-"type.amenity.grave_yard.christian" = "Кладбище";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.amenity.grave_yard.christian" = "Христианское кладбище";
 
 "type.amenity.hospital" = "Больница";
 
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Земля для застройки";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Кладбище";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Христианское кладбище";
 
 "type.landuse.churchyard" = "Церковный двор";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 185338b959..8543cb16fb 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Benzínová pumpa";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cintorín";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Cintorín";
 
 "type.amenity.hospital" = "Nemocnica";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Cintorín";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cintorín";
 
 "type.landuse.churchyard" = "Cintorín";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 3edd371bcb..3cfc795a37 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Bensinstation";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Begravningsplats";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Begravningsplats";
 
 "type.amenity.hospital" = "Sjukhus";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Begravningsplats";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Begravningsplats";
 
 "type.landuse.churchyard" = "Kyrkogård";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 04c5b28697..a99fb0dcf5 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Gas Station";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Graveyard";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Graveyard";
 
 "type.amenity.hospital" = "Hospital";
@@ -2075,9 +2077,11 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Graveyard";
 
-"type.landuse.cemetery.christian" = "Christian Graveyard";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.landuse.cemetery.christian" = "Graveyard";
 
 "type.landuse.churchyard" = "Sehemu ya kanisa";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 1822cd9871..557cf8a5e0 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "ปั๊มน้ำมัน";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "สุสาน";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "สุสาน";
 
 "type.amenity.hospital" = "คลินิก";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "สุสาน";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "สุสาน";
 
 "type.landuse.churchyard" = "บริเวณโบสถ์";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 5355ac8aaf..b13adfb6bd 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Benzin istasyonu";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Mezarlık";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Mezarlık";
 
 "type.amenity.hospital" = "Hastane";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Mezarlık";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Mezarlık";
 
 "type.landuse.churchyard" = "Kilise Bölgesi";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 76404854d8..11368bf2f0 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1301,9 +1301,11 @@
 
 "type.amenity.fuel" = "Заправка";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Цвинтар";
 
-"type.amenity.grave_yard.christian" = "Цвинтар";
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
+"type.amenity.grave_yard.christian" = "Християнський цвинтар";
 
 "type.amenity.hospital" = "Лікарня";
 
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Земля для будiвництва";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Цвинтар";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Християнський цвинтар";
 
 "type.landuse.churchyard" = "Церковний двір";
@@ -2647,7 +2651,7 @@
 
 "type.shop.florist" = "Магазин квітів";
 
-"type.shop.funeral_directors" = "Ритуальна служба";
+"type.shop.funeral_directors" = "Ритуальні послуги";
 
 "type.shop.furniture" = "Магазин меблів";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 2a76bc9c85..0d197ab73e 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "Trạm xăng";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Bãi tha ma";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "Bãi tha ma";
 
 "type.amenity.hospital" = "Bệnhviện";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Bãi tha ma";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Bãi tha ma";
 
 "type.landuse.churchyard" = "Nhà thờ";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 8be1500931..6715bc0102 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "加油站";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "墓地";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "墓地";
 
 "type.amenity.hospital" = "医院";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "棕土";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "墓地";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "基督教墓地";
 
 "type.landuse.churchyard" = "教堂庭院";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index ac70b05a2c..8829b78490 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1301,8 +1301,10 @@
 
 "type.amenity.fuel" = "加氣站";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "墓地";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard.christian" = "墓地";
 
 "type.amenity.hospital" = "醫院";
@@ -2075,8 +2077,10 @@
 
 "type.landuse.brownfield" = "Brownfield";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "墓地";
 
+/* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "基督教墓地";
 
 "type.landuse.churchyard" = "教堂庭院";