Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3299)
+++ trunk/data/defaultpresets.xml	(revision 3321)
@@ -74,5 +74,5 @@
 are supplied, then "values" will be treated as "display_values" and translated instead.
 -->
-<annotations>
+<annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
   <group name="Highways" icon="presets/way_secondary.png">
     <group name="Streets" icon="presets/way_secondary.png">
@@ -134,5 +134,5 @@
         </item>
         <item name="Trunk Link" icon="presets/trunk.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link" 
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
             <label text="Edit Trunk Link" />
@@ -154,5 +154,5 @@
         <separator/>
         <item name="Primary" icon="presets/way_primary.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary" 
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
             <label text="Edit Primary Road" />
@@ -267,5 +267,5 @@
         </item>
         <item name="Living Street" icon="presets/living_street.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street" 
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
             <label text="Edit Living Street" />
@@ -743,5 +743,5 @@
     <group name="Barriers" icon="presets/barrier.png">
 
-        <!-- *** node barriers *** -->    
+        <!-- *** node barriers *** -->
         <item name="Bollard" icon="presets/bollard.png" type="node,way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
@@ -757,5 +757,5 @@
         </item> <!-- bollard -->
         <item name="Cycle Barrier" icon="presets/empty.png" type="node">
-            <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+            <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
             <key key="barrier" value="cycle_barrier" />
         </item> <!-- cycle_barrier -->
@@ -813,6 +813,6 @@
         </item> <!-- border_control -->
         <separator/>
-        
-        <!-- *** linear barriers *** -->    
+
+        <!-- *** linear barriers *** -->
         <item name="Hedge" icon="presets/empty.png" type="way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
@@ -835,6 +835,6 @@
         </item> <!-- retaining_wall -->
         <separator/>
-        
-        <!-- *** access *** -->    
+
+        <!-- *** access *** -->
         <item name="Entrance" icon="presets/empty.png" type="node">
             <label text="Edit Entrance" />
@@ -938,5 +938,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- sally_port -->
-        
+
     </group> <!-- Barriers -->
   </group>
@@ -1369,5 +1369,5 @@
             <combo key="park_ride" text="Park and Ride" values="yes,no" default="" delete_if_empty="true" />
             <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
-            <space /> 
+            <space />
             <text key="capacity" text="Capacity (overall)" default="" delete_if_empty="true" />
             <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
@@ -2719,5 +2719,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>    
+        </item>
         <item name="Sports" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Sports Shop" />