Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9495)
+++ trunk/data/defaultpresets.xml	(revision 9500)
@@ -308,5 +308,5 @@
             <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
             <space />
-            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+            <reference ref="voltage_frequency" />
         </optional>
     </chunk>
@@ -6162,5 +6162,5 @@
                 <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
                 <space />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+                <reference ref="voltage_frequency" />
             </optional>
         </item> <!-- Power Plant -->
@@ -6341,5 +6341,5 @@
             </optional>
         </item> <!-- Power Substation -->
-        <item name="Power Transformer" icon="styles/standard/power/transformer.svg" type="node,closedway" preset_name_label="true">
+        <item name="Power Transformer" icon="styles/standard/power/transformer.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=transformer"
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 9495)
+++ trunk/data/validator/combinations.mapcss	(revision 9500)
@@ -93,4 +93,6 @@
 
 /* {0.key} without {1.tag} */
+*[substation                   ][power!=substation],
+*[transformer                  ][!power],
 *[fence_type                   ][barrier!=fence],
 *[recycling_type               ][amenity!=recycling],
@@ -121,7 +123,24 @@
 /* {0.tag} without {1.key} (info level) */
 way[power=cable                ][!location],
+node[power=transformer         ][!voltage],
+way[power=line                 ][!voltage],
+way[power=minor_line           ][!voltage],
+way[power=cable                ][!voltage],
+*[power=generator              ][!voltage][generator:output:electricity],
+*[power=plant                  ][!voltage][plant:output:electricity],
+*[power=substation             ][!substation],
+*[power=transformer            ][!transformer],
 *[amenity=parking              ][!parking],
 *[amenity=parking_entrance     ][!parking] {
   throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
+  assertMatch: "way power=line";
+  assertNoMatch: "way power=line voltage=1";
+  assertNoMatch: "way power=switch";
+  assertMatch: "way power=substation";
+  assertMatch: "way power=substation transformer=foobar";
+  assertNoMatch: "way power=substation substation=foobar";
+  assertMatch: "way power=generator generator:output:electricity=yes";
+  assertNoMatch: "way power=generator";
+  assertNoMatch: "way power=generator generator:output:electricity=yes voltage=1";
 }
 
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 9495)
+++ trunk/data/validator/geometry.mapcss	(revision 9500)
@@ -82,4 +82,5 @@
 way[entrance],
 way[man_made=survey_point],
+way[power=transformer],
 way[power=pole],
 way[power=tower]!:closed,
Index: trunk/data/validator/power.mapcss
===================================================================
--- trunk/data/validator/power.mapcss	(revision 9495)
+++ 	(revision )
@@ -1,18 +1,0 @@
-/* power related stuff (incomplete) */
-
-*[substation][power!=substation],
-*[transformer][!power] {
-  throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
-}
-
-*[power =~ /^(line|minor_line|cable)$/][!voltage],
-*[power=substation][!substation],
-*[power=transformer][!transformer] {
-  throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
-  assertMatch: "way power=line";
-  assertNoMatch: "way power=line voltage=1";
-  assertNoMatch: "way power=cable_distribution_cabinet";
-  assertMatch: "way power=substation";
-  assertMatch: "way power=substation transformer=foobar";
-  assertNoMatch: "way power=substation substation=foobar";
-}