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>