Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5536)
+++ trunk/data/defaultpresets.xml	(revision 5537)
@@ -420,5 +420,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=residential"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=residential"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=residential" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=residential"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential" />
             <label text="Edit Residential Street" />
             <space />
@@ -472,5 +473,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=pedestrian"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=pedestrian"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=pedestrian" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=pedestrian"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=pedestrian" />
             <label text="Edit Pedestrian Street" />
             <space />
@@ -497,5 +499,6 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=service"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=service"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=service" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=service"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=service" />
             <label text="Edit Serviceway" />
             <space />
@@ -542,5 +545,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=road"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=road"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=road" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=road"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=road" />
             <label text="Edit Road of unknown type" />
             <space />
@@ -595,4 +599,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:access"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:access"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:access"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:access"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:access"
@@ -636,4 +641,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:junction=roundabout"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:junction=roundabout"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:junction=roundabout"
                   ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout"
@@ -687,5 +693,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:tunnel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
             <space />
             <key key="tunnel" value="yes" />
@@ -700,5 +707,7 @@
         <item name="Ford" icon="presets/ford.png" type="node,way">
             <label text="Edit Ford" />
-            <link href="http://wiki.openstreetmap.org/wiki/Key:ford" />
+            <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:ford" />
             <space />
             <key key="ford" value="yes" />
@@ -794,5 +803,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bridleway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bridleway"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bridleway" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bridleway"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=bridleway" />
             <label text="Edit Bridleway" />
             <space />
@@ -820,5 +830,6 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Bicycle"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Bicycle"
-                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Bicycle" />
+                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Bicycle"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Bicycle" />
             <label text="Edit Cycle Lane" />
             <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
@@ -993,4 +1004,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=rest_area"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=rest_area"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=rest_area"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=rest_area"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=rest_area" />
@@ -1054,7 +1066,9 @@
         <item name="Traffic Calming" icon="presets/chicane.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:traffic_calming"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:traffic_calming"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:traffic_calming"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:traffic_calming"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming"/>
@@ -1072,4 +1086,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=turning_circle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=turning_circle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=turning_circle" />
@@ -1078,4 +1093,5 @@
         <item name="City Limit" icon="presets/citylimit.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign=city_limit"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_sign" />
             <label text="Edit City Limit Sign" />
@@ -1089,4 +1105,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=speed_camera"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=speed_camera"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=speed_camera"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=speed_camera" />
@@ -1104,4 +1121,6 @@
         <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:mountain_pass"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:mountain_pass"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:mountain_pass"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:mountain_pass"
@@ -1188,6 +1207,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=toll_booth"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=toll_booth"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=toll_booth"
-                  zh-hans.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=toll_booth" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=toll_booth" />
             <label text="Edit Toll Booth" />
             <space />
@@ -1229,4 +1247,5 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=fence"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:barrier=fence"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=fence"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=fence"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=fence" />
@@ -1249,4 +1268,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=retaining_wall"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=retaining_wall"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=retaining_wall"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=retaining_wall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=retaining_wall" />
@@ -1254,5 +1274,8 @@
         </item> <!-- retaining_wall -->
         <item name="Ditch" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=ditch"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=ditch" />
             <key key="barrier" value="ditch" />
             <optional>
@@ -1401,4 +1424,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=stream"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=stream"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=stream"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=stream"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=stream" />
@@ -1413,5 +1437,6 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
             <label text="Edit Canal" />
             <space />
@@ -1438,5 +1463,7 @@
         <item name="Spring" icon="presets/spring.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=spring"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=spring"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=spring"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
             <label text="Edit Spring" />
@@ -1453,4 +1480,5 @@
         <item name="Weir" icon="presets/weir.png" type="node,way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=weir"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=weir"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=weir"
@@ -1464,4 +1492,5 @@
         <item name="Dam" icon="presets/dam.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dam"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=dam"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dam"
@@ -1501,4 +1530,7 @@
         <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=reservoir"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=reservoir"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=reservoir"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=reservoir" />
             <label text="Edit Reservoir Landuse" />
@@ -1518,4 +1550,5 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=water"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=water"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
             <label text="Edit Water" />
@@ -1571,4 +1604,5 @@
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=beach"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=beach"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=beach"
@@ -1597,4 +1631,5 @@
         <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=ferry_terminal"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=ferry_terminal"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=ferry_terminal"
@@ -1610,4 +1645,5 @@
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:route=ferry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ferry"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=ferry"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=ferry" />
             <label text="Edit Ferry" />
