Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6658)
+++ trunk/data/defaultpresets.xml	(revision 6662)
@@ -5191,20 +5191,70 @@
             </optional>
         </item>
-        <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=sub_station"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=sub_station"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=sub_station"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
-            <label text="Edit Power Sub Station" />
-            <space />
-            <key key="power" value="sub_station" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Line reference" />
+        <separator/>
+        <item name="Power Substation" icon="presets/power.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
+            <label text="Edit Power Substation" />
+            <space />
+            <key key="power" value="substation" />
+            <text key="name" text="Name" />
+            <combo key="substation" text="Type of substation" values="transmission,distribution,converter,compensation,transition,traction,industrial" />
+            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
-        </item>
+            <optional>
+                <text key="operator" text="Operator" />
+                <text key="ref" text="Reference" />
+                <check key="gas_insulated" text="Gas insulated" />
+            </optional>
+        </item>
+        <item name="Power Transformer" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=transformersubstation"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=transformer" />
+            <label text="Edit Power Transformer" />
+            <space />
+            <key key="power" value="transformer" />
+            <combo key="transformer" text="Type of transformer" values="distribution,generator,coverter,traction,auto,phase_angle_regulator,yes" match="key" />
+            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
+            <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
+            <optional>
+                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+                <combo key="phases" text="Phases" values="1,3" length="1" />
+                <text key="rating" text="Power rating (kVA)" />
+            </optional>
+        </item>
+        <item name="Power Switchgear" type="closedway">
+            <label text="Edit Power Switchgear" />
+            <label text="(Please only use this tag if more detailed mapping using busbars and bays is impossible!)" />
+            <space />
+            <key key="power" value="switchgear" />
+            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
+            <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
+            <optional>
+                <check key="gas_insulated" text="Gas insulated" />
+            </optional>
+        </item>
+        <item name="Power Busbar" type="way">
+            <label text="Edit Power Busbar" />
+            <space />
+            <key key="power" value="line" />
+            <key key="line" value="busbar" />
+            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
+            <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
+        </item>
+        <item name="Power Bay" type="way">
+            <label text="Edit Power Bay" />
+            <space />
+            <key key="power" value="line" />
+            <key key="line" value="bay" />
+            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
+            <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
+        </item>
+        <item name="Power Switch" type="node">
+            <key key="power" value="switch" />
+        </item>
+        <separator/>
         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
@@ -5269,5 +5319,5 @@
             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
             <text key="cables" text="Amount of Cables" />
-            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" />
+            <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad" />
         </item>
     </group> <!-- Power -->