Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1319)
+++ trunk/presets/presets.xml	(revision 1320)
@@ -110,5 +110,5 @@
         <separator/>
         <item name="Primary" icon="presets/way_primary.png">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary" />
             <label text="Edit a Primary Road" />
             <space />
@@ -144,5 +144,5 @@
         <item name="Secondary" icon="presets/way_secondary.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"/>
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary" />
             <label text="Edit a Secondary Road" />
             <space />
@@ -180,5 +180,6 @@
         <item name="Unclassified" icon="presets/way_unclassified.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified" />
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
+                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
             <label text="Edit a Unclassified Road" />
             <space />
@@ -233,5 +234,5 @@
         <item name="Service" icon="presets/way_unclassified.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service"/>
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
             <label text="Edit a Serviceway" />
             <space />
@@ -252,5 +253,5 @@
         <item name="Parking Aisle" icon="presets/way_unclassified.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"/>
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle" />
             <label text="Edit a Parking Aisle" />
             <space />
@@ -306,5 +307,7 @@
         <item name="Roundabout" icon="presets/roundabout.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout" />
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
+                  it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
+                  ro:href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
             <label text="Edit a Junction" />
             <space />
@@ -325,5 +328,7 @@
         <item name="Bridge" icon="presets/bridge.png">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge" />
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
+                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
+                  fr:href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
             <label text="Edit a Bridge" />
             <space />
@@ -337,9 +342,12 @@
             </optional>
         </item>
-    </group>
-<!-- Streets -->
+    </group> <!-- Streets -->
     <group name="Ways" icon="presets/way_unclassified.png">
         <item name="Construction" icon="presets/construction.png">
             <label text="Edit a highway under construction" />
+<!--     FIXME: no entry in the Wiki
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+-->
             <space />
             <key key="highway" value="construction" />
@@ -379,4 +387,5 @@
         <item name="Cycleway" icon="presets/cycleway.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+                  it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway" />
             <label text="Edit a Cycleway" />
@@ -435,5 +444,6 @@
         <item name="Steps" icon="presets/steps.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps" />
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
+                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
             <label text="Edit a flight of Steps" />
             <space />
@@ -474,5 +484,5 @@
         </item>
         <item name="Track Grade 1" icon="presets/track1.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
+            <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
             <label text="Edit a Track of grade 1" />
@@ -580,5 +590,5 @@
         <separator/>
         <item name="Path" icon="presets/path.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
             <label text="Edit Path" />
@@ -678,6 +688,5 @@
             </optional>
         </item>
-    </group>
-<!-- Ways -->
+    </group> <!-- Ways -->
     <group name="Waypoints" icon="presets/waypoints.png">
         <item name="Motorway Junction" icon="presets/motorway_junction.png">
@@ -770,6 +779,5 @@
             </optional>
         </item>
-    </group>
-<!-- Waypoints -->
+    </group> <!-- Waypoints -->
     <group name="Barriers" icon="presets/barrier.png">
         <item name="Stile" icon="presets/stile.png">
@@ -782,6 +790,5 @@
             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
-        </item>
-<!-- stile -->
+        </item> <!-- stile -->
         <item name="Kissing Gate" icon="presets/empty.png">
             <label text="Edit a Kissing Gate" />
@@ -792,6 +799,5 @@
             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
-        </item>
-<!-- kissing_gate -->
+        </item> <!-- kissing_gate -->
         <item name="Hampshire Gate" icon="presets/empty.png">
             <label text="Edit a Hampshire Gate" />
@@ -805,6 +811,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- hampshire_gate -->
+        </item> <!-- hampshire_gate -->
         <item name="Bollard" icon="presets/bollard.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
@@ -818,6 +823,5 @@
             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-        </item>
-<!-- bollard -->
+        </item> <!-- bollard -->
         <item name="Drawbridge" icon="presets/empty.png">
             <label text="Edit a Drawbridge" />
@@ -831,10 +835,8 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- drawbridge -->
+        </item> <!-- drawbridge -->
         <item name="Bus Trap" icon="presets/empty.png">
             <key key="barrier" value="bus_trap" />
-        </item>
-<!-- bus_trap -->
+        </item> <!-- bus_trap -->
         <item name="Cattle Grid" icon="presets/cattle_grid.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
@@ -848,6 +850,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- cattle_grid -->
+        </item> <!-- cattle_grid -->
         <item name="Spikes" icon="presets/empty.png">
             <label text="Edit a Spikes" />