@@ -1651,4 +1687,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=slipway"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=slipway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=slipway" />
@@ -1668,5 +1705,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dock"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dock" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dock"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dock" />
             <label text="Edit Dock" />
             <space />
@@ -1804,5 +1842,5 @@
         <item name="Level Crossing" icon="presets/level_crossing.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
-                  bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:railway=level_crossing"
+                  bg.href="http://wiki.openstreetmap.org/wiki/BG:Tag:railway=level_crossing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=level_crossing"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=level_crossing"
@@ -1865,5 +1903,7 @@
         <item name="Cable Car" icon="presets/cable_car.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=cable_car" />
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aerialway=cable_car"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=cable_car"
+                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:aerialway=cable_car" />
             <label text="Edit Cable Car" />
             <key key="aerialway" value="cable_car" />
@@ -1894,8 +1934,5 @@
         </item>
         <item name="Mixed Lift" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Proposed_features/Piste_Maps"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/Piste_Maps"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Proposed_features/Piste_Maps" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
             <label text="Edit Mixed Lift (containing both gondolas and chairs)" />
             <key key="aerialway" value="mixed_lift" />
@@ -2017,5 +2054,7 @@
         </item>
         <item name="Parking space" icon="presets/parking.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_space" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_space"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_space" />
             <label text="Edit Parking space" />
             <key key="amenity" value="parking_space" />
@@ -2036,5 +2075,6 @@
         </item>
         <item name="Parking entrance" icon="presets/parking.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_entrance" />
             <label text="Edit Parking entrance" />
             <key key="amenity" value="parking_entrance" />
@@ -2057,11 +2097,12 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=fuel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=fuel"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fuel"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fuel"
                   no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=fuel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fuel"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel"
-                  zh-hant.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=fuel" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel" />
             <label text="Edit Fuel" />
             <key key="amenity" value="fuel" />
@@ -2212,7 +2253,10 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_parking"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=bicycle_parking"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=bicycle_parking"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=bicycle_parking"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bicycle_parking"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_parking" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_parking"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_parking" />
             <label text="Edit Bicycle Parking" />
             <key key="amenity" value="bicycle_parking" />
@@ -2228,6 +2272,8 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bicycle"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=bicycle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=bicycle"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bicycle" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bicycle"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=bicycle" />
             <label text="Edit Bicycle Shop" />
             <key key="shop" value="bicycle" />
@@ -2245,9 +2291,11 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_rental"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=bicycle_rental"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=bicycle_rental"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=bicycle_rental"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=bicycle_rental"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bicycle_rental"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bicycle_rental"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_rental" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_rental"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_rental" />
             <label text="Edit Bicycle Rental" />
             <key key="amenity" value="bicycle_rental" />
@@ -2338,6 +2386,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_stop"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bus_stop"
-                  zh-hant.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:highway=bus_stop" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bus_stop" />
             <label text="Edit Bus Stop" />
             <space />
@@ -2364,4 +2411,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=vending_machine"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine"/>
             <key key="amenity" value="vending_machine"/>
@@ -2488,4 +2536,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hotel"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=hotel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hotel"
@@ -2545,5 +2594,7 @@
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
-                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:tourism=chalet" />
+                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:tourism=chalet"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=chalet"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=chalet" />
             <label text="Edit Chalet" />
             <key key="tourism" value="chalet" />
@@ -2563,4 +2614,5 @@
         <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hostel"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=hostel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hostel" />
@@ -2624,5 +2676,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=camp_site"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=camp_site" />
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=camp_site"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=camp_site"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=camp_site" />
             <label text="Edit Camping Site" />
             <key key="tourism" value="camp_site" />
@@ -2646,4 +2700,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=restaurant"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=restaurant"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=restaurant"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=restaurant"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=restaurant"
@@ -2737,5 +2792,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pub"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=pub"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pub" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pub"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pub" />
             <label text="Edit Pub" />
             <key key="amenity" value="pub" />
@@ -2773,4 +2829,5 @@
         <item name="Bar" icon="presets/bar.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=bar"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=bar"
@@ -2797,4 +2854,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=nightclub"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=nightclub"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=nightclub"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=nightclub"
                   ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:amenity=nightclub"
@@ -2824,4 +2882,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=viewpoint"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=viewpoint"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=viewpoint"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=viewpoint" />
@@ -2871,10 +2930,7 @@
         </item>
         <item name="Guidepost" icon="presets/guidepost.png" type="node">
