Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1402)
+++ trunk/presets/presets.xml	(revision 1403)
@@ -47,5 +47,5 @@
         <item name="Motorway" icon="presets/motorway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
             <label text="Edit a Motorway" />
             <space />
@@ -66,5 +66,5 @@
         <item name="Motorway Link" icon="presets/motorway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
             <label text="Edit a Motorway Link" />
             <space />
@@ -83,5 +83,5 @@
         <item name="Trunk" icon="presets/trunk.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
             <label text="Edit a Trunk" />
             <space />
@@ -102,5 +102,5 @@
         <item name="Trunk Link" icon="presets/trunk.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link" 
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
             <label text="Edit a Trunk Link" />
             <space />
@@ -121,5 +121,5 @@
         <item name="Primary" icon="presets/way_primary.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary" 
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
             <label text="Edit a Primary Road" />
             <space />
@@ -155,6 +155,6 @@
         <item name="Secondary" icon="presets/way_secondary.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
             <label text="Edit a Secondary Road" />
             <space />
@@ -175,6 +175,6 @@
         <item name="Tertiary" icon="presets/way_tertiary.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
             <label text="Edit a Tertiary Road" />
             <space />
@@ -194,6 +194,6 @@
         <item name="Unclassified" icon="presets/way_unclassified.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/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" />
+                  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 />
@@ -213,5 +213,5 @@
         <item name="Residential" icon="presets/residential.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
             <label text="Edit a Residential Street" />
             <space />
@@ -231,5 +231,5 @@
         <item name="Living Street" icon="presets/living_street.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street" 
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
             <label text="Edit a Living Street" />
             <space />
@@ -249,5 +249,5 @@
         <item name="Service" icon="presets/way_unclassified.png" type="way">
             <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 />
@@ -269,6 +269,6 @@
         <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
             <label text="Edit a Parking Aisle" />
             <space />
@@ -283,5 +283,5 @@
         <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
             <label text="Edit a Road of unknown type" />
             <space />
@@ -325,7 +325,7 @@
         <item name="Roundabout" icon="presets/roundabout.png" type="closedway">
             <link href="http://wiki.openstreetmap.org/wiki/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" />
+                  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 />
@@ -346,7 +346,7 @@
         <item name="Bridge" icon="presets/bridge.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/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" />
+                  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 />
@@ -363,6 +363,6 @@
             <label text="Edit a Tunnel"/>
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel" />
             <space />
             <key key="tunnel" value="yes" />
@@ -380,5 +380,5 @@
 <!--     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" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
 -->
             <space />
@@ -419,6 +419,6 @@
         <item name="Cycleway" icon="presets/cycleway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE: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"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
             <label text="Edit a Cycleway" />
             <space />
@@ -439,5 +439,5 @@
         <item name="Footway" icon="presets/footway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
             <label text="Edit a Footway" />
             <space />
@@ -458,5 +458,5 @@
         <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
             <label text="Edit a Pedestrian Street" />
             <space />
@@ -476,6 +476,6 @@
         <item name="Steps" icon="presets/steps.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/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" />
+                  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 />
@@ -497,5 +497,5 @@
         <item name="Track" icon="presets/track1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
             <label text="Edit a Track" />
             <space />
@@ -517,5 +517,5 @@
         <item name="Track Grade 1" icon="presets/track1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
             <label text="Edit a Track of grade 1" />
             <space />
@@ -538,5 +538,5 @@
         <item name="Track Grade 2" icon="presets/track2.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
             <label text="Edit a Track of grade 2" />
             <space />
@@ -559,5 +559,5 @@
         <item name="Track Grade 3" icon="presets/track3.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
             <label text="Edit a Track of grade 3" />
             <space />
@@ -580,5 +580,5 @@
         <item name="Track Grade 4" icon="presets/track4.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
             <label text="Edit a Track of grade 4" />
             <space />
@@ -601,5 +601,5 @@
         <item name="Track Grade 5" icon="presets/track5.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
             <label text="Edit a Track of grade 5" />
             <space />
@@ -623,5 +623,5 @@
         <item name="Path" icon="presets/path.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
             <label text="Edit Path" />
             <space />
@@ -650,6 +650,6 @@
         <item name="Hiking" icon="presets/hiking_grade1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
             <label text="Edit Hiking" />
             <space />
@@ -663,6 +663,6 @@
         <item name="Mountain Hiking" icon="presets/hiking_grade2.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
             <label text="Edit Mountain Hiking" />
             <space />
@@ -676,6 +676,6 @@
         <item name="Demanding Mountain Hiking" icon="presets/hiking_grade3.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
             <label text="Edit Demanding Mountain Hiking" />
             <space />
@@ -689,6 +689,6 @@
         <item name="Alpine Hiking" icon="presets/hiking_grade4.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
             <label text="Edit Alpine Hiking" />
             <space />
@@ -702,6 +702,6 @@
         <item name="Demanding alpine hiking" icon="presets/hiking_grade5.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
             <label text="Edit Demanding alpine hiking" />
             <space />
