Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6668)
+++ trunk/data/defaultpresets.xml	(revision 6673)
@@ -5206,6 +5206,6 @@
             <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="substation" text="Type of substation" values="transmission,distribution,converter,compensation,transition,traction,industrial" values_context="power" />
+            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
             <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" />
@@ -5224,11 +5224,11 @@
             <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="transformer" text="Type of transformer" values="distribution,generator,coverter,traction,auto,phase_angle_regulator,yes" match="key" values_context="power" />
+            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
             <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)" />
+                <text key="rating" text="Power rating (kVA)" values_context="power" />
             </optional>
         </item>
@@ -5238,5 +5238,5 @@
             <space />
             <key key="power" value="switchgear" />
-            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
+            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
             <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>