-            <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
-                  en.href="http://wiki.openstreetmap.org/wiki/Key:information"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:information"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:information"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:information=guidepost"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:information=guidepost" />
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
@@ -2915,5 +2971,7 @@
         <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=information"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=information"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
             <key key="tourism" value="information" />
@@ -2926,4 +2984,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=cinema"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=cinema"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=cinema"
@@ -2935,5 +2994,6 @@
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zoo" />
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zoo"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=zoo" />
             <label text="Edit Zoo" />
             <key key="tourism" value="zoo" />
@@ -3005,4 +3065,5 @@
         <item name="Public Grill" icon="presets/bbq.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bbq"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bbq"
@@ -3028,5 +3089,6 @@
         <item name="Museum" icon="presets/State_Public.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=museum" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=museum"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=museum" />
             <label text="Edit Museum" />
             <key key="tourism" value="museum" />
@@ -3038,4 +3100,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=theatre"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=theatre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=theatre" />
@@ -3050,5 +3113,6 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=library"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=library"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=library" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=library"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=library" />
             <label text="Edit Library" />
             <key key="amenity" value="library" />
@@ -3058,4 +3122,5 @@
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=arts_centre"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=arts_centre"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=arts_centre"
@@ -3070,5 +3135,6 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=artwork"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=artwork"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:tourism=artwork" />
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:tourism=artwork"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork" />
             <label text="Edit Artwork" />
             <key key="tourism" value="artwork" />
@@ -3077,4 +3143,5 @@
         <item name="Place of Worship" icon="presets/church.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
@@ -3095,4 +3162,5 @@
         <item name="Recording Studio" icon="presets/studio.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=studio"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=studio" />
             <label text="Edit Studio" />
@@ -3144,4 +3212,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=embassy"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=embassy"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=embassy"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=embassy" />
@@ -3153,4 +3222,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=courthouse"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=courthouse"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=courthouse" />
@@ -3162,5 +3232,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=prison" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=prison"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=prison"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
             <label text="Edit Prison" />
             <key key="amenity" value="prison" />
@@ -3174,5 +3246,6 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=police"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=police" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=police"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=police" />
             <label text="Edit Police" />
             <key key="amenity" value="police" />
@@ -3195,4 +3268,6 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=post_office"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=post_office"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=post_office"
+                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=post_office"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_office"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_office" />
@@ -3216,4 +3291,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=school"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=school"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=school"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=school"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=school"
@@ -3225,4 +3301,6 @@
         <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=university"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=university"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=university"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=university"
@@ -3316,5 +3394,5 @@
         <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
-                  CS.href="http://wiki.openstreetmap.org/wiki/CS:Tag:amenity=baby_hatch"
+                  cs.href="http://wiki.openstreetmap.org/wiki/CS:Tag:amenity=baby_hatch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=baby_hatch"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=baby_hatch"
@@ -3378,5 +3456,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_box" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=post_box"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_box"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_box" />
             <key key="amenity" value="post_box" />
             <text key="operator" text="Operator" />
@@ -3403,4 +3483,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=clock"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=clock"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clock" />
@@ -3439,6 +3520,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=waste_basket"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=waste_basket"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=waste_basket"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_basket"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_basket" />
             <label text="Edit Waste Basket" />
@@ -3447,7 +3530,7 @@
         <item name="Waste Disposal" icon="styles/standard/service/recycling/waste_disposal.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_disposal"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=waste_disposal"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=waste_disposal"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=waste_disposal"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_disposal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
             <label text="Edit Waste Disposal" />
@@ -3458,4 +3541,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bench"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=bench"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bench"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bench"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bench" />
@@ -3497,5 +3582,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=fire_hydrant"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=fire_hydrant"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=fire_hydrant" />
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_hydrant"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=fire_hydrant"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=fire_hydrant" />
             <label text="Edit Fire Hydrant" />
             <key key="emergency" value="fire_hydrant" />
@@ -3602,5 +3689,6 @@
         </item>
         <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing" />
             <label text="Edit Climbing" />
             <key key="sport" value="climbing" />
@@ -3686,4 +3774,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=shooting"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:sport=shooting"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=shooting"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=shooting" />
             <label text="Edit Shooting" />