@@ -861,6 +862,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- spikes -->
+        </item> <!-- spikes -->
         <item name="Portcullis" icon="presets/empty.png">
             <label text="Edit a Portcullis" />
@@ -872,6 +872,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- portcullis -->
+        </item> <!-- portcullis -->
         <item name="Gate" icon="presets/gate.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
@@ -886,6 +885,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- gate -->
+        </item> <!-- gate -->
         <item name="Lift Gate" icon="presets/lift_gate.png">
             <label text="Edit a Lift Gate" />
@@ -899,6 +897,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- lift_gate -->
+        </item> <!-- lift_gate -->
         <item name="Sally Port" icon="presets/empty.png">
             <label text="Edit a Sally Port" />
@@ -912,6 +909,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- sally_port -->
+        </item> <!-- sally_port -->
         <item name="Bump Gate" icon="presets/empty.png">
             <label text="Edit a Bump Gate" />
@@ -925,34 +921,27 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- bump_gate -->
+        </item> <!-- bump_gate -->
         <item name="Hedge" icon="presets/empty.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
             <key key="barrier" value="hedge" />
-        </item>
-<!-- hedge -->
+        </item> <!-- hedge -->
         <item name="Fence" icon="presets/empty.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
             <key key="barrier" value="fence" />
-        </item>
-<!-- fence -->
+        </item> <!-- fence -->
         <item name="Block" icon="presets/empty.png">
             <key key="barrier" value="block" />
-        </item>
-<!-- block -->
+        </item> <!-- block -->
         <item name="Wall" icon="presets/empty.png">
             <key key="barrier" value="wall" />
-        </item>
-<!-- wall -->
+        </item> <!-- wall -->
         <item name="City Wall" icon="presets/empty.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
             <key key="barrier" value="city_wall" />
-        </item>
-<!-- city_wall -->
+        </item> <!-- city_wall -->
         <item name="Retaining Wall" icon="presets/empty.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
             <key key="barrier" value="retaining_wall" />
-        </item>
-<!-- retaining_wall -->
+        </item> <!-- retaining_wall -->
         <item name="Toll Booth" icon="presets/toll_station.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
@@ -964,6 +953,5 @@
                 <text key="operator" text="Operator" default="" delete_if_empty="true" />
             </optional>
-        </item>
-<!-- toll_booth -->
+        </item> <!-- toll_booth -->
         <item name="Border Control" icon="presets/douane.png">
             <label text="Edit a Border Control" />
@@ -977,6 +965,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- border_control -->
+        </item> <!-- border_control -->
         <separator/>
         <item name="Entrance" icon="presets/empty.png">
@@ -991,8 +978,6 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item>
-<!-- entrance -->
-    </group>
-<!-- Barriers -->
+        </item> <!-- entrance -->
+    </group> <!-- Barriers -->
     <separator/>
     <group name="Waterway" icon="presets/waterway.png">
@@ -1007,5 +992,5 @@
         </item>
         <item name="Canal" icon="presets/waterway.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
             <label text="Edit a Canal" />
             <space />
@@ -1032,5 +1017,5 @@
         <separator/>
         <item name="Ferry Route" icon="presets/ferry.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
             <label text="Edit a Ferry" />
             <space />
@@ -1063,6 +1048,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Waterway -->
+    </group> <!-- Waterway -->
     <group name="Waterway Point" icon="presets/waterwaypoint.png">
         <item name="Lock Gate" icon="presets/lock_gate.png">
@@ -1099,5 +1083,5 @@
         </item>
         <item name="Slipway" icon="presets/slipway.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway" />
             <label text="Edit Slipway" />
@@ -1105,6 +1089,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Waterway -->
+    </group> <!-- Waterway -->
     <separator/>
     <group name="Railway" icon="presets/railway.png">
@@ -1113,5 +1096,5 @@
             <label text="Edit a Rail" />
             <space />
-            <key key="railway" value="rail"/>
+            <key key="railway" value="rail" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
@@ -1119,12 +1102,12 @@
             <label text="Edit a Narrow Gauge Rail" />
             <space />
-            <key key="railway" value="narrow_gauge"/>
+            <key key="railway" value="narrow_gauge" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
         <item name="Monorail" icon="presets/railway.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
             <label text="Edit a Monorail" />
             <space />
-            <key key="railway" value="monorail"/>
+            <key key="railway" value="monorail" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
@@ -1132,5 +1115,5 @@
             <label text="Edit a Preserved Railway" />
             <space />
-            <key key="railway" value="preserved"/>
+            <key key="railway" value="preserved" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
@@ -1138,5 +1121,5 @@
             <label text="Edit a Light Rail" />
             <space />
