diff --git a/android/app/src/main/res/values-af/types_strings.xml b/android/app/src/main/res/values-af/types_strings.xml
index 842e61c17..98e8ee3d9 100644
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -561,7 +561,6 @@
Begraafplaas
Christelike begraafplaas
- Kerkhof
Kommersiële gebied
Bouplek
Opvoedkundige fasiliteit
diff --git a/android/app/src/main/res/values-ar/types_strings.xml b/android/app/src/main/res/values-ar/types_strings.xml
index 5a06a1745..95e22ac8a 100644
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -589,7 +589,6 @@
مقبرة
مقبرة مسيحية
- فناء الكنيسة
منطقة تجارية
منطقة بناء
مؤسسة تعليمية
diff --git a/android/app/src/main/res/values-az/types_strings.xml b/android/app/src/main/res/values-az/types_strings.xml
index eda3edaff..0dc5e9d9f 100644
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -580,7 +580,6 @@
Məzarlıq
Xristian qəbiristanlığı
- Kilsə rayonu
Kommersiya
Struktur
Kənd Təsərrüfatı Torpaqları
diff --git a/android/app/src/main/res/values-bg/types_strings.xml b/android/app/src/main/res/values-bg/types_strings.xml
index 5f0e4e729..e95f98458 100644
--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -751,7 +751,6 @@
Малък път
Кръгово
Кръгово
- Църковен двор
Складова кула
Главен път
Обслужващ път
diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/app/src/main/res/values-cs/types_strings.xml
index 5d1995be7..1fac9893d 100644
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -525,7 +525,6 @@
Hřbitov
Hřbitov
- Nádvoří kostela
Orná půda
Záhon
Les
diff --git a/android/app/src/main/res/values-da/types_strings.xml b/android/app/src/main/res/values-da/types_strings.xml
index d30f27268..ec6b7beea 100644
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -515,7 +515,6 @@
Kirkegård
Kirkegård
- Kirkegård
Landbrugsjord
Blomsterseng
Skov
diff --git a/android/app/src/main/res/values-de/types_strings.xml b/android/app/src/main/res/values-de/types_strings.xml
index 01a984194..eb36c488e 100644
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -577,7 +577,6 @@
Friedhof
Friedhof
- Kirchhof
Gewerbegebiet
Baustelle
Bildungseinrichtung
diff --git a/android/app/src/main/res/values-el/types_strings.xml b/android/app/src/main/res/values-el/types_strings.xml
index 42d46f12a..ece0c722b 100644
--- a/android/app/src/main/res/values-el/types_strings.xml
+++ b/android/app/src/main/res/values-el/types_strings.xml
@@ -535,7 +535,6 @@
Νεκροταφείο
Νεκροταφείο
- Αυλόγυρος εκκλησίας
Αγροτική γη
Παρτέρι
Δάσος
diff --git a/android/app/src/main/res/values-es-rMX/types_strings.xml b/android/app/src/main/res/values-es-rMX/types_strings.xml
index 14ce0d25e..236a5b80f 100644
--- a/android/app/src/main/res/values-es-rMX/types_strings.xml
+++ b/android/app/src/main/res/values-es-rMX/types_strings.xml
@@ -153,7 +153,6 @@
Glorieta
Glorieta
- Camposanto
Terreno agrícola
Césped
Vertedero
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml
index a6bc5f725..413818754 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -594,7 +594,6 @@
Cementerio
Cementerio cristiano
- Camposanto
Zona comercial
Construcción
Instalaciones educativas
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/app/src/main/res/values-et/types_strings.xml
index ab130c42e..d827dbf56 100644
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -592,7 +592,6 @@
Surnuaed
Kristlik surnuaed
- Kirikuaed
Ärimaa
Ehitusala
Haridusasutuse maaala
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/app/src/main/res/values-eu/types_strings.xml
index 8387515f8..e83a18570 100644
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -576,7 +576,6 @@
Hilerria
Hilerria
- Hilerria
Nekazaritza-lurra
Lore-ohea
Basoa
diff --git a/android/app/src/main/res/values-fa/types_strings.xml b/android/app/src/main/res/values-fa/types_strings.xml
index 10c1e146a..31d79c1da 100644
--- a/android/app/src/main/res/values-fa/types_strings.xml
+++ b/android/app/src/main/res/values-fa/types_strings.xml
@@ -442,7 +442,6 @@
قبرستان
قبرستان
- حیاط کلیسا
زمین کشاورزی
باغچه
جنگل
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index 98af6329f..aba7df2f7 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -582,7 +582,6 @@
Hautausmaa
Kristillinen hautausmaa
- Kirkon piha
Kaupallinen alue
Rakennustyömaa
Koulutuslaitos
diff --git a/android/app/src/main/res/values-fr/types_strings.xml b/android/app/src/main/res/values-fr/types_strings.xml
index 4ec56f69b..5909c8ecf 100644
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -576,7 +576,6 @@
Cimetière
Cimetière chrétien
- Cour d\'église
Zone commerciale
Chantier de construction
Établissements éducatifs
diff --git a/android/app/src/main/res/values-gl/types_strings.xml b/android/app/src/main/res/values-gl/types_strings.xml
index 29a5a354e..fd784703a 100644
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -542,7 +542,6 @@
Solar abandonado
Cemiterio
Cemiterio cristián
- Camposanto
Zona comercial
Construción
Instalacións educativas
diff --git a/android/app/src/main/res/values-gsw/types_strings.xml b/android/app/src/main/res/values-gsw/types_strings.xml
index 07d739ccf..0740f63b0 100644
--- a/android/app/src/main/res/values-gsw/types_strings.xml
+++ b/android/app/src/main/res/values-gsw/types_strings.xml
@@ -491,7 +491,6 @@
Bassin
Brache
Fridhof
- Chilehof
Baustell
Bildigsiirichtig
Ackerland
diff --git a/android/app/src/main/res/values-hu/types_strings.xml b/android/app/src/main/res/values-hu/types_strings.xml
index 6d48a8351..0ffb913f2 100644
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -527,7 +527,6 @@
Temető
Keresztény temető
- Templomkert
Szántóföld
Virágágyás
Telepített erdő
diff --git a/android/app/src/main/res/values-in/types_strings.xml b/android/app/src/main/res/values-in/types_strings.xml
index f41d890da..5da8d1f20 100644
--- a/android/app/src/main/res/values-in/types_strings.xml
+++ b/android/app/src/main/res/values-in/types_strings.xml
@@ -521,7 +521,6 @@
Pemakaman
Pemakaman
- Halaman gereja
Lahan pertanian
Hamparan bunga
Hutan
diff --git a/android/app/src/main/res/values-is/types_strings.xml b/android/app/src/main/res/values-is/types_strings.xml
index bf5df0bf1..4a02d0078 100644
--- a/android/app/src/main/res/values-is/types_strings.xml
+++ b/android/app/src/main/res/values-is/types_strings.xml
@@ -1120,7 +1120,6 @@
Krossminnismerki
Minningarskjöldur
Kristinn grafreitur
- Kirkjugarður
Menntastofnun
Laufskógur
Blandaður skógur
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml
index 7c123981b..fb9b206b6 100644
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -586,7 +586,6 @@
Cimitero
Cimitero cristiano
- Sagrato della chiesa
Area commerciale
Cantiere
Strutture didattiche
diff --git a/android/app/src/main/res/values-iw/types_strings.xml b/android/app/src/main/res/values-iw/types_strings.xml
index 4c5bb7c90..daf068a97 100644
--- a/android/app/src/main/res/values-iw/types_strings.xml
+++ b/android/app/src/main/res/values-iw/types_strings.xml
@@ -604,7 +604,6 @@
בית קברות
בית קברות נוצרי
- חצר כנסיה
אזור מסחרי
אתר בניה
קריית חינוך
diff --git a/android/app/src/main/res/values-ja/types_strings.xml b/android/app/src/main/res/values-ja/types_strings.xml
index bf32c2c45..609187acb 100644
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -565,7 +565,6 @@
墓地
キリスト教墓地
- キリスト教教会付属地
商業用地
建設工事中
農地
diff --git a/android/app/src/main/res/values-ko/types_strings.xml b/android/app/src/main/res/values-ko/types_strings.xml
index fc853350a..d946dee2f 100644
--- a/android/app/src/main/res/values-ko/types_strings.xml
+++ b/android/app/src/main/res/values-ko/types_strings.xml
@@ -529,7 +529,6 @@
묘소
묘소
- 교회 마당
농지
\"화단\"
숲
diff --git a/android/app/src/main/res/values-nb/types_strings.xml b/android/app/src/main/res/values-nb/types_strings.xml
index 18738811e..616b6282b 100644
--- a/android/app/src/main/res/values-nb/types_strings.xml
+++ b/android/app/src/main/res/values-nb/types_strings.xml
@@ -536,7 +536,6 @@
Gravplass
Gravplass
- Kirkegård
Jordbruksområde
Blomsterbed
Skog
diff --git a/android/app/src/main/res/values-nl/types_strings.xml b/android/app/src/main/res/values-nl/types_strings.xml
index 89c919317..52dafe481 100644
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -588,7 +588,6 @@
Begraafplaats
Christelijke begraafplaats
- Kerkhof
Commercieel gebied
Bouwplaats
Educatieve voorzieningen
diff --git a/android/app/src/main/res/values-pl/types_strings.xml b/android/app/src/main/res/values-pl/types_strings.xml
index bfd548132..1b21cc8ac 100644
--- a/android/app/src/main/res/values-pl/types_strings.xml
+++ b/android/app/src/main/res/values-pl/types_strings.xml
@@ -588,7 +588,6 @@
Cmentarz
Cmentarz chrześcijański
- Teren kościelny
Teren handlu i usług
Teren budowy
Placówki oświatowe
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index 66de0f581..cd7303eb0 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -510,7 +510,6 @@
Cemitério
Cemitério cristão
- Adro de igreja
Área comercial
Construção
Instituições educacionais
diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml
index c081d0f2d..684fc3754 100644
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -577,7 +577,6 @@
Cemitério
Cemitério cristão
- Adro de igreja
Área comercial
Construção
Campo agrícola
diff --git a/android/app/src/main/res/values-ro/types_strings.xml b/android/app/src/main/res/values-ro/types_strings.xml
index cc2f4640a..55b4a9b06 100644
--- a/android/app/src/main/res/values-ro/types_strings.xml
+++ b/android/app/src/main/res/values-ro/types_strings.xml
@@ -520,7 +520,6 @@
Cimitir
Cimitir
- Curtea Bisericii
Teren arabil
Pat de flori
Pădure
diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml
index ec228e415..b89aa2b9e 100644
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -594,7 +594,6 @@
Кладбище
Христианское кладбище
- Церковный двор
Коммерческая застройка
Стройка
Образовательные учреждения
diff --git a/android/app/src/main/res/values-sk/types_strings.xml b/android/app/src/main/res/values-sk/types_strings.xml
index f7bedff68..9fd76966d 100644
--- a/android/app/src/main/res/values-sk/types_strings.xml
+++ b/android/app/src/main/res/values-sk/types_strings.xml
@@ -581,7 +581,6 @@
Cintorín
Kresťanský cintorín
- Cintorín
Komerčná oblasť
Stavenisko
Vzdelávacia inštitúcia
diff --git a/android/app/src/main/res/values-sr/types_strings.xml b/android/app/src/main/res/values-sr/types_strings.xml
index 94b501182..bf2926ac8 100644
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -593,7 +593,6 @@
Гробље
Хришћанско гробље
- Двориште цркве
Кмерцијална област
Градилиште
Образовна установа
diff --git a/android/app/src/main/res/values-sv/types_strings.xml b/android/app/src/main/res/values-sv/types_strings.xml
index 21a0ba9a2..38c0183d7 100644
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -523,7 +523,6 @@
Begravningsplats
Begravningsplats
- Kyrkogård
Jordbruksmark
Rabatt
Skog
diff --git a/android/app/src/main/res/values-sw/types_strings.xml b/android/app/src/main/res/values-sw/types_strings.xml
index 5c93a713a..bc7cbc99a 100644
--- a/android/app/src/main/res/values-sw/types_strings.xml
+++ b/android/app/src/main/res/values-sw/types_strings.xml
@@ -275,7 +275,6 @@
Kaburi la njia
Ajali ya meli
Bonde la Maji
- Sehemu ya kanisa
Shamba
Kitanda cha maua
Bustani
diff --git a/android/app/src/main/res/values-th/types_strings.xml b/android/app/src/main/res/values-th/types_strings.xml
index 2cc89c29d..e7d6e8db1 100644
--- a/android/app/src/main/res/values-th/types_strings.xml
+++ b/android/app/src/main/res/values-th/types_strings.xml
@@ -530,7 +530,6 @@
สุสาน
สุสาน
- บริเวณโบสถ์
พื้นที่ทำการเกษตร
แปลงดอกไม้
ป่า
diff --git a/android/app/src/main/res/values-tr/types_strings.xml b/android/app/src/main/res/values-tr/types_strings.xml
index 2f628127e..7a8079e08 100644
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -586,7 +586,6 @@
Mezarlık
Hristiyan Mezarlığı
- Kilise Bölgesi
Ticari Alan
Yapı
Tarım Arazileri
diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/app/src/main/res/values-uk/types_strings.xml
index 6384184b9..b42b07efe 100644
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -591,7 +591,6 @@
Цвинтар
Християнський цвинтар
- Церковний двір
Комерційні ділянки
Будівництво
Освітній заклади
diff --git a/android/app/src/main/res/values-vi/types_strings.xml b/android/app/src/main/res/values-vi/types_strings.xml
index de0c2a6f8..384cd9277 100644
--- a/android/app/src/main/res/values-vi/types_strings.xml
+++ b/android/app/src/main/res/values-vi/types_strings.xml
@@ -527,7 +527,6 @@
Bãi tha ma
Bãi tha ma
- Nhà thờ
Đất nông nghiệp
Giường hoa
Rừng
diff --git a/android/app/src/main/res/values-zh-rHK/types_strings.xml b/android/app/src/main/res/values-zh-rHK/types_strings.xml
index 1a60b754c..df7616c4f 100644
--- a/android/app/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml
@@ -589,7 +589,6 @@
墓地
基督教墓地
- 教堂庭院
商業區
建設區域
教育設施
diff --git a/android/app/src/main/res/values-zh/types_strings.xml b/android/app/src/main/res/values-zh/types_strings.xml
index 4212004c0..f64e64d8a 100644
--- a/android/app/src/main/res/values-zh/types_strings.xml
+++ b/android/app/src/main/res/values-zh/types_strings.xml
@@ -590,7 +590,6 @@
墓地
基督教墓地
- 教堂庭院
商业区
建设区域
教育设施
diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index 9d5ae70ad..6c0b1d281 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -614,7 +614,7 @@
Cemetery
Christian Cemetery
- Churchyard
+ Religious Land
Commercial Area
Construction Area
Educational Facility
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 1897f8bdd..50535a7e3 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1448,7 +1448,7 @@ amenity|parking_space;1326;
amenity|parking_space|underground;[amenity=parking_space][parking=underground];;name;int_name;1327;
amenity|parking_space|private;[amenity=parking_space][access=private];;name;int_name;1328;
amenity|parking_space|permissive;[amenity=parking_space][access=permissive];;name;int_name;1329;
-landuse|churchyard;1330;
+landuse|religious;1330;
isoline|step_1000;1331;
isoline|step_500;1332;
isoline|step_100;1333;
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index b1f7d4aee..90365cd65 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -340,7 +340,6 @@ area|z14-[area:highway=footway],
area|z14-[area:highway=living_street],
area|z14-[amenity=grave_yard],
area|z14-[landuse=cemetery],
-area|z15-[landuse=churchyard],
area|z15-[amenity=parking],
area|z16-[public_transport=platform],
area|z16-[railway=platform],
@@ -442,6 +441,7 @@ area|z13-[leisure=marina],
area|z13-[leisure=water_park],
area|z13-[amenity=place_of_worship],
+area|z13-[landuse=religious],
area|z13-[tourism=camp_site],
area|z13-[emergency=mountain_rescue],
area|z13-[leisure=resort],
@@ -486,14 +486,6 @@ area|z15-19[aeroway=aerodrome]
{fill-color: @aerodrome5;}
-/* 7.7 Religion */
-
-area|z15[landuse=churchyard],
-{fill-color: @background0;}
-
-area|z16-[landuse=churchyard],
-{fill-color: @background1;}
-
/* 7.8 Agricultural */
area|z10-[landuse=farmland],
{fill-color: @farmland; fill-opacity: 1;}
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index df59ece0e..578822bcc 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -27,6 +27,7 @@ amenity-place_of_worship-jewish # area z13- (also has icon z
amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-religious
=== 240
amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-)
@@ -153,7 +154,6 @@ landuse-forest-mixed # area z10- (also has icon z
=== 60
amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z19-)
-landuse-churchyard # area z15-
landuse-construction # area z13- (also has caption z15-)
landuse-industrial # area z13- (also has caption z15-)
landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 0e03901dd..e8604dbb5 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -27,6 +27,7 @@ amenity-place_of_worship-jewish # area z13- (also has icon z
amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-religious
=== 240
amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-)
@@ -153,7 +154,6 @@ landuse-forest-mixed # area z10- (also has icon z
=== 60
amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z19-)
-landuse-churchyard # area z15-
landuse-construction # area z13- (also has caption z15-)
landuse-industrial # area z13- (also has caption z15-)
landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-)
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index d1f675b35..a61c72f8a 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -362,9 +362,6 @@ area|z15-19[aeroway=aerodrome][aerodrome=international],
area|z15-19[aeroway=aerodrome]
{fill-color: @aerodrome5;}
-/* 7.7 Religion */
-area|z15-[landuse=churchyard]
-{fill-color: @background; fill-opacity: 1;}
/* 7.8 Agricultural */
area|z14-[landuse=farmland],
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index bebfa2f86..4b1bcb1dc 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -87,7 +87,6 @@ landuse-forest-mixed # area z10- (also has icon z
=== 50
amenity-waste_transfer_station # area z15-
-landuse-churchyard # area z15-
landuse-construction # area z15-
landuse-industrial # area z15-
landuse-industrial-mine # area z15-
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
index a46dc4ce7..a4c12b26a 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Christelike begraafplaas";
-"type.landuse.churchyard" = "Kerkhof";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Kommersiële gebied";
"type.landuse.construction" = "Bouplek";
"type.landuse.education" = "Opvoedkundige fasiliteit";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
index 13c225089..35d8f2dc3 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "فناء الكنيسة";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "منطقة تجارية";
"type.landuse.construction" = "منطقة بناء";
"type.landuse.education" = "مؤسسة تعليمية";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
index 9e3270ba0..dfb5ff0bf 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Xristian qəbiristanlığı";
-"type.landuse.churchyard" = "Kilsə rayonu";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Kommersiya";
"type.landuse.construction" = "Struktur";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
index c8e82df4c..ddd441d94 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Адукацыйныя ўстановы";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
index a614af573..06b3a8326 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
@@ -670,7 +670,7 @@
/* In most (European) countries, с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" = "Църковен двор";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
index 1f3be4d00..11fc13fed 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Cementiri cristià";
-"type.landuse.churchyard" = "Churchyard";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
index fcde4fa9b..0984bbf5f 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Komerční zóna";
"type.landuse.construction" = "Stavební oblast";
"type.landuse.education" = "Vzdělávací zařízení";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
index 81f7480df..283f75184 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -670,7 +670,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Erhvervsområde";
"type.landuse.construction" = "Byggeplads";
"type.landuse.education" = "Uddannelsesområde";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index 569bf3d39..fbc0ef62e 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Gewerbegebiet";
"type.landuse.construction" = "Baustelle";
"type.landuse.education" = "Bildungseinrichtung";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
index 409be9513..1d1a086cf 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Αυλόγυρος εκκλησίας";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index a5c00d361..87c2e6976 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index 0f897a58b..a771409b8 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -692,7 +692,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
index b5647f9ea..5b1043298 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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 cristiano";
-"type.landuse.churchyard" = "Camposanto";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Zona comercial";
"type.landuse.construction" = "Construcción";
"type.landuse.education" = "Instalaciones educativas";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index c6ee9d4af..8b66d5a96 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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 cristiano";
-"type.landuse.churchyard" = "Camposanto";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Zona comercial";
"type.landuse.construction" = "Construcción";
"type.landuse.education" = "Instalaciones educativas";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index 9240e00c8..c3c8f9b05 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -671,7 +671,7 @@
/* In most (European) countries, с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" = "Kristlik surnuaed";
-"type.landuse.churchyard" = "Kirikuaed";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Ärimaa";
"type.landuse.construction" = "Ehitusala";
"type.landuse.education" = "Haridusasutuse maaala";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
index a10d2d31d..b5f120f3c 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Hilerria";
-"type.landuse.churchyard" = "Hilerria";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Komertzial-gunea";
"type.landuse.construction" = "Eraikitze-gunea";
"type.landuse.education" = "Hezkuntza-azpiegitura";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
index a6a40e741..37392d7c7 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "حیاط کلیسا";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
index bb7525e44..980e7e60f 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Kristillinen hautausmaa";
-"type.landuse.churchyard" = "Kirkon piha";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Kaupallinen alue";
"type.landuse.construction" = "Rakennustyömaa";
"type.landuse.education" = "Koulutuslaitos";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
index 6d9c6de8b..9a4f564d4 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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 chrétien";
-"type.landuse.churchyard" = "Cour d'église";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Zone commerciale";
"type.landuse.construction" = "Chantier de construction";
"type.landuse.education" = "Établissements éducatifs";
diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
index e1d89ffdb..14e819ed2 100644
--- a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
@@ -619,7 +619,7 @@
"type.junction.roundabout" = "Rotonda";
"type.landuse.cemetery" = "Cemiterio";
"type.landuse.cemetery.christian" = "Cemiterio cristián";
-"type.landuse.churchyard" = "Camposanto";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Zona comercial";
"type.landuse.construction" = "Construción";
"type.landuse.education" = "Instalacións educativas";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
index c5bb674f8..64d6fa032 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
@@ -574,7 +574,7 @@
"type.landuse.brownfield" = "Brache";
"type.landuse.cemetery" = "Fridhof";
"type.landuse.cemetery.christian" = "Fridhof";
-"type.landuse.churchyard" = "Chilehof";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Gwerbegebiet";
"type.landuse.construction" = "Baustell";
"type.landuse.education" = "Bildigsiirichtig";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
index 682ea0c7d..2652fa1a5 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "חצר כנסיה";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "אזור מסחרי";
"type.landuse.construction" = "אתר בניה";
"type.landuse.education" = "קריית חינוך";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
index 1b002ff32..3244993bc 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "वाणिज्य क्षेत्र";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index e6955f755..21ce52ffd 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -652,7 +652,7 @@
/* In most (European) countries, с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" = "Keresztény temető";
-"type.landuse.churchyard" = "Templomkert";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Üzleti terület";
"type.landuse.construction" = "Építési terület";
"type.landuse.education" = "Oktatási létesítmény";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
index c6e9dad85..3e2af7315 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
index 90ca769be..7177549c7 100644
--- a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
@@ -291,7 +291,7 @@
"type.historic.locomotive" = "Söguleg gufulest";
"type.historic.memorial.cross" = "Krossminnismerki";
"type.historic.memorial.plaque" = "Minningarskjöldur";
-"type.landuse.churchyard" = "Kirkjugarður";
+"type.landuse.religious" = "Religious Land";
"type.landuse.forest.deciduous" = "Laufskógur";
"type.landuse.forest.mixed" = "Blandaður skógur";
"type.man_made.pipeline.overground" = "Leiðsla ofanjarðar";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index c207c5ebd..4b7881e3c 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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 cristiano";
-"type.landuse.churchyard" = "Sagrato della chiesa";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Area commerciale";
"type.landuse.construction" = "Cantiere";
"type.landuse.education" = "Strutture didattiche";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
index b3ac4a5b4..842c204a0 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "キリスト教教会付属地";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "商業用地";
"type.landuse.construction" = "建設工事中";
"type.landuse.education" = "教育施設";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
index 770220b99..0d10802fc 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "교회 마당";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
index 9d8a31521..a2798ea22 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
index f6afafa70..99b2cfce2 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
index 879af8549..ae1394cf9 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "व्यावसायिक क्षेत्र";
"type.landuse.construction" = "बांधकाम";
"type.landuse.education" = "शैक्षणिक सुविधा";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
index d68587e24..021d6de92 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
index 957d739dd..a4573c860 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
index ac4c0c192..6e35643fe 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Christelijke begraafplaats";
-"type.landuse.churchyard" = "Kerkhof";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercieel gebied";
"type.landuse.construction" = "Bouwplaats";
"type.landuse.education" = "Educatieve voorzieningen";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
index 897cdf284..0aa31ffe3 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Teren handlu i usług";
"type.landuse.construction" = "Teren budowy";
"type.landuse.education" = "Placówki oświatowe";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index 2b434a272..8032f86d7 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Área comercial";
"type.landuse.construction" = "Construção";
"type.landuse.education" = "Instituições educacionais";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
index 1c432de96..4a74ed34f 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Área comercial";
"type.landuse.construction" = "Construção";
"type.landuse.education" = "Instalação Educativa";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
index 4416570a9..186ca7656 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
index a3b57240d..d78dfe796 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Церковный двор";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Коммерческая застройка";
"type.landuse.construction" = "Стройка";
"type.landuse.education" = "Образовательные учреждения";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
index d808f7706..750d964fa 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Kresťanský cintorín";
-"type.landuse.churchyard" = "Cintorín";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Komerčná oblasť";
"type.landuse.construction" = "Stavenisko";
"type.landuse.education" = "Vzdelávacia inštitúcia";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
index 9b39b116d..2252a413b 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Двориште цркве";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Кмерцијална област";
"type.landuse.construction" = "Градилиште";
"type.landuse.education" = "Образовна установа";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
index 5158b042b..00c211227 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Handelsområde";
"type.landuse.construction" = "Byggarbetsplats";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
index ce72bb59b..719589f1c 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
index 9a2266bff..785ebcaa0 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "บริเวณโบสถ์";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
index 1acf65837..1efe9c1d6 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
@@ -671,7 +671,7 @@
/* In most (European) countries, с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" = "Hristiyan Mezarlığı";
-"type.landuse.churchyard" = "Kilise Bölgesi";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Ticari Alan";
"type.landuse.construction" = "Yapı";
"type.landuse.education" = "Eğitim tesisi";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
index 3f905d685..f6a433028 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "Церковний двір";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Комерційні ділянки";
"type.landuse.construction" = "Будівництво";
"type.landuse.education" = "Освітній заклади";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
index e2b89d0a8..2604bb0c6 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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ờ";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "Commercial Area";
"type.landuse.construction" = "Construction Area";
"type.landuse.education" = "Educational Facility";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
index b14411827..f56d2ba23 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
/* In most (European) countries, с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" = "教堂庭院";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "商业区";
"type.landuse.construction" = "建设区域";
"type.landuse.education" = "教育设施";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
index b6b9be708..c4094a1a2 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
@@ -671,7 +671,7 @@
/* In most (European) countries, с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" = "教堂庭院";
+"type.landuse.religious" = "Religious Land";
"type.landuse.commercial" = "商業區";
"type.landuse.construction" = "建設區域";
"type.landuse.education" = "教育設施";