@@ -3913,10 +4002,13 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:building"
+                  hu.href="http://wiki.openstreetmap.org/wiki/HU:Key:building"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:building"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:building"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:building"
-                  no.href="http://wiki.openstreetmap.org/wiki/NO:Key:building"
-                  pl.href="http://wiki.openstreetmap.org/wiki/PL:Key:building"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
+                  no.href="http://wiki.openstreetmap.org/wiki/No:Key:building"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:building"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:building"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <label text="Edit Building" />
             <combo key="building" text="Building" values="yes,roof,garage,industrial,church,school,hangar,commercial,farm,transportation,greenhouse,office,university" default="yes" match="keyvalue" />
@@ -3948,6 +4040,5 @@
         </item>
         <item name="Flagpole" icon="presets/flag.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole"
-                  en.href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=flagpole" />
             <key key="man_made" value="flagpole" />
@@ -4037,5 +4128,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_works"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_works" />
             <label text="Edit Water Works" />
             <space />            
@@ -4050,5 +4142,6 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=wastewater_plant"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=wastewater_plant"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=wastewater_plant" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=wastewater_plant"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=wastewater_plant" />
             <label text="Edit Wastewater Plant" />
             <key key="man_made" value="wastewater_plant" />
@@ -4078,4 +4171,5 @@
         <item name="Water Well" icon="presets/water_well.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_well"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_well"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_well" />
@@ -4104,4 +4198,5 @@
         <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node">         	
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=street_lamp"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
             <label text="Edit Street Lamp" />
@@ -4169,4 +4264,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
@@ -4204,4 +4300,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=tower"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=tower"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
@@ -4216,4 +4313,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=pole"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=pole"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
             <label text="Edit Power Pole" />
@@ -4237,5 +4335,6 @@
         <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway">
             <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"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=castle" />
             <label text="Edit Castle" />
             <key key="historic" value="castle" />
@@ -4253,4 +4352,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=archaeological_site"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=archaeological_site"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=archaeological_site" />
             <label text="Edit Archaeological Site" />
@@ -4261,4 +4361,7 @@
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=battlefield"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:historic=battlefield"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=battlefield"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=battlefield" />
             <label text="Edit Battlefield" />
@@ -4280,4 +4383,7 @@
         <item name="Memorial" icon="presets/memorial.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=memorial"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:historic=memorial"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=memorial"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=memorial" />
             <label text="Edit Memorial" />
@@ -4313,5 +4419,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=convenience"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=convenience" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=convenience"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=convenience" />
             <label text="Edit Convenience Store" />
             <key key="shop" value="convenience" />
@@ -4337,4 +4444,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bakery"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=bakery"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bakery"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=bakery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bakery" />
@@ -4348,4 +4456,5 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=butcher"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=butcher"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=butcher"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=butcher"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=butcher"
@@ -4379,4 +4488,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=confectionery"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=confectionery"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=confectionery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=confectionery" />
@@ -4391,4 +4501,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=marketplace"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=marketplace"
                   no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=marketplace"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=marketplace"
@@ -4428,4 +4539,5 @@
         <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=alcohol"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=alcohol" />
             <label text="Edit Alcohol Shop" />
@@ -4450,4 +4562,5 @@
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=boutique"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=boutique"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=boutique"/>
@@ -4483,4 +4596,5 @@
         <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dry_cleaning"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=dry_cleaning"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=dry_cleaning" />
@@ -4580,4 +4694,5 @@
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bureau_de_change"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=bureau_de_change"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bureau_de_change"
@@ -4608,4 +4723,5 @@
         <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=department_store"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=department_store"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=department_store"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=department_store"
@@ -4620,4 +4736,5 @@
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=mall"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mall"/>
@@ -4683,4 +4800,5 @@
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=garden_centre"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=garden_centre"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=garden_centre" />
@@ -4728,4 +4846,5 @@
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=kitchen"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kitchen"/>
             <label text="Edit Kitchen" />
@@ -4917,5 +5036,8 @@
         <item name="Town" icon="presets/places.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
+                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=town"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=town"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=town"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=town"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=town" />
             <label text="Edit Town" />
@@ -4930,4 +5052,7 @@
         <item name="Suburb" icon="presets/places.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
             <label text="Edit Suburb" />
@@ -4971,5 +5096,9 @@
         </item>
         <item name="Neighbourhood" icon="presets/places.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
             <label text="Edit Neighbourhood" />
             <space />
@@ -4983,5 +5112,8 @@
         <item name="Locality" icon="presets/locality.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=locality" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=locality"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=locality"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=locality"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=locality" />
             <label text="Edit Locality" />
             <space />
