Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8204)
+++ trunk/data/defaultpresets.xml	(revision 8300)
@@ -413,4 +413,5 @@
                   ko.href="http://wiki.openstreetmap.org/wiki/Ko:Tag:highway=trunk"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=trunk"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=trunk"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=trunk"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=trunk"
@@ -437,5 +438,6 @@
         </item> <!-- Trunk -->
         <item name="Trunk Link" icon="presets/trunk.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)" />
+            <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Highway_link" />
             <space />
             <key key="highway" value="trunk_link" />
@@ -468,5 +470,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=primary"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=primary"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=primary" />
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=primary"
+                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Tag:highway=primary" />
             <space />
             <key key="highway" value="primary" />
@@ -507,5 +510,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=secondary"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=secondary"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=secondary" />
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=secondary"
+                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Tag:highway=secondary" />
             <space />
             <key key="highway" value="secondary" />
@@ -542,7 +546,9 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=tertiary"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=tertiary"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=tertiary"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=tertiary"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=tertiary"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=tertiary" />
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=tertiary"
+                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Tag:highway=tertiary" />
             <space />
             <key key="highway" value="tertiary" />
@@ -577,4 +583,5 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=unclassified"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=unclassified"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=unclassified"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=unclassified"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=unclassified"
@@ -598,7 +605,9 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=residential"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=residential"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt: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"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential" />
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential"
+                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Tag:highway=residential" />
             <space />
             <key key="highway" value="residential" />
@@ -688,5 +697,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br: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" />
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=service"
+                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Tag:highway=service" />
             <space />
             <key key="highway" value="service" />
@@ -866,4 +876,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=track"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=track"
+                  ko.href="http://wiki.openstreetmap.org/wiki/Ko:Tag:highway=track"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=track"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=track"
@@ -1198,4 +1209,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:traffic_calming"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:traffic_calming"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA: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"
@@ -1223,5 +1235,6 @@
         <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_loop"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=turning_loop" />
             <key key="highway" value="turning_loop" />
         </item> <!-- Turning Loop -->
@@ -1269,4 +1282,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=elevator"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=elevator"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=elevator"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=elevator" />
             <key key="highway" value="elevator" />
@@ -1353,4 +1367,5 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:barrier"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:barrier"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:barrier"
                   hu.href="http://wiki.openstreetmap.org/wiki/Hu:Key:barrier"
@@ -1420,4 +1435,5 @@
         <item name="Guard Rail" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=guard_rail"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
             <key key="barrier" value="guard_rail" />
@@ -1438,4 +1454,5 @@
         <item name="City Wall" icon="presets/city_wall.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=city_wall"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=city_wall"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=city_wall"
@@ -1460,4 +1477,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=ditch"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=ditch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=ditch"
@@ -1694,4 +1712,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=drain"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=drain"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=drain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=drain"
@@ -1707,4 +1726,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=ditch"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=ditch"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=ditch"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=ditch"
@@ -1775,4 +1795,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=spring"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=spring"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA: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" />
@@ -1784,5 +1805,7 @@
         </item> <!-- Spring -->
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=waterfall" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=waterfall"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=waterfall"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=waterfall" />
             <space />
             <key key="waterway" value="waterfall" />
@@ -2085,4 +2108,5 @@
         <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=boatyard"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=boatyard"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=boatyard"
@@ -2178,4 +2202,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=tram"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=tram"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram"
@@ -2191,5 +2216,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_guideway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_guideway"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_guideway" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_guideway"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bus_guideway" />
             <key key="highway" value="bus_guideway" />
             <optional>
@@ -2216,5 +2242,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=abandoned"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:railway=abandoned" />
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:railway=abandoned"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=abandoned" />
             <key key="railway" value="abandoned" />
             <optional>
@@ -2266,5 +2293,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=turntable"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=turntable"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=turntable" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=turntable"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=turntable" />
             <key key="railway" value="turntable" />
         </item> <!-- Turntable -->
@@ -2460,4 +2488,5 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fuel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=fuel"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=fuel" />
             <space />
@@ -2603,5 +2632,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=motorcycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=motorcycle_parking"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=motorcycle_parking" />
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=motorcycle_parking"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=motorcycle_parking" />
             <space />
             <key key="amenity" value="motorcycle_parking" />
@@ -2700,5 +2730,7 @@
         <item name="Public Bicycle Repair Station" icon="styles/standard/vehicle/bicycle_repair_station.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_repair_station"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_repair_station" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_repair_station"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bicycle_repair_station"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_repair_station" />
             <space />
             <key key="amenity" value="bicycle_repair_station" />
