Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 2206)
+++ /trunk/presets/presets.xml	(revision 2207)
@@ -2294,4 +2294,9 @@
             <key key="man_made" value="tower" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="tower:type" text="Tower type" values="communication,observation" />
+            <optional>
+                <text key="height" text="Height (meters)" delete_if_empty="true" />
+                <text key="operator" text="Operator" delete_if_empty="true" />
+            </optional>
         </item>
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
@@ -2318,8 +2323,11 @@
         </item>
         <item name="Pipeline" icon="presets/empty.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
             <label text="Edit Pipeline" />
             <key key="man_made" value="pipeline" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="type" text="Type" values="water,oil,gas,sewage,heat,any substance" default="" delete_if_empty="true" />
+            <combo key="location" text="Location" values="underground,underwater,overground" default="" delete_if_empty="true" />
         </item>
         <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
@@ -2370,5 +2378,7 @@
             <label text="Edit Power Station" />
             <key key="power" value="station" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="ref" text="Reference" default="" delete_if_empty="true" />
         </item>
         <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
@@ -2386,5 +2396,6 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
             <label text="Edit Power Tower" />
-            <key key="power" value="tower" />
+            <combo key="power" text="Type" values="tower,pole" default="tower" delete_if_empty="true" />
+            <text key="ref" text="Tower reference" default="" delete_if_empty="true" />
         </item>
         <item name="Power Line" icon="presets/power.png" type="way">
@@ -2392,9 +2403,10 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
             <label text="Edit Power Line" />
-            <key key="power" value="line" />
+            <combo key="power" text="Line type" values="line,minor_line" default="line" delete_if_empty="true" />
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <text key="ref" text="Line reference" default="" delete_if_empty="true" />
             <text key="voltage" text="Voltage" default="" delete_if_empty="true" />
-            <text key="wires" text="Amount of Wires" default="" delete_if_empty="true" />
+            <text key="cables" text="Amount of Cables" default="" delete_if_empty="true" />
+            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" default="" delete_if_empty="true" />
         </item>
     </group> <!-- Man Made -->