Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 12908)
+++ trunk/data/defaultpresets.xml	(revision 12913)
@@ -1600,4 +1600,5 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=traffic_mirror"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_mirror"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=traffic_mirror"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=traffic_mirror" />
             <key key="highway" value="traffic_mirror" />
@@ -1820,4 +1821,5 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:barrier=city_wall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=city_wall"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:barrier=city_wall"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=city_wall"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=city_wall"
@@ -2880,5 +2882,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=chair_lift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=chair_lift" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=chair_lift"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aerialway=chair_lift" />
             <space />
             <key key="aerialway" value="chair_lift" />
@@ -2897,5 +2900,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=gondola"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aerialway=gondola"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=gondola" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=gondola"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aerialway=gondola" />
             <space />
             <key key="aerialway" value="gondola" />
@@ -2910,5 +2914,6 @@
         <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aerialway=mixed_lift" />
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aerialway=mixed_lift"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aerialway=mixed_lift" />
             <space />
             <key key="aerialway" value="mixed_lift" />
@@ -2926,5 +2931,6 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aerialway=drag_lift"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=drag_lift"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=drag_lift" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=drag_lift"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aerialway=drag_lift" />
             <space />
             <combo key="aerialway" text="Type" values="drag_lift,t-bar,j-bar,platter,rope_tow" display_values="drag_lift (general type - use only if exact type (see values below) is unknown),t-bar,j-bar,platter,rope_tow" match="keyvalue" />
@@ -2939,5 +2945,6 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aerialway=magic_carpet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=magic_carpet"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=magic_carpet" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=magic_carpet"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aerialway=magic_carpet" />
             <space />
             <key key="aerialway" value="magic_carpet" />
@@ -2976,5 +2983,6 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aerialway=pylon"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=pylon"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=pylon" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=pylon"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aerialway=pylon" />
             <space />
             <key key="aerialway" value="pylon" />
@@ -3523,4 +3531,5 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:public_transport=station"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:public_transport=station"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT: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"
@@ -3809,5 +3818,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:airmark=beacon"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:airmark=beacon"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:airmark=beacon" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:airmark=beacon"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:airmark=beacon" />
             <key key="airmark" value="beacon" />
         </item> <!-- Beacon -->
@@ -3816,4 +3826,6 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aeroway=navigationaid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=navigationaid"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aeroway=navigationaid"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=navigationaid"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=navigationaid" />
             <key key="aeroway" value="navigationaid" />
@@ -4365,4 +4377,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:information=guidepost"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:information=guidepost"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR: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"
@@ -4563,5 +4576,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=fitness_station"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:leisure=fitness_station"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fitness_station" />
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fitness_station"
+                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:leisure=fitness_station" />
             <space />
             <key key="leisure" value="fitness_station" />
@@ -6119,4 +6133,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=track"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:leisure=track"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=track"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=track"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=track"
@@ -8174,4 +8189,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:organic"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Key:organic"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:organic"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:organic"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:organic" />
@@ -8183,5 +8199,6 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:fair_trade"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:fair_trade"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:fair_trade" />
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:fair_trade"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:fair_trade" />
             <space />
             <combo text="Fair Trade" key="fair_trade" values="no,yes,only" match="key" />
@@ -9315,4 +9332,5 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:office=estate_agent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=estate_agent"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=estate_agent"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=estate_agent"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:office=estate_agent"
@@ -9533,4 +9551,5 @@
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=caterer"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:craft=caterer"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:craft=caterer"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:craft=caterer"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:craft=caterer"
@@ -10325,4 +10344,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=nature_reserve"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:leisure=nature_reserve"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=nature_reserve"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=nature_reserve"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=nature_reserve"
@@ -10598,4 +10618,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=garden"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:leisure=garden"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=garden"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=garden"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=garden"