Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6187)
+++ trunk/data/defaultpresets.xml	(revision 6188)
@@ -3750,16 +3750,20 @@
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
                   no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
-                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
+                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+                  zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <label text="Edit Place of Worship" />
             <key key="amenity" value="place_of_worship" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,shia,sunni" />
+            <combo key="building" text="Building type" values="cathedral,chapel,church,mosque,synagogue,temple" match="keyvalue" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" match="key" />
+            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,shia,sunni" match="key" />
             <combo key="service_times" text="Service Times" values="Su 10:00,Su 10:30,Su 11:00" />
             <combo key="opening_hours" text="Opening Hours for visiting" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -4672,5 +4676,5 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <label text="Edit Building" />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,church,school,hangar,commercial,farm,transportation,greenhouse,office,university" default="yes" match="keyvalue" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university" default="yes" match="keyvalue" />
             <text key="name" text="Name" />
         </item>