Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7639)
+++ trunk/data/defaultpresets.xml	(revision 7640)
@@ -845,4 +845,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:construction"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:construction"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:construction"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:construction"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:construction"
@@ -911,4 +912,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:junction=roundabout"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA: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"
@@ -1030,4 +1032,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Bicycle"
                   hr.href="http://wiki.openstreetmap.org/wiki/Hr:Bicycle"
+                  hu.href="http://wiki.openstreetmap.org/wiki/Hu:Bicycle"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Bicycle"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Bicycle"
@@ -1056,5 +1059,6 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=cycleway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=cycleway"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=cycleway" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=cycleway"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=cycleway" />
             <key key="highway" value="cycleway" />
             <optional>
@@ -1189,4 +1193,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=traffic_signals"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=traffic_signals"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=traffic_signals"
@@ -1225,4 +1230,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=mini_roundabout"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=mini_roundabout"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=mini_roundabout"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
@@ -1272,4 +1278,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=turning_circle"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -2151,5 +2158,7 @@
         </item> <!-- Rail -->
         <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=light_rail"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=light_rail" />
             <key key="railway" value="narrow_gauge" />
             <optional>
@@ -2226,5 +2235,6 @@
         <item name="Disused Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=disused" />
             <key key="railway" value="disused" />
             <optional>
@@ -2235,4 +2245,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
                   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" />
             <key key="railway" value="abandoned" />
@@ -2329,4 +2340,5 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aerialway=cable_car"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=cable_car"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA: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" />
@@ -2864,4 +2876,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:public_transport=station"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:public_transport=station"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:public_transport=station"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:public_transport=station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:public_transport=station" />
@@ -2877,4 +2890,5 @@
         <item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
@@ -3715,5 +3729,7 @@
         </item> <!-- Public Grill -->
         <item name="Firepit" icon="styles/standard/leisure/firepit.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=firepit" />
+            <link href="http://wiki.openstreetmap.org/wiki/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" />
             <space />
             <key key="leisure" value="firepit" />
@@ -3799,4 +3815,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=artwork"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:tourism=artwork"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=artwork"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=artwork"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork"
@@ -4330,5 +4347,6 @@
         </item> <!-- Toilets/Restrooms -->
         <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" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shower"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=shower" />
             <space />
             <key key="amenity" value="shower" />
@@ -4745,5 +4763,7 @@
         </item> <!-- Swimming -->
         <item name="Scuba Diving" icon="styles/standard/sport/scuba_diving.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=scuba_diving" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=scuba_diving"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=scuba_diving"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=scuba_diving" />
             <space />
             <key key="sport" value="scuba_diving" />
@@ -5326,5 +5346,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=survey_point"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=survey_point" />
             <space />
             <key key="man_made" value="survey_point" />
@@ -5991,5 +6012,6 @@
         </item> <!-- Candy Store -->
         <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" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=tea" />
             <space />
             <key key="shop" value="tea" />
@@ -6493,4 +6515,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=hairdresser"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=hairdresser"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=hairdresser"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hairdresser"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hairdresser" />
@@ -6504,4 +6527,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
@@ -6522,4 +6546,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"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=jewelry"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=jewelry" />
@@ -6660,5 +6685,6 @@
         <item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=lottery"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery" />
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=lottery" />
             <space />
             <key key="shop" value="lottery" />
@@ -6975,4 +7001,5 @@
         <item name="Islet" icon="presets/islet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE: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"
@@ -7645,5 +7672,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:multipolygon"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:multipolygon"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:multipolygon" />
             <key key="type" value="multipolygon" />
             <optional>
@@ -7662,5 +7690,6 @@
                   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" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:boundary" />
             <space />
             <key key="type" value="boundary" />
@@ -7870,4 +7899,5 @@
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:route=railway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=railway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=railway" />