Index: trunk/data/preferences.xsd
===================================================================
--- trunk/data/preferences.xsd	(revision 9812)
+++ trunk/data/preferences.xsd	(revision 9813)
@@ -6,12 +6,10 @@
 
     <complexType name="root">
-        <sequence>
-            <choice minOccurs="0" maxOccurs="unbounded">
-                <element name="tag" type="tns:tag" />
-                <element name="list" type="tns:list" />
-                <element name="lists" type="tns:lists" />
-                <element name="maps" type="tns:maps" />
-            </choice>
-        </sequence>
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element name="tag" type="tns:tag" />
+            <element name="list" type="tns:list" />
+            <element name="lists" type="tns:lists" />
+            <element name="maps" type="tns:maps" />
+        </choice>
         <attribute name="version" type="string" />
     </complexType>
@@ -23,17 +21,7 @@
 
     <complexType name="list">
-        <choice>
-            <sequence>
-                <element name="entry" type="tns:entry" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <!-- deprecated: remove mid 2012 -->
-            <sequence>
-                <element name="list" type="tns:slist" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <!-- deprecated: remove mid 2012 -->
-            <sequence>
-                <element name="map" type="tns:map" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-        </choice>
+        <sequence>
+            <element name="entry" type="tns:entry" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
         <attribute name="key" type="string" use="required" />
     </complexType>