Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7328)
+++ trunk/data/defaultpresets.xml	(revision 7332)
@@ -377,6 +377,8 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=motorway"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=motorway"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=motorway"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:highway=motorway"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=motorway"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=motorway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=motorway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway"
@@ -1047,4 +1049,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=steps"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=steps"
+                  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" />
@@ -1064,4 +1067,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_junction"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=motorway_junction"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=motorway_junction"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=motorway_junction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_junction" />
@@ -1182,6 +1186,5 @@
         </item>
         <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_lopp"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_lopp" />
             <key key="highway" value="turning_loop" />
         </item>
@@ -1246,4 +1249,5 @@
         <item name="Block" icon="presets/block.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=block"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=block"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=block" />
@@ -1507,4 +1511,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:tunnel"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:tunnel"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:tunnel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
@@ -1625,4 +1630,5 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=stream"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=stream"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt: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" />
@@ -1658,4 +1664,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=river"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=river"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:waterway=river"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=river"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=river" />
@@ -1783,4 +1790,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=coastline"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=coastline"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=coastline"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=coastline"
@@ -1798,4 +1806,5 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=riverbank"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=riverbank"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:waterway=riverbank"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=riverbank"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=riverbank"
@@ -1904,5 +1913,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=lock_gate"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=lock_gate"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=lock_gate" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=lock_gate"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=lock_gate" />
             <key key="waterway" value="lock_gate" />
         </item>
@@ -1985,4 +1995,5 @@
         <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=preserved"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=preserved" />
             <key key="railway" value="preserved" />
@@ -2380,4 +2391,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=car"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=car"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=car"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=car"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=car"
@@ -2871,5 +2883,6 @@
         <item name="Hangar" icon="presets/hangar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
             <key key="building" value="hangar" />
         </item>
@@ -3446,4 +3459,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=playground"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=playground"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=playground"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=playground"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=playground"
@@ -4749,5 +4763,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=crane"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=crane"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=crane" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=crane"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=crane" />
             <space />
             <key key="man_made" value="crane" />
@@ -4758,5 +4773,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=mineshaft"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=mineshaft" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=mineshaft"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=mineshaft" />
             <space />
             <key key="man_made" value="mineshaft" />
@@ -4832,5 +4848,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fountain"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fountain"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fountain" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fountain"
+                  zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=fountain" />
             <space />
             <key key="amenity" value="fountain" />
@@ -4843,5 +4860,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=water_well"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=water_well"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_well" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_well"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_well" />
             <space />
             <key key="man_made" value="water_well" />
@@ -4878,4 +4896,5 @@
         <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">
             <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"
                   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" />
@@ -5072,4 +5091,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=substation"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
@@ -5113,4 +5133,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=substation"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
@@ -5128,4 +5149,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=substation"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
@@ -5141,4 +5163,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=substation"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
@@ -5160,4 +5183,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=substation"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
@@ -5177,4 +5201,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=substation"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
@@ -5293,4 +5318,5 @@
         <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs: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"
@@ -5517,4 +5543,5 @@
         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=farm"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=farm"
@@ -6162,5 +6189,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:boundary=administrative"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:boundary=administrative"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=administrative" />
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=administrative"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=administrative" />
             <space />
             <key key="boundary" value="administrative" />
@@ -6392,4 +6420,5 @@
         <item name="Tree Row" icon="presets/tree.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree_row"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree_row"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=tree_row"
@@ -6572,4 +6601,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=village_green"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=village_green"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -6595,4 +6625,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=recreation_ground"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=recreation_ground"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -6637,5 +6668,7 @@
         <item name="Religious" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=cemetery" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=religious"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=religious"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=religious" />
             <space />
             <key key="landuse" value="religious" />
@@ -6811,5 +6844,6 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr"
+                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Key:addr" />
             <space />
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
@@ -7001,4 +7035,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Mountain_biking"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Mountain_biking"
+                  no.href="http://wiki.openstreetmap.org/wiki/No:Mountain_biking"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Mountain_biking"/>
                 <space/>
@@ -7159,4 +7194,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:associatedStreet"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:associatedStreet"