-            <key key="railway" value="light_rail"/>
+            <key key="railway" value="light_rail" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
@@ -1144,5 +1127,5 @@
             <label text="Edit a Subway" />
             <space />
-            <key key="railway" value="subway"/>
+            <key key="railway" value="subway" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
@@ -1150,5 +1133,5 @@
             <label text="Edit a Tram" />
             <space />
-            <key key="railway" value="tram"/>
+            <key key="railway" value="tram" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
@@ -1175,9 +1158,9 @@
             <label text="Edit a Disused Railway" />
             <space />
-            <key key="railway" value="disused"/>
+            <key key="railway" value="disused" />
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
         <item name="Abandoned Rail" icon="presets/railway.png">
-            <key key="railway" value="abandoned"/>
+            <key key="railway" value="abandoned" />
         </item>
         <separator/>
@@ -1194,6 +1177,5 @@
             <key key="railway" value="turntable" />
         </item>
-    </group>
-<!-- Railway -->
+    </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
         <item name="Chair Lift" icon="presets/chair_lift.png">
@@ -1220,6 +1202,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Aerialway -->
+    </group> <!-- Aerialway -->
     <separator/>
     <group name="Car" icon="presets/car.png">
@@ -1276,6 +1257,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Car -->
+    </group> <!-- Car -->
     <group name="Bicycle" icon="presets/bike.png">
         <item name="Parking" icon="presets/bike_parking.png">
@@ -1297,6 +1277,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Bicycle -->
+    </group> <!-- Bicycle -->
     <group name="Public Transport" icon="presets/bus.png">
         <item name="Station" icon="presets/station.png">
@@ -1334,5 +1313,5 @@
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
             <label text="Edit a railway platform" />
-            <key key="railway" value="platform"/>
+            <key key="railway" value="platform" />
             <space />
             <text key="Ref" text="Reference (track number)" default="" delete_if_empty="true" />
@@ -1373,5 +1352,5 @@
         <item name="Bus Platform" icon="presets/platform_bus.png">
             <label text="Edit a bus platform" />
-            <key key="highway" value="platform"/>
+            <key key="highway" value="platform" />
             <space />
             <text key="Ref" text="Reference (track number)" default="" delete_if_empty="true" />
@@ -1388,5 +1367,5 @@
         <separator/>
         <item name="Airport" icon="presets/plane.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
             <label text="Edit an airport" />
             <key key="aeroway" value="aerodrome" />
@@ -1398,6 +1377,5 @@
             </optional>
         </item>
-    </group>
-<!-- Public Transport -->
+    </group> <!-- Public Transport -->
     <separator/>
     <group name="Accomodation" icon="presets/bed.png">
@@ -1449,6 +1427,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Accomodation -->
+    </group> <!-- Accomodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
         <item name="Restaurant" icon="presets/restaurant.png">
@@ -1489,6 +1466,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Food+Drinks -->
+    </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/State_Public.png">
         <item name="Attraction" icon="presets/sightseeing.png">
@@ -1529,5 +1505,5 @@
         </item>
         <item name="Artwork" icon="presets/arts_centre.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
             <label text="Edit Artwork" />
             <key key="tourism" value="artwork" />
@@ -1547,6 +1523,5 @@
             <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Tourism -->
+    </group> <!-- Tourism -->
     <group name="Historic Places" icon="presets/State_Tourist.png">
         <item name="Castle" icon="presets/State_Tourist.png">
@@ -1563,4 +1538,5 @@
         </item>
         <item name="Archaeological Site" icon="presets/historic.png">
+        <item name="Archaeological Site" icon="presets/historic.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
@@ -1575,5 +1551,5 @@
         </item>
         <item name="Memorial" icon="presets/memorial.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
             <label text="Edit Memorial" />
             <key key="historic" value="memorial" />
@@ -1596,6 +1572,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Historic Places -->
+    </group> <!-- Historic Places -->
     <group name="Leisure" icon="presets/kindergarten.png">
         <item name="Water Park" icon="presets/swimming.png">
@@ -1636,6 +1611,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Leisure -->
+    </group> <!-- Leisure -->
     <separator/>
     <group name="Sport Facilities" icon="presets/stadium.png">
@@ -1962,5 +1936,5 @@
         </item>
         <item name="University" icon="presets/empty.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
             <label text="Edit University" />
             <key key="amenity" value="university" />
@@ -2028,6 +2002,5 @@
             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all" default="odd" />
         </item>
-    </group>
-<!-- Buildings -->
+    </group> <!-- Buildings -->
     <group name="Man Made" icon="presets/works.png">
         <item name="Works" icon="presets/works.png">
