Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 9550)
+++ trunk/data/validator/deprecated.mapcss	(revision 9551)
@@ -1,4 +1,4 @@
 *[barrier=wire_fence] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=chain_link";
@@ -8,5 +8,6 @@
   
 *[barrier=wood_fence] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "barrier=fence + fence_type=wood";
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=wood";
@@ -14,5 +15,6 @@
   
 *[highway=ford] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "ford=yes";
   fixRemove: "highway";
   fixAdd: "ford=yes";
@@ -27,5 +29,6 @@
 *[highway=stile] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "barrier=stile";
   fixRemove: "highway";
   fixAdd: "barrier=stile";
@@ -34,5 +37,5 @@
 *[highway=incline] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "incline";
 }
@@ -40,5 +43,5 @@
 *[highway=incline_steep] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "incline";
 }
@@ -46,5 +49,6 @@
 *[highway=unsurfaced] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "highway=* + surface=unpaved";
   fixAdd: "highway=road";
   fixAdd: "surface=unpaved";
@@ -53,5 +57,5 @@
 *[landuse=wood] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "landuse=forest";
   suggestAlternative: "natural=wood";
@@ -60,5 +64,6 @@
 *[natural=marsh] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=wetland + wetland=marsh";
   fixAdd: "natural=wetland";
   fixAdd: "wetland=marsh";
@@ -67,5 +72,5 @@
 *[highway=byway] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
 }
   
@@ -83,10 +88,12 @@
   
 *[shop=antique] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "shop=antiques";
   fixAdd: "shop=antiques";
 }
 
 *[shop=bags] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "shop=bag";
   fixAdd: "shop=bag";
 }
@@ -94,5 +101,6 @@
 *[shop=organic] {
   /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "shop=supermarket + organic=only";
   fixAdd: "shop=supermarket";
   fixAdd: "organic=only";
@@ -100,10 +108,12 @@
 
 *[shop=pets] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "shop=pet";
   fixAdd: "shop=pet";
 }
 
 *[shop=pharmacy] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=pharmacy";
   fixChangeKey: "shop => amenity";
 }
@@ -111,5 +121,6 @@
 *[bicycle_parking=sheffield] {
   /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "bicycle_parking=stands";
   fixAdd: "bicycle_parking=stands";
 }
@@ -117,5 +128,6 @@
 *[amenity=emergency_phone] {
   /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "emergency=phone";
   fixRemove: "amenity";
   fixAdd: "emergency=phone";
@@ -124,5 +136,6 @@
 *[sport=gaelic_football] {
   /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "sport=gaelic_games";
   fixAdd: "sport=gaelic_games";
 }
@@ -130,5 +143,5 @@
 *[power=station] {
   /* see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "power=plant";
   suggestAlternative: "power=substation";
@@ -136,20 +149,24 @@
 
 *[power=sub_station] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "power=substation";
   fixAdd: "power=substation";
 }
   
 *[generator:method=dam] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "generator:method=water-storage";
   fixAdd: "generator:method=water-storage";
 }
   
 *[generator:method=pumped-storage] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "generator:method=water-pumped-storage";
   fixAdd: "generator:method=water-pumped-storage";
 }
   
 *[generator:method=pumping] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "generator:method=water-pumped-storage";
   fixAdd: "generator:method=water-pumped-storage";
 }
@@ -157,5 +174,5 @@
 *[fence_type=chain] {
   /* see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "barrier=chain";
   suggestAlternative: "fence_type=chain_link";
@@ -164,5 +181,5 @@
 *[building=entrance] {
   /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "entrance";
 }
@@ -170,5 +187,5 @@
 *[board_type=board] {
   /* see #9213 - Useless tag proposed in internal preset for years */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   fixRemove: "board_type";
 }
@@ -176,10 +193,12 @@
 *[man_made=measurement_station] {
   /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=monitoring_station";
   fixAdd: "man_made=monitoring_station";
 }
   
 *[measurement=water_level] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "monitoring:water_level=yes";
   fixRemove: "measurement";
   fixAdd: "monitoring:water_level=yes";
@@ -187,5 +206,6 @@
   
 *[measurement=weather] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "monitoring:weather=yes";
   fixRemove: "measurement";
   fixAdd: "monitoring:weather=yes";
@@ -193,5 +213,6 @@
   
 *[measurement=seismic] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "monitoring:seismic_activity=yes";
   fixRemove: "measurement";
   fixAdd: "monitoring:seismic_activity=yes";
@@ -200,4 +221,5 @@
 *[monitoring:river_level] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "monitoring:water_level";
   fixChangeKey: "monitoring:river_level => monitoring:water_level";
 }
@@ -205,4 +227,5 @@
 *[stay] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "maxstay";
   fixChangeKey: "stay => maxstay";
 }
@@ -210,5 +233,6 @@
 *[emergency=aed] {
   /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "emergency=defibrillator";
   fixAdd: "emergency=defibrillator";
 }
@@ -255,13 +279,15 @@
 *[type=broad_leaved],
 *[type=broad_leafed] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type=broadleaved";
   fixRemove: "{0.key}";
   fixAdd: "leaf_type=broadleaved";
-}
+}<
 
 *[wood=coniferous],
 *[type=coniferous],
 *[type=conifer] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type=needleleaved";
   fixRemove: "{0.key}";
   fixAdd: "leaf_type=needleleaved";
@@ -269,5 +295,6 @@
 
 *[wood=mixed] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type=mixed";
   fixRemove: "wood";
   fixAdd: "leaf_type=mixed";
@@ -276,5 +303,6 @@
 *[wood=evergreen],
 *[type=evergreen] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_cycle=evergreen";
   fixRemove: "{0.key}";
   fixAdd: "leaf_cycle=evergreen";
@@ -283,5 +311,6 @@
 *[type=deciduous],
 *[type=deciduos] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_cycle=deciduous";
   fixRemove: "type";
   fixAdd: "leaf_cycle=deciduous";
@@ -289,5 +318,5 @@
 
 *[natural=land] {
-  throwWarning: tr("{0}={1} is deprecated. Please use instead a multipolygon.", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated. Please use instead a multipolygon.", "{0.tag}");
   assertMatch: "way natural=land";
 }
@@ -295,5 +324,5 @@
 /* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
 *[bridge=causeway] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "ford=yes";
   suggestAlternative: "bridge=low_water_crossing";
@@ -302,5 +331,5 @@
 
 *[bridge=swing] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "bridge:movable=swing";
   suggestAlternative: "bridge:structure=simple-suspension";
@@ -308,5 +337,6 @@
 
 *[bridge=suspension] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "bridge=yes + bridge:structure=suspension";
   fixAdd: "bridge=yes";
   fixAdd: "bridge:structure=suspension";
@@ -336,4 +366,5 @@
 *[parking=park_and_ride] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=parking + park_ride=yes";
   fixRemove: "parking";
   fixAdd: "amenity=parking";
@@ -366,11 +397,17 @@
 }
 
-*[waterway=water_point],
+*[waterway=water_point] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=water_point";
+  fixChangeKey: "waterway => amenity";
+}
 *[waterway=waste_disposal] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=waste_disposal";
   fixChangeKey: "waterway => amenity";
 }
 *[waterway=mooring] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "mooring=yes";
   fixRemove: "waterway";
   fixAdd: "mooring=yes";