Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16783)
+++ trunk/resources/data/defaultpresets.xml	(revision 16787)
@@ -5297,5 +5297,5 @@
             <optional>
                 <reference ref="name_operator" />
-                <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+                <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
                 <checkgroup columns="3">
                     <check key="covered" text="Covered" />
@@ -5313,5 +5313,5 @@
             <text key="depth" text="Depth in meters" />
             <text key="operator" text="Operator" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
             <check key="headframe" text="Visible Headframe" />
             <check key="disused" text="Disused" />
@@ -5324,5 +5324,5 @@
             <text key="length" text="Length in meters" />
             <text key="operator" text="Operator" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
             <check key="disused" text="Disused" />
         </item> <!-- Adit -->
@@ -6232,5 +6232,5 @@
             <optional>
                 <text key="name" text="Name" />
-                <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+                <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
             </optional>
         </item> <!-- Mine -->
@@ -8119,5 +8119,5 @@
             <key key="landuse" value="quarry" />
             <reference ref="name_operator" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
         </item> <!-- Quarry -->
     </group> <!-- Landuse -->
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 16783)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 16787)
@@ -2034,2 +2034,16 @@
   fixAdd: "lamp_type=electric";
 }
+*[generator:type=solar_photovoltaic_panels] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "generator:type=solar_photovoltaic_panel";
+  group: tr("deprecated tagging");
+  fixAdd: "generator:type=solar_photovoltaic_panel";
+}
+*[building=part] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "building:part=yes";
+  group: tr("deprecated tagging");
+  /* without autofix, it is not clear if a building or a building part is mapped */
+}
+
+/* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 16783)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 16787)
@@ -8,4 +8,6 @@
 ; F:  ignore tag if key ends with this string.
 ;
+; This file includes also keys and tags which have a deprecated warning (section
+; at the bottom). This avoids a duplicate warning in severity other (#19180).
 ;
 ; Ignore valid and semi-valid keys that start with...
@@ -199,4 +201,5 @@
 K:building=civic
 K:building=clinic
+K:building=home
 K:building=houseboat
 K:building=shop
@@ -205,4 +208,5 @@
 K:building=semidetached_house
 K:building=slurry_tank
+K:building=tank
 K:building=trullo
 K:leisure=recreation_ground
@@ -221,4 +225,5 @@
 K:land_area=administrative
 K:attraction=summer_toboggan
+K:water=pool
 ;
 ; Highway Key/Value Pairs
@@ -259,4 +264,5 @@
 K:historic=wreck
 K:historic=heritage
+K:historic=farm
 ;
 ; Landcover Tags
@@ -682,6 +688,8 @@
 K:lanes=-3
 K:lanes=-4
-;
-; Tags not yet decided (to remove from this section when added or deprecated) 
+K:generator:type=solar_photovoltaic_panels
+K:building=part
+;
+; Tags not yet decided (to remove from this section when added or moved up when deprecated) 
 ; see josm tickets: 17770 15309 15774 16315 16658 16793
 ;