@@ -715,6 +715,6 @@
         <item name="Difficult alpine hiking" icon="presets/hiking_grade6.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
             <label text="Edit Difficult alpine hiking" />
             <space />
@@ -763,5 +763,5 @@
         <item name="Pedestrian Crossing" icon="presets/zebracrossing.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
             <label text="Edit a crossing" />
             <key key="highway" value="crossing" />
@@ -774,6 +774,6 @@
         <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
             <key key="highway" value="mini_roundabout" />
             <combo key="direction" text="Direction" values="clockwise" default="" delete_if_empty="true" />
@@ -781,5 +781,5 @@
         <item name="Turning Circle" icon="presets/turning_circle.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
             <key key="highway" value="turning_circle" />
         </item>
@@ -1056,6 +1056,6 @@
       <item name="River" icon="presets/river.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
             <label text="Edit a River" />
             <space />
@@ -1098,5 +1098,5 @@
         <item name="Riverbank" icon="presets/waterway.png">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
-                de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
           <label text="Edit a riverbank" />
           <key key="waterway" value="riverbank" />
@@ -1105,7 +1105,7 @@
         <item name="Wetland" icon="presets/empty.png">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
-                de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
-                pt:href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
-                pt_BR:href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
+                pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
+                pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
           <label text="Edit Wetland" />
           <key key="natural" value="wetland" />
@@ -1216,6 +1216,6 @@
         <item name="Slipway" icon="presets/slipway.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
             <label text="Edit Slipway" />
             <key key="leisure" value="slipway" />
@@ -1346,6 +1346,6 @@
         <item name="Fuel" icon="presets/fuel.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
             <label text="Edit Fuel" />
             <key key="amenity" value="fuel" />
@@ -1355,5 +1355,5 @@
         <item name="Parking" icon="presets/parking.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
             <label text="Edit Parking" />
             <key key="amenity" value="parking" />
@@ -1385,5 +1385,5 @@
         <item name="Rental" icon="presets/car_rental.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
             <label text="Edit Car Rental" />
             <key key="amenity" value="car_rental" />
@@ -1409,5 +1409,5 @@
         <item name="Rental" icon="presets/bicycle_rental.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
             <label text="Edit Bicycle Rental" />
             <key key="amenity" value="bicycle_rental" />
@@ -1416,5 +1416,5 @@
         <item name="Shop" icon="presets/bike.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
             <label text="Edit Bicycle Shop" />
             <key key="shop" value="bicycle" />
@@ -1425,5 +1425,5 @@
         <item name="Station" icon="presets/station.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
             <label text="Edit Station" />
             <space />
@@ -1445,5 +1445,5 @@
         <item name="Tram Stop" icon="presets/tram.png">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
-                 de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
+                 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
             <label text="Edit Tram Stop" />
             <space />
@@ -1455,5 +1455,5 @@
         <item name="Railway Platform" icon="presets/platform_rail.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
             <label text="Edit a railway platform" />
             <key key="railway" value="platform" />
@@ -1465,5 +1465,5 @@
         <item name="Subway Entrance" icon="presets/underground.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
-                  fr:href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
             <label text="Edit Subway Entrance" />
             <space />
@@ -1478,5 +1478,5 @@
         <item name="Bus Station" icon="presets/bus.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
             <label text="Edit a Bus Station" />
             <key key="amenity" value="bus_station" />
@@ -1487,6 +1487,6 @@
         <item name="Bus Stop" icon="presets/bus_halt.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
-                  fr:href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
             <label text="Edit Bus Stop" />
             <space />
@@ -1528,5 +1528,5 @@
         <item name="Hotel" icon="presets/bed.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
             <label text="Edit Hotel" />
             <key key="tourism" value="hotel" />
@@ -1635,5 +1635,5 @@
         <item name="Zoo" icon="presets/zoo.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
             <label text="Edit Zoo" />
             <key key="tourism" value="zoo" />
@@ -1675,5 +1675,5 @@
         <item name="Castle" icon="presets/State_Tourist.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
             <label text="Edit Castle" />
             <key key="historic" value="castle" />
@@ -1687,5 +1687,5 @@
         <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" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
             <label text="Edit Archaeological Site" />
             <key key="historic" value="archaeological_site" />
@@ -2024,5 +2024,5 @@
         <item name="Courthouse" icon="presets/JusticeScales.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
             <label text="Edit Courthouse" />
             <key key="amenity" value="courthouse" />
@@ -2031,5 +2031,5 @@
         <item name="Prison" icon="presets/prison.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
             <label text="Edit Prison" />
             <key key="amenity" value="prison" />
@@ -2038,6 +2038,6 @@
         <item name="Police" icon="presets/police.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
             <label text="Edit Police" />
             <key key="amenity" value="police" />
@@ -2046,5 +2046,5 @@
         <item name="Fire Station" icon="presets/firebrigade.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
             <label text="Edit Fire Station" />
             <key key="amenity" value="fire_station" />
@@ -2084,5 +2084,5 @@
         <item name="Cinema" icon="presets/cinema.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
             <label text="Edit Cinema" />
             <key key="amenity" value="cinema" />