@@ -2931,4 +2963,5 @@
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=tram_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram_stop" />
             <key key="railway" value="tram_stop" />
@@ -2940,4 +2973,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=platform"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=platform" />
             <space />
@@ -3064,5 +3098,6 @@
         </item> <!-- Apron -->
         <item name="Plane Parking Position" icon="styles/standard/transport/airport/parking_position.png" type="node,way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=parking_position" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=parking_position"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=parking_position" />
             <key key="aeroway" value="parking_position" />
             <text key="ref" text="Reference" />
@@ -3072,5 +3107,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=hangar"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:aeroway=hangar"
-                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=hangar" />
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=hangar"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=hangar" />
             <key key="aeroway" value="hangar" />
             <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
@@ -3138,4 +3174,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=motel"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=motel"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=motel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=motel"
@@ -3154,4 +3191,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=guest_house"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=guest_house"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=guest_house"
@@ -3170,4 +3208,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=chalet"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=chalet"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:tourism=chalet"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=chalet"
@@ -3222,4 +3261,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=caravan_site"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=caravan_site"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=caravan_site" />
@@ -3267,4 +3307,5 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=restaurant"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=restaurant"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT: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"
@@ -3286,4 +3327,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fast_food"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fast_food"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fast_food"
@@ -3320,4 +3362,5 @@
                   et.href="http://wiki.openstreetmap.org/wiki/Et:Tag:amenity=cafe"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=cafe"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=cafe"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=cafe"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=cafe"
@@ -3339,4 +3382,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pub"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT: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"
@@ -3424,4 +3468,5 @@
         <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=attraction"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=attraction"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=attraction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=attraction" />
@@ -3502,4 +3547,5 @@
         <item name="Guidepost" icon="presets/guidepost.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:information=guidepost"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:information=guidepost"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:information=guidepost"
@@ -3596,4 +3642,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=zoo"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zoo"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=zoo"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=zoo"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=zoo" />
@@ -3625,4 +3672,6 @@
         <item name="Amusement/Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=theme_park"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=theme_park"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=theme_park"
@@ -3714,5 +3763,6 @@
         </item> <!-- Picnic Site -->
         <item name="Picnic Table" icon="styles/standard/leisure/picnic.png" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=picnic_table" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=picnic_table"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=picnic_table" />
             <space />
             <key key="leisure" value="picnic_table" />
@@ -3734,4 +3784,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=firepit"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=firepit"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=firepit"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=firepit"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=firepit" />
@@ -4013,4 +4064,5 @@
         <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=public_building"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=public_building"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=public_building"
@@ -4037,4 +4089,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=community_centre"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=community_centre"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=community_centre"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=community_centre"
@@ -4230,4 +4283,7 @@
         <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=doctors"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=doctors"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=doctors"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=doctors"
@@ -4241,4 +4297,6 @@
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=dentist"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=dentist"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=dentist"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=dentist"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=dentist"
@@ -4301,5 +4359,6 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=baby_hatch"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=baby_hatch"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=baby_hatch" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=baby_hatch"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=baby_hatch" />
             <space />
             <key key="amenity" value="baby_hatch" />
@@ -4365,4 +4424,5 @@
         <item name="Shower" icon="styles/standard/service/shower.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shower"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shower"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=shower" />
             <space />
@@ -4506,5 +4566,8 @@
         </item> <!-- Waste Disposal/Dumpster -->
         <item name="Sanitary Dump Station" icon="styles/standard/service/recycling/sanitary_dump_station.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sanitary_dump_station" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sanitary_dump_station"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=sanitary_dump_station"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=sanitary_dump_station"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=sanitary_dump_station" />
             <space />
             <key key="amenity" value="sanitary_dump_station" />
@@ -4698,5 +4761,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=miniature_golf"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=miniature_golf"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=miniature_golf" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=miniature_golf"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=miniature_golf" />
             <space />
             <key key="leisure" value="miniature_golf" />
@@ -4706,5 +4770,6 @@
     <group name="Sport" icon="presets/rowing.png">
         <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=multi" />
             <space />
             <key key="sport" value="multi" />
@@ -4746,4 +4811,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=climbing"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:sport=climbing" />
             <space />
@@ -4811,4 +4877,5 @@
         <item name="Swimming" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=swimming"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
             <space />
@@ -5101,4 +5168,5 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:building"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:building"
                   hu.href="http://wiki.openstreetmap.org/wiki/Hu:Key:building"
