Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 6688)
+++ trunk/data/validator/deprecated.mapcss	(revision 6689)
@@ -1,4 +1,4 @@
 *[barrier=wire_fence] {
-  throwWarning: tr("{0}={1} is deprecated", "barrier", "wire_fence");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=chain_link";
@@ -8,5 +8,5 @@
   
 *[barrier=wood_fence] {
-  throwWarning: tr("{0}={1} is deprecated", "barrier", "wood_fence");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=wood";
@@ -14,5 +14,5 @@
   
 *[highway=ford] {
-  throwWarning: tr("{0}={1} is deprecated", "highway", "ford");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixRemove: "highway";
   fixAdd: "ford=yes";
@@ -21,5 +21,5 @@
 *[class] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0} is deprecated", "class");
+  throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "highway";
 }
@@ -27,5 +27,5 @@
 *[highway=stile] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "highway", "stile");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixRemove: "highway";
   fixAdd: "barrier=stile";
@@ -34,5 +34,5 @@
 *[highway=incline] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "highway", "incline");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   suggestAlternative: "incline";
 }
@@ -40,5 +40,5 @@
 *[highway=incline_steep] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "highway", "incline");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   suggestAlternative: "incline";
 }
@@ -46,5 +46,5 @@
 *[highway=unsurfaced] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "highway", "unsurfaced");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "highway=road";
   fixAdd: "incline=unpaved";
@@ -53,5 +53,5 @@
 *[landuse=wood] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "landuse", "wood");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   suggestAlternative: "landuse=forest";
   suggestAlternative: "natural=wood";
@@ -60,5 +60,5 @@
 *[natural=marsh] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "natural", "marsh");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "natural=wetland";
   fixAdd: "wetland=marsh";
@@ -67,10 +67,10 @@
 *[highway=byway] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0}={1} is deprecated", "highway", "byway");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
 }
   
 *[power_source] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0} is deprecated", "power_source");
+  throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "generator:source";
 }
@@ -78,5 +78,5 @@
 *[power_rating] {
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0} is deprecated", "power_rating");
+  throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "generator:output";
 }
@@ -84,5 +84,5 @@
 *[shop=organic] {
   /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
-  throwWarning: tr("{0}={1} is deprecated", "shop", "organic");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "shop=supermarket";
   fixAdd: "organic=only";
@@ -91,5 +91,5 @@
 *[bicycle_parking=sheffield] {
   /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
-  throwWarning: tr("{0}={1} is deprecated", "bicycle_parking", "sheffield");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "bicycle_parking=stands";
 }
@@ -97,5 +97,5 @@
 *[amenity=emergency_phone] {
   /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */
-  throwWarning: tr("{0}={1} is deprecated", "amenity", "emergency_phone");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixRemove: "amenity";
   fixAdd: "emergency=phone";
@@ -104,5 +104,5 @@
 *[sport=gaelic_football] {
   /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
-  throwWarning: tr("{0}={1} is deprecated", "sport", "gaelic_football");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "sport=gaelic_games";
 }
@@ -110,21 +110,26 @@
 *[power=station] {
   /* see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station */
-  throwWarning: tr("{0}={1} is deprecated", "power", "station");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   suggestAlternative: "power=plant";
   suggestAlternative: "power=substation";
 }
+
+*[power=sub_station] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixAdd: "power=substation";
+}
   
 *[generator:method=dam] {
-  throwWarning: tr("{0}={1} is deprecated", "generator:method", "dam");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "generator:method=water-storage";
 }
   
 *[generator:method=pumped-storage] {
-  throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumped-storage");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "generator:method=water-pumped-storage";
 }
   
 *[generator:method=pumping] {
-  throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumping");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "generator:method=water-pumped-storage";
 }
@@ -132,5 +137,5 @@
 *[fence_type=chain] {
   /* see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type */
-  throwWarning: tr("{0}={1} is deprecated", "fence_type", "chain");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   suggestAlternative: "barrier=chain";
   suggestAlternative: "fence_type=chain_link";
@@ -139,5 +144,5 @@
 *[building=entrance] {
   /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */
-  throwWarning: tr("{0}={1} is deprecated", "building", "entrance");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   suggestAlternative: "entrance";
 }
@@ -145,5 +150,5 @@
 *[board_type=board] {
   /* see #9213 - Useless tag proposed in internal preset for years */
-  throwWarning: tr("{0}={1} is deprecated", "board_type", "board");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixRemove: "board_type";
 }
@@ -151,10 +156,10 @@
 *[man_made=measurement_station] {
   /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
-  throwWarning: tr("{0}={1} is deprecated", "man_made", "measurement_station");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "man_made=monitoring_station";
 }
   
 *[measurement=water_level] {
-  throwWarning: tr("{0}={1} is deprecated", "measurement", "water_level");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixRemove: "measurement";
   fixAdd: "monitoring:water_level=yes";
@@ -162,5 +167,5 @@
   
 *[measurement=weather] {
-  throwWarning: tr("{0}={1} is deprecated", "measurement", "weather");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixRemove: "measurement";
   fixAdd: "monitoring:weather=yes";
@@ -168,5 +173,5 @@
   
 *[measurement=seismic] {
-  throwWarning: tr("{0}={1} is deprecated", "measurement", "seismic");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixRemove: "measurement";
   fixAdd: "monitoring:seismic_activity=yes";
@@ -174,5 +179,5 @@
 
 *[monitoring:river_level] {
-  throwWarning: tr("{0} is deprecated", "monitoring:river_level");
+  throwWarning: tr("{0} is deprecated", "{0.key}");
   fixChangeKey: "monitoring:river_level => monitoring:water_level";
 }
@@ -180,5 +185,5 @@
 *[emergency=aed] {
   /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
-  throwWarning: tr("{0}={1} is deprecated", "emergency", "aed");
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
   fixAdd: "emergency=defibrillator";
 }