Index: trunk/data/tagging-preset.xsd
===================================================================
--- trunk/data/tagging-preset.xsd	(revision 3581)
+++ trunk/data/tagging-preset.xsd	(revision 3582)
@@ -85,4 +85,5 @@
 		<attribute name="href" type="string" use="required" />
 		<attribute name="text" type="string" />
+		<attribute name="text_context" type="string" />
 
 		<attribute name="name" use="prohibited"/>
@@ -92,4 +93,5 @@
 	<complexType name="label">
 		<attribute name="text" type="string" use="required" />
+		<attribute name="text_context" type="string" />
 
 		<attribute name="name" use="prohibited"/>
@@ -102,4 +104,5 @@
 		<attribute name="key" type="string" use="required"/>
 		<attribute name="text" type="string" />
+		<attribute name="text_context" type="string" />
 		<attribute name="default" type="string" />
 		<attribute name="delete_if_empty" type="boolean" />
@@ -117,9 +120,11 @@
 		<attribute name="key" type="string" use="required" />
 		<attribute name="text" type="string" />
+		<attribute name="text_context" type="string" />
 		<attribute name="values" type="string" use="required" />
+		<attribute name="values_context" type="string" />
+		<attribute name="display_values" type="string"/>
 		<attribute name="default" type="string" />
 		<attribute name="editable" type="boolean" />
 		<attribute name="delete_if_empty" type="boolean" />
-		<attribute name="display_values" type="string"/>
 		<attribute name="required" type="boolean"/>
 
@@ -135,8 +140,10 @@
 		<attribute name="key" type="string" use="required" />
 		<attribute name="text" type="string" />
+		<attribute name="text_context" type="string" />
 		<attribute name="default" type="tns:check_default" />
-		<attribute name="delete_if_empty" type="boolean" />
 		<attribute name="use_last_as_default" type="boolean" />
 		<attribute name="required" type="boolean"/>
+		<attribute name="value_on" type="string"/>
+		<attribute name="value_off" type="string"/>
 
 		<attribute name="name" use="prohibited"/>
@@ -162,7 +169,9 @@
 		<attribute name="key" type="string"/>
 		<attribute name="text" type="string"/>
+		<attribute name="text_context" type="string"/>
 		<attribute name="requisite" type="string"/>
 		<attribute name="type" type="string"/>
 		<attribute name="count" type="integer"/>
+		<attribute name="required" type="boolean"/>
 	</complexType>
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 3581)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 3582)
@@ -22,5 +22,4 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -44,5 +43,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -118,5 +116,4 @@
         }
 
-        public boolean focus = false;
         abstract boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel);
         abstract void addCommands(List<Tag> changedTags);
@@ -952,10 +949,10 @@
             final Collection<RelationMember> members = new HashSet<RelationMember>();
             for(Tag t : getChangedTags()) {
-              r.put(t.getKey(), t.getValue());
+                r.put(t.getKey(), t.getValue());
             }
             for(OsmPrimitive osm : sel) {
-              RelationMember rm = new RelationMember("", osm);
-              r.addMember(rm);
-              members.add(rm);
+                RelationMember rm = new RelationMember("", osm);
+                r.addMember(rm);
+                members.add(rm);
             }
             SwingUtilities.invokeLater(new Runnable() {