@@ -5138,5 +5206,11 @@
         </item> <!-- Residential Building -->
             <item name="Building part" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:building:part" />
+            <link href="http://wiki.openstreetmap.org/wiki/Key:building:part"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building:part"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:building:part"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:building:part"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:building:part"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building:part"
+                  zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:building:part" />
             <space />
             <combo key="building:part" text="Building part" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
@@ -5183,4 +5257,5 @@
         <item name="Flagpole" icon="presets/flag.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=flagpole"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=flagpole"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=flagpole" />
@@ -5213,5 +5288,6 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:man_made=windmill"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=windmill"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=windmill" />
             <space />
             <key key="man_made" value="windmill" />
@@ -5291,4 +5367,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=embankment"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=embankment"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=embankment"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:man_made=embankment" />
             <space />
@@ -5334,5 +5411,6 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=watermill"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=watermill"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=watermill" />
             <space />
             <key key="man_made" value="watermill" />
@@ -5501,5 +5579,6 @@
         </item> <!-- Bridge Support -->
         <item name="Bridge outline" icon="presets/bridge.png" type="closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bridge" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bridge"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=bridge" />
             <space />
             <key key="man_made" value="bridge" />
@@ -5919,4 +5998,5 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=castle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=castle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=castle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=castle" />
@@ -5929,4 +6009,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=ruins"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=ruins"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=ruins"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:historic=ruins"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=ruins"
@@ -5939,4 +6020,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=archaeological_site"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:historic=archaeological_site"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=archaeological_site"
@@ -6006,4 +6088,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_cross"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=wayside_cross"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=wayside_cross"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=wayside_cross"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=wayside_cross" />
@@ -6019,4 +6102,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_shrine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=wayside_shrine"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=wayside_shrine"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:historic=wayside_shrine"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=wayside_shrine"
@@ -6037,4 +6121,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=boundary_stone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=boundary_stone"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=boundary_stone"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=boundary_stone"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=boundary_stone"
@@ -6052,4 +6137,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=supermarket"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=supermarket"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=supermarket"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=supermarket"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=supermarket"
@@ -6065,4 +6151,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=convenience"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=convenience"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=convenience"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=convenience"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=convenience"
@@ -6095,4 +6182,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bakery"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=bakery"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=bakery"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bakery"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=bakery"
@@ -6120,5 +6208,7 @@
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=seafood"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=seafood"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=seafood"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=seafood" />
@@ -6132,4 +6222,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=deli"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=deli"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=deli"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=deli"
@@ -6157,4 +6248,6 @@
         <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tea"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=tea"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=tea" />
             <space />
@@ -6164,5 +6257,7 @@
         </item> <!-- Tea -->
         <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=coffee" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=coffee"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=coffee"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=coffee" />
             <space />
             <key key="shop" value="coffee" />
@@ -6205,4 +6300,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=farm"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=farm"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=farm"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=farm" />
@@ -6224,5 +6320,6 @@
         </item> <!-- Organic -->
         <item name="Fair Trade" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
+            <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:fair_trade" />
             <space />
             <combo text="Fair Trade" key="fair_trade" values="no,yes,only" match="key" />
@@ -6233,4 +6330,5 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=alcohol"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=alcohol"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=alcohol"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=alcohol"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=alcohol"
@@ -6245,4 +6343,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beverages"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=beverages"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beverages"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beverages" />
@@ -6254,5 +6353,6 @@
         <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=wine"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=wine" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=wine"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=wine" />
             <space />
             <key key="shop" value="wine" />
@@ -6498,4 +6598,5 @@
         <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=furniture"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=furniture"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=furniture"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=furniture"
@@ -6664,4 +6765,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=chemist"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=chemist"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=chemist"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=chemist"
@@ -6709,4 +6812,5 @@
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=optician"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=optician"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=optician" />
@@ -6726,5 +6830,7 @@
         </item> <!-- Hearing Aids -->
         <item name="Medical Supply" icon="styles/standard/shop/medical_supply.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=medical_supply" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=medical_supply"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=medical_supply"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=medical_supply" />
             <space />
             <key key="shop" value="medical_supply" />
@@ -6735,4 +6841,5 @@
         <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=jewelry"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
@@ -6745,4 +6852,5 @@
         <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=gift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=gift"
@@ -6871,5 +6979,6 @@
         </item> <!-- Variety Store -->
         <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bookmaker" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bookmaker"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bookmaker" />
             <space />
             <key key="shop" value="bookmaker" />