@@ -2091,5 +2091,5 @@
         <item name="Library" icon="styles/standard/shopping/rental/library.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
             <label text="Edit Library" />
             <key key="amenity" value="library" />
@@ -2104,5 +2104,5 @@
         <item name="Theatre" icon="presets/theater.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
             <label text="Edit Theatre" />
             <key key="amenity" value="theatre" />
@@ -2111,6 +2111,6 @@
         <item name="Place of Worship" icon="presets/church.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
-                  it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
-                  sv:href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
             <label text="Edit Place of Worship" />
             <key key="amenity" value="place_of_worship" />
@@ -2122,5 +2122,5 @@
         <item name="Addresses" icon="presets/addresses.png">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-                  de:href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
             <label text="Edit address information" />
             <space />
@@ -2136,5 +2136,5 @@
         <item name="Address Interpolation" icon="presets/addresses.png">
            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-                 de:href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+                 de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
             <label text="Edit address interpolation" />
             <space />
@@ -2183,6 +2183,6 @@
         <item name="Wastewater Plant" icon="presets/wastewater_plant.png">
             <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"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
             <label text="Edit Wastewater Plant" />
             <key key="man_made" value="wastewater_plant" />
@@ -2216,6 +2216,6 @@
         <item name="Power Generator" icon="presets/power.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
-                  fr:href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
             <label text="Edit Power Generator" />
             <key key="power" value="generator" />
@@ -2225,5 +2225,5 @@
         <item name="Power Station" icon="presets/power.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
             <label text="Edit power station" />
             <key key="power" value="station" />
@@ -2232,5 +2232,5 @@
         <item name="Power Sub Station" icon="presets/power.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
             <label text="Edit power sub station" />
             <key key="power" value="sub_station" />
@@ -2240,7 +2240,7 @@
         <item name="Power Tower" icon="presets/power_tower.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
-                  fr:href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
             <label text="Edit Power Tower" />
             <key key="power" value="tower" />
@@ -2248,5 +2248,5 @@
         <item name="Power Line" icon="presets/power.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
             <label text="Edit power line" />
             <key key="power" value="line" />
@@ -2260,5 +2260,5 @@
         <item name="Toilets" icon="presets/toilet.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
             <key key="amenity" value="toilets" />
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
@@ -2274,5 +2274,5 @@
         <item name="Telephone" icon="presets/telephone.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
             <label text="Edit a Telephone" />
             <key key="amenity" value="telephone" />
@@ -2287,5 +2287,5 @@
         <item name="Recycling" icon="presets/recycling.png">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
-                 fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
+                 fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
             <label text="Edit a Recycling station" />
             <key key="amenity" value="recycling" />
@@ -2311,5 +2311,5 @@
         <item name="Fountain" icon="presets/spring.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
             <label text="Edit a Fountain" />
             <key key="amenity" value="fountain" />
@@ -2318,5 +2318,5 @@
         <item name="Drinking Water" icon="presets/drinking_water.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
             <label text="Edit Drinking Water" />
             <key key="amenity" value="drinking_water" />
@@ -2533,5 +2533,5 @@
         <item name="Emergency Access Point" icon="presets/emergency_access_point.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
             <label text="Edit Emergency Access Point" />
             <space />
@@ -2544,5 +2544,5 @@
         <item name="Veterinary" icon="presets/empty.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
-                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
             <label text="Edit Veterinary" />
             <key key="amenity" value="veterinary" />
@@ -2692,5 +2692,5 @@
       <item name="Tree" icon="presets/tree.png">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-              fi:href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+              fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
         <label text="Edit a Tree" />
         <key key="natural" value="tree" />
@@ -2702,5 +2702,5 @@
       <item name="Wood" icon="presets/landuse.png">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-                de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
           <label text="Edit Wood" />
           <key key="natural" value="wood" />
@@ -2710,5 +2710,5 @@
         <item name="Forest" icon="presets/landuse.png">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-                de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
           <label text="Edit Forest Landuse" />
           <space />
@@ -2724,5 +2724,5 @@
         <item name="Farmyard" icon="presets/landuse.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
             <label text="Edit Farmyard Landuse" />
             <space />
@@ -2904,6 +2904,6 @@
         <item name="Multipolygon" icon="presets/empty.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
-                  fr:href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
             <label text="Edit a Multipolygon" />
             <key key="type" value="multipolygon" />
@@ -2918,5 +2918,5 @@
         <item name="Turn restriction" icon="presets/empty.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
-                  de:href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"/>
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"/>
             <label text="Edit a Turn Restriction" />
             <key key="type" value="restriction" />
Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 1402)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 1403)
@@ -429,5 +429,5 @@
     static public String getLanguageCode()
     {
-        return Locale.getDefault().getLanguage() + ":";
+        return Locale.getDefault().getLanguage();
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 1402)
+++ trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 1403)
@@ -30,5 +30,5 @@
 public class XmlObjectParser implements Iterable<Object> {
 
-        public static final String lang = Main.getLanguageCode();
+    public static final String lang = Main.getLanguageCode()+".";
     public static class Uniform<T> implements Iterable<T>{
         private Iterator<Object> iterator;