Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6977)
+++ /trunk/data/defaultpresets.xml	(revision 6978)
@@ -1354,4 +1354,5 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=retaining_wall"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=retaining_wall"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=retaining_wall"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=retaining_wall"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=retaining_wall"
@@ -2114,5 +2115,8 @@
         </item>
         <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Piste_Maps"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Piste_Maps" />
             <space />
             <key key="aerialway" value="gondola" />
@@ -2139,5 +2143,8 @@
         </item>
         <item name="T-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Piste_Maps"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Piste_Maps" />
             <space />
             <key key="aerialway" value="t-bar" />
@@ -2313,5 +2320,6 @@
         <item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=charging_station" />
             <space />
             <key key="amenity" value="charging_station" />
@@ -5055,5 +5063,8 @@
         </item>
         <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switchgear" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
             <label text="(Please only use this tag if more detailed mapping using busbars and bays is impossible!)" />
@@ -5067,5 +5078,8 @@
         </item>
         <item name="Power Busbar" icon="presets/power.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
             <key key="power" value="line" />
@@ -5077,5 +5091,8 @@
         </item>
         <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
             <key key="power" value="line" />
@@ -5093,5 +5110,8 @@
         <separator/>
         <item name="Power Converter" icon="presets/power.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
             <key key="power" value="converter" />
@@ -5107,5 +5127,8 @@
         </item>
         <item name="Power Compensator" icon="presets/power.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
             <key key="power" value="compensator" />
@@ -5121,8 +5144,7 @@
         <separator/>
         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable_distribution_cabinet"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=cable_distribution_cabinet" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable" />
             <space />
             <key key="power" value="cable_distribution_cabinet" />
@@ -6738,4 +6760,5 @@
         <item name="Site" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:site"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:site"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:site"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:site" />
@@ -6841,4 +6864,5 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Hiking"
                   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"/>
                 <space/>
@@ -6981,4 +7005,5 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:associatedStreet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:associatedStreet" />
             <space />