@@ -6897,4 +7006,5 @@
         <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pet"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=pet"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=pet"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=pet"
@@ -6934,5 +7044,9 @@
     </item> <!-- Vending Machine -->
     <item name="Payment Methods" icon="styles/standard/money/dollar.svg" type="node,way,closedway,relation" preset_name_label="true">
-        <link href="http://wiki.openstreetmap.org/wiki/Key:payment" />
+        <link href="http://wiki.openstreetmap.org/wiki/Key:payment"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:payment"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:payment"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:payment"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:payment" />
         <space />
         <combo key="payment:cash" text="Cash" values="yes,no" />
@@ -7005,5 +7119,6 @@
         <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=political" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=political"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:boundary=political" />
             <space />
             <key key="boundary" value="political" />
@@ -7013,4 +7128,5 @@
         <item name="Postal Code" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=postal_code"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=postal_code" />
             <space />
@@ -7045,5 +7161,7 @@
         </item> <!-- Protected Area -->
         <item name="Maritime" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=maritime" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=maritime"
+                  no.href="http://wiki.openstreetmap.org/wiki/No:Tag:boundary=maritime"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=maritime" />
             <space />
             <key key="boundary" value="maritime" />
@@ -7116,4 +7234,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=town"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=town"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=town"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=town"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=town"
@@ -7131,4 +7250,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=village"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:place=village"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=village"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=village"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=village"
@@ -7144,4 +7264,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=hamlet"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=hamlet"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=hamlet"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=hamlet"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=hamlet"
@@ -7168,4 +7289,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=suburb"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
@@ -7233,4 +7355,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=saddle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
             <label text="A saddle point between mountains or hills." />
@@ -7245,5 +7368,6 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=glacier"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=glacier"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=glacier" />
             <label text="A persistent body of dense ice that is constantly moving under its own weight." />
             <space />
@@ -7272,4 +7396,5 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=ridge"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=ridge"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
@@ -7281,5 +7406,6 @@
         </item> <!-- Ridge -->
         <item name="Valley" icon="presets/valley.svg" type="way,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=valley" />
             <label text="A low area between hills." />
             <space />
@@ -7293,5 +7419,6 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=cave_entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=cave_entrance"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cave_entrance" />
             <label text="The entrance to a cave." />
             <space />
@@ -7373,5 +7500,6 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=wood" />
             <label text="Woodland where timber production does not dominate use." />
             <space />
@@ -7395,5 +7523,11 @@
         </item> <!-- Forest -->
         <item name="Cutline" icon="styles/standard/misc/landmark/cutline.svg" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cutline" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cutline"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=cutline"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=cutline"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=cutline"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=cutline"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=cutline"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=cutline" />
             <space />
             <key key="man_made" value="cutline" />
@@ -7430,8 +7564,10 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=scree"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=scree"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=scree"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=scree"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scree" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scree"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=scree" />
             <label text="An accumulation of loose rocks." />
             <space />
@@ -7492,5 +7628,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bare_rock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=bare_rock"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=bare_rock"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=bare_rock"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bare_rock"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=bare_rock"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=bare_rock" />
             <label text="For areas of solid visible rock that is sparsely vegetated or not vegetated at all." />
@@ -7500,5 +7639,7 @@
         </item> <!-- Bare Rock -->
         <item name="Rock" icon="styles/standard/misc/rock.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=rock" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=rock"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=rock"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=rock" />
             <label text="A notable rock or group of rocks, with at least one of them firmly attached to the underlying bedrock." />
             <space />
@@ -7582,4 +7723,5 @@
         <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=greenhouse_horticulture"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenhouse_horticulture"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=greenhouse_horticulture"
@@ -7692,5 +7834,4 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=residential"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=residential"
-                  ht.href="http://wiki.openstreetmap.org/wiki/Ht:Tag:landuse=residential"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=residential"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=residential"
@@ -8128,4 +8269,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:enforcement"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:enforcement"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:enforcement"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:enforcement"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement" />
@@ -8195,5 +8337,6 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Hiking"
                   ro.href="http://wiki.openstreetmap.org/wiki/Ro:Hiking"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Hiking" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Hiking"
+                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Hiking" />
                 <space/>
                 <key key="type" value="route"/>
@@ -8212,4 +8355,5 @@
             <item name="Piste Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=piste"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:route=piste" />
                 <space/>
@@ -8295,4 +8439,5 @@
             <item name="Road Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=road"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:route=road"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=road" />