Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6189)
+++ trunk/data/defaultpresets.xml	(revision 6190)
@@ -1056,11 +1056,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=traffic_signals"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=traffic_signals" />
+            <label text="Edit Traffic Signal" />
+            <space />
             <key key="highway" value="traffic_signals" />
-            <optional>
+            <optional text="Optional crossing attributes:">
                  <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+                 <check key="supervised" text="Crossing attendant" default="off" />
+                 <check key="bicycle" text="Cross by bicycle" default="off" />
                  <check key="horse" text="Cross on horseback" default="off" />
-                 <check key="bicycle" text="Cross by bicycle" default="off" />
-                 <check key="supervised" text="Crossing attendant" default="off" />
-                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
             </optional>
         </item>
@@ -1079,4 +1081,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
             <key key="highway" value="mini_roundabout" />
+            <label text="Edit Mini-Roundabout" />
+            <space />
             <combo key="direction" text="Direction" values="clockwise" />
         </item>
@@ -1089,11 +1093,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:crossing"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:crossing" />
-            <label text="Edit Crossing" />
+            <label text="Edit Pedestrian Crossing" />
+            <space />
             <key key="highway" value="crossing" />
-            <combo key="crossing" text="Type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+            <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+            <check key="supervised" text="Crossing attendant" default="off" />
             <check key="bicycle" text="Cross by bicycle" default="off" />
             <check key="horse" text="Cross on horseback" default="off" />
-            <check key="supervised" text="Crossing attendant" default="off" />
-            <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
         </item>
         <item name="Traffic Calming" icon="presets/chicane.png" type="node,way">
@@ -1107,4 +1112,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming"/>
             <label text="Edit Traffic Calming" />
+            <space />
             <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" />
         </item>
Index: trunk/data/tagging-preset.xsd
===================================================================
--- trunk/data/tagging-preset.xsd	(revision 6189)
+++ trunk/data/tagging-preset.xsd	(revision 6190)
@@ -71,4 +71,6 @@
 	<complexType name="optional">
 		<group ref="tns:optional_elements" maxOccurs="unbounded" />
+        <attribute name="text" type="string" />
+        <attribute name="text_context" type="string" />
 	</complexType>