@@ -2069,5 +2042,5 @@
         </item>
         <item name="Pier" icon="presets/pier.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
             <label text="Edit Pier" />
             <key key="man_made" value="pier" />
@@ -2075,5 +2048,5 @@
         </item>
         <item name="Pipeline" icon="presets/empty.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
             <label text="Edit Pipeline" />
             <key key="man_made" value="pipeline" />
@@ -2081,7 +2054,6 @@
         </item>
         <item name="Wastewater Plant" icon="presets/wastewater_plant.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" />
-          <link href="" />
             <label text="Edit Wastewater Plant" />
             <key key="man_made" value="wastewater_plant" />
@@ -2152,6 +2124,5 @@
             <text key="wires" text="Amount of Wires" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Man Made -->
+    </group> <!-- Man Made -->
     <group name="Amenities" icon="presets/telephone.png">
         <item name="Toilets" icon="presets/toilet.png">
@@ -2182,5 +2153,5 @@
         </item>
         <item name="Recycling" icon="presets/recycling.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling" />
             <label text="Edit a Recycling station" />
             <key key="amenity" value="recycling" />
@@ -2224,6 +2195,5 @@
             <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Amenities -->
+    </group> <!-- Amenities -->
     <group name="Shops" icon="presets/shopping.png">
         <item name="Supermarket" icon="presets/shopping.png">
@@ -2300,6 +2270,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Shops -->
+    </group> <!-- Shops -->
     <group name="Cash" icon="presets/dollar.png">
         <item name="Bank" icon="presets/bank.png">
@@ -2322,6 +2291,5 @@
             <text key="name" text="Provider" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Cash -->
+    </group> <!-- Cash -->
     <group name="Health" icon="presets/pharmacy.png">
         <item name="Doctors" icon="presets/empty.png">
@@ -2366,6 +2334,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Health -->
+    </group> <!-- Health -->
     <separator/>
     <group name="Places" icon="presets/places.png">
@@ -2407,5 +2374,5 @@
         </item>
         <item name="Town" icon="presets/places.png">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
             <label text="Edit Town" />
             <space />
@@ -2414,6 +2381,6 @@
         </item>
         <item name="Suburb" icon="presets/places.png">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-            <label text="Edit Suburb" />
+           <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
+           <label text="Edit Suburb" />
             <space />
             <key key="place" value="suburb" />
@@ -2446,6 +2413,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Places -->
+    </group> <!-- Places -->
     <group name="Boundaries" icon="presets/boundaries.png">
         <item name="National" icon="presets/boundaries.png">
@@ -2479,6 +2445,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Boundaries -->
+    </group> <!-- Boundaries -->
     <group name="Land use" icon="presets/landuse.png">
         <item name="Graveyard" icon="presets/graveyard.png">
@@ -2634,6 +2599,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Landuse -->
+    </group> <!-- Landuse -->
     <group name="Natural" icon="presets/water.png">
         <item name="Water" icon="presets/water.png">
@@ -2701,5 +2665,5 @@
         </item>
         <item name="Fell" icon="presets/empty.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
             <label text="Edit Fell" />
             <key key="natural" value="fell" />
@@ -2707,5 +2671,5 @@
         </item>
         <item name="Heath" icon="presets/empty.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
             <label text="Edit Heath" />
             <key key="natural" value="heath" />
@@ -2713,5 +2677,5 @@
         </item>
         <item name="Wood" icon="presets/empty.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                     de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
             <label text="Edit Wood" />
@@ -2722,5 +2686,5 @@
         <separator/>
         <item name="Riverbank" icon="presets/waterway.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
                     de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
             <label text="Edit a riverbank" />
@@ -2729,5 +2693,5 @@
         </item>
         <item name="Coastline" icon="presets/empty.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
             <label text="Edit Coastline" />
             <key key="natural" value="coastline" />
@@ -2735,5 +2699,5 @@
         </item>
         <item name="Wetland" icon="presets/empty.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                     de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland" />
             <label text="Edit Wetland" />
@@ -2748,5 +2712,5 @@
         </item>
         <item name="Beach" icon="presets/empty.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
             <label text="Edit Beach" />
             <key key="natural" value="beach" />
@@ -2759,10 +2723,9 @@
         </item>
         <item name="Cliff" icon="presets/empty.png">
-             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
             <label text="Edit Cliff" />
             <key key="natural" value="cliff" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-    </group>
-<!-- Natural -->
+    </group> <!-- Natural -->
 </annotations>