Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7746)
+++ trunk/data/defaultpresets.xml	(revision 7747)
@@ -800,4 +800,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=track"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=track"
+                  id.href="http://wiki.openstreetmap.org/wiki/Id:Tag:highway=track"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=track"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=track"
@@ -976,5 +977,6 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=steps"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=steps"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=steps" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=steps"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=steps" />
             <key key="highway" value="steps" />
             <optional>
@@ -1123,4 +1125,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"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA: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"
@@ -2025,5 +2028,7 @@
         <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=preserved"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=preserved"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=preserved"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=preserved" />
             <key key="railway" value="preserved" />
@@ -2140,4 +2145,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
                   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" />
             <key key="railway" value="turntable" />
@@ -2145,4 +2151,5 @@
         <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=buffer_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=buffer_stop" />
             <key key="railway" value="buffer_stop" />
@@ -2150,4 +2157,5 @@
         <item name="Railway Switch" icon="presets/railway_switch.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=switch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=switch" />
             <key key="railway" value="switch" />
@@ -2547,4 +2555,5 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=bicycle_parking"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=bicycle_parking"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br: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" />
@@ -2737,4 +2746,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
@@ -2803,4 +2813,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=halt"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=halt"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=halt" />
@@ -3575,4 +3586,5 @@
         <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"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE: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" />
@@ -3696,4 +3708,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <space />
@@ -4997,5 +5010,6 @@
         </item> <!-- Gasometer -->
         <item name="Bunker Silo" icon="styles/standard/bunker_silo.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bunker_silo" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bunker_silo"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=bunker_silo" />
             <space />
             <key key="man_made" value="bunker_silo" />
@@ -5163,4 +5177,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=monitoring_station"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=monitoring_station"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
@@ -5826,4 +5841,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=kiosk"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=kiosk"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=kiosk"
@@ -5999,5 +6015,6 @@
         </item> <!-- Beverages -->
         <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" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=wine"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=wine" />
             <space />
             <key key="shop" value="wine" />
@@ -6288,5 +6305,8 @@
         </item> <!-- Curtain -->
         <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=art" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=art"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=art"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=art"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=art" />
             <space />
             <key key="shop" value="art" />
@@ -6449,5 +6469,8 @@
         </item> <!-- Beauty -->
         <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=tattoo"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=tattoo"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=tattoo" />
             <space />
             <key key="shop" value="tattoo" />
@@ -6632,5 +6655,11 @@
         </item> <!-- Pet -->
         <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=funeral_directors" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=funeral_directors"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=funeral_directors"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=funeral_directors"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=funeral_directors"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=funeral_directors"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=funeral_directors"
+                  zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:shop=funeral_directors" />
             <space />
             <key key="shop" value="funeral_directors" />
@@ -6683,5 +6712,6 @@
         </item> <!-- Political -->
         <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=postal_code" />
             <space />
             <key key="boundary" value="postal_code" />
@@ -7445,5 +7475,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=brownfield"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=brownfield"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=brownfield" />
             <space />
             <key key="landuse" value="brownfield" />
@@ -7574,5 +7605,6 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Annotations"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Annotations"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Annotations" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Annotations"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Annotations" />
             <space />
             <text key="phone" text="Phone Number" match="key" />
@@ -7755,5 +7787,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Hiking"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Hiking"
-                  ro.href="http://wiki.openstreetmap.org/wiki/Ro:Hiking" />
+                  ro.href="http://wiki.openstreetmap.org/wiki/Ro:Hiking"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Hiking" />
                 <space/>
                 <key key="type" value="route"/>