@@ -4994,5 +5126,7 @@
         <item name="Peak" icon="presets/peak.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=peak" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=peak"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=peak"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak" />
             <label text="Edit Peak" />
             <key key="natural" value="peak" />
@@ -5002,5 +5136,6 @@
         </item>
         <item name="Glacier" icon="presets/glacier.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
             <label text="Edit Glacier" />
             <key key="natural" value="glacier" />
@@ -5011,5 +5146,6 @@
         <item name="Volcano" icon="presets/volcano.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano" />
             <label text="Edit Volcano" />
             <key key="natural" value="volcano" />
@@ -5031,4 +5167,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=island"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=island"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=island"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=island" />
             <label text="Edit Island" />
@@ -5040,5 +5177,7 @@
         <item name="Islet" icon="presets/islet.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=islet" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=islet"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=islet"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=islet" />
             <label text="Edit Islet" />
             <space />
@@ -5055,4 +5194,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=tree"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=tree"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=tree"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
             <label text="Edit Tree" />
@@ -5067,4 +5207,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=wood"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
             <label text="Edit Wood" />
@@ -5078,4 +5219,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=forest"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=forest"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=forest"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=forest" />
             <label text="Edit Forest Landuse" />
@@ -5099,4 +5241,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=fell"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
             <label text="Edit Fell" />
@@ -5111,5 +5254,7 @@
         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=heath"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=heath"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=heath"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
             <label text="Edit Heath" />
@@ -5122,5 +5267,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=farmyard" />
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=farmyard"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=farmyard"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=farmyard" />
             <label text="Edit Farmyard Landuse" />
             <space />
@@ -5148,5 +5295,7 @@
         <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenhouse_horticulture" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenhouse_horticulture"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenhouse_horticulture"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
             <label text="Edit Greenhouse Horticulture" />
             <space />            
@@ -5175,5 +5324,7 @@
         <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=village_green"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=village_green" />
             <label text="Edit Village Green Landuse" />
             <space />
@@ -5195,5 +5346,7 @@
         <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=recreation_ground"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=recreation_ground"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=recreation_ground"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=recreation_ground" />
             <label text="Edit Recreation Ground Landuse" />
@@ -5211,4 +5364,7 @@
         <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grave_yard"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=grave_yard"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=grave_yard"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=grave_yard"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=grave_yard"
@@ -5223,5 +5379,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=cemetery"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=cemetery"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=cemetery"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:landuse=cemetery"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=cemetery"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=cemetery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=cemetery" />
@@ -5252,8 +5411,9 @@
         </item>
         <item name="Garages" icon="presets/garages.png" type="closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=garages"
-                  en.href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=garages"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=garages"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:landuse=garages"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=garages"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
             <label text="Edit Garages" />
@@ -5265,4 +5425,5 @@
         <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=railway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=railway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=railway" />
@@ -5383,4 +5544,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:boundary"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:boundary"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
             <label text="Edit Boundary" />
@@ -5416,6 +5578,8 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:restriction"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:restriction"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:restriction"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:restriction"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:restriction"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Relation:restriction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction"/>
@@ -5433,5 +5597,9 @@
         </item>
         <item name="Enforcement" icon="presets/speed_camera.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:enforcement"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:enforcement"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement"/>
             <label text="Edit Enforcement" />
             <key key="type" value="enforcement" />
@@ -5482,5 +5650,6 @@
         </item>
         <item name="Route master" icon="presets/path.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:route_master"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relation:route_master"
+                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Relation:route_master"/>
             <label text="Edit Route master" />
             <key key="type" value="route_master" />
@@ -5544,5 +5713,8 @@
         <separator/>
         <item name="Associated street" icon="presets/addresses.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"/>
             <label text="Edit associated street" />
             <key key="type" value="associatedStreet" />
@@ -5554,5 +5726,6 @@
         </item>
         <item name="Street" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Street"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relation:street"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street"/>
             <label text="Edit Street" />
             <key key="type" value="street" />
@@ -5566,5 +5739,10 @@
         </item>
         <item name="Destination sign" icon="presets/guidepost.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:destination_sign"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:destination_sign"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:destination_sign"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign"/>
             <label text="Edit Destination sign" />
             <key key="type" value="destination_sign" />
@@ -5606,5 +5784,6 @@
         </item>
         <item name="Bridge" icon="presets/bridge.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels"/>
             <label text="Edit Bridge" />
             <key key="type" value="bridge" />