From 86846e67e09ce96522888c72aceb050fd3738621 Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Sun, 8 Jun 2014 11:28:11 +0000
Subject: [PATCH] Update symbols fr, en

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3120 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 .../eaux/grifo-aparatos/aspersor.elmt          | 10 ++++++----
 .../12energie/eaux/grifo-aparatos/banera.elmt  | 10 ++++++----
 .../12energie/eaux/grifo-aparatos/bide.elmt    |  8 +++++---
 .../eaux/grifo-aparatos/bomba-agua-vert.elmt   |  8 +++++---
 .../eaux/grifo-aparatos/bomba-horiz1.elmt      | 10 ++++++----
 .../eaux/grifo-aparatos/calentador-gas.elmt    | 18 ++++++++++--------
 .../12energie/eaux/grifo-aparatos/ducha.elmt   | 12 +++++++-----
 .../eaux/grifo-aparatos/fregadero.elmt         | 10 ++++++----
 .../eaux/grifo-aparatos/fregadero1.elmt        | 10 ++++++----
 .../eaux/grifo-aparatos/grifo-lavabo.elmt      |  8 +++++---
 .../eaux/grifo-aparatos/grifo-lavabo1.elmt     | 16 +++++++++-------
 .../eaux/grifo-aparatos/grifo-manguera.elmt    | 10 ++++++----
 .../12energie/eaux/grifo-aparatos/inodoro.elmt |  8 +++++---
 .../12energie/eaux/grifo-aparatos/lavabo.elmt  | 14 ++++++++------
 .../eaux/grifo-aparatos/lavadero.elmt          | 10 ++++++----
 .../eaux/grifo-aparatos/lavadora.elmt          |  8 +++++---
 .../eaux/grifo-aparatos/lavavajillas.elmt      |  8 +++++---
 .../eaux/grifo-aparatos/manguera.elmt          | 10 ++++++----
 .../eaux/grifo-aparatos/termo-electrico.elmt   |  8 +++++---
 .../eaux/grifo-aparatos/vertedero.elmt         | 10 ++++++----
 20 files changed, 123 insertions(+), 83 deletions(-)

diff --git a/elements/12energie/eaux/grifo-aparatos/aspersor.elmt b/elements/12energie/eaux/grifo-aparatos/aspersor.elmt
index 6a6274701..128d38a9c 100644
--- a/elements/12energie/eaux/grifo-aparatos/aspersor.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/aspersor.elmt
@@ -1,5 +1,7 @@
-<definition width="60" version="0.4" hotspot_x="18" hotspot_y="34" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="18" hotspot_y="34" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sprinkler irrigation</name>
+        <name lang="fr">irrigation</name>
         <name lang="es">Aspersor riego</name>
     </names>
     <informations>Rafael Ferrando.
@@ -15,10 +17,10 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="3" x="4" y="6" antialias="false" height="6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.6" x1="4.73333" y2="7.6" x2="6.28889"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.524" x1="5" y2="10.524" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-15" x1="10" y2="-28" x2="37"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-11" x1="11" y2="-4" x2="36"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-15" x1="10" y2="-28" x2="37"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-11" x1="11" y2="-4" x2="36"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="-11" y2="3" x2="12"/>
         <text x="-12" y="-20" size="4" text="Aspersor"/>
-        <terminal x="6" y="9" nameHidden="1" number="" name="" orientation="e"/>
+        <terminal x="6" y="9" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/banera.elmt b/elements/12energie/eaux/grifo-aparatos/banera.elmt
index a1fa8e54f..6a9c7d529 100644
--- a/elements/12energie/eaux/grifo-aparatos/banera.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/banera.elmt
@@ -1,6 +1,8 @@
-<definition width="150" version="0.4" hotspot_x="73" hotspot_y="37" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="150" version="0.4" hotspot_x="73" hotspot_y="37" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">bañera</name>
+        <name lang="en">Bathtub</name>
+        <name lang="fr">Baignoire</name>
+        <name lang="es">Bañera</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -32,7 +34,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31.1604" x1="-16" y2="-26.0624" x2="-16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31.1604" x1="-12" y2="-26.0624" x2="-12"/>
         <text x="-9" y="8.60404" size="4" text="Bañera"/>
-        <terminal x="-14" y="-32.18" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="11" y="-32.18" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-14" y="-32.18" orientation="n"/>
+        <terminal x="11" y="-32.18" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/bide.elmt b/elements/12energie/eaux/grifo-aparatos/bide.elmt
index 0e74535f9..551506cfd 100644
--- a/elements/12energie/eaux/grifo-aparatos/bide.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/bide.elmt
@@ -1,5 +1,7 @@
-<definition width="60" version="0.4" hotspot_x="29" hotspot_y="45" height="100" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="29" hotspot_y="45" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Bidet</name>
+        <name lang="fr">Bidé</name>
         <name lang="es">Bidé</name>
     </names>
     <informations>Rafael Ferrando.
@@ -27,7 +29,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28" x1="5" y2="-28" x2="10"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="4" y2="-32" x2="7"/>
         <text x="-4" y="27" size="4" text="Bidé"/>
-        <terminal x="-7" y="-38" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="9" y="-37" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-7" y="-38" orientation="n"/>
+        <terminal x="9" y="-37" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/bomba-agua-vert.elmt b/elements/12energie/eaux/grifo-aparatos/bomba-agua-vert.elmt
index 61eacc680..ade2c3147 100644
--- a/elements/12energie/eaux/grifo-aparatos/bomba-agua-vert.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/bomba-agua-vert.elmt
@@ -1,5 +1,7 @@
-<definition width="60" version="0.4" hotspot_x="28" hotspot_y="74" height="110" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="28" hotspot_y="74" height="110" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Vertical Water Pump</name>
+        <name lang="fr">Pompe verticale</name>
         <name lang="es">Bomba agua vertical</name>
     </names>
     <informations>Rafael Ferrando.
@@ -37,7 +39,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="30" x="-14" y="-29" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
         <rect width="30" x="-14" y="26" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58" x1="-19" y2="-47" x2="-19"/>
-        <terminal x="23.7299" y="22.3213" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="23.7299" y="-20.6787" nameHidden="1" number="" name="" orientation="e"/>
+        <terminal x="23.7299" y="22.3213" orientation="e"/>
+        <terminal x="23.7299" y="-20.6787" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/bomba-horiz1.elmt b/elements/12energie/eaux/grifo-aparatos/bomba-horiz1.elmt
index b4aefcf9d..011be10b8 100644
--- a/elements/12energie/eaux/grifo-aparatos/bomba-horiz1.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/bomba-horiz1.elmt
@@ -1,5 +1,7 @@
-<definition width="120" version="0.4" hotspot_x="33" hotspot_y="45" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="120" version="0.4" hotspot_x="33" hotspot_y="45" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Horizontall Water Pump</name>
+        <name lang="fr">Pompe horizontale</name>
         <name lang="es">Bomba agua horiz-1</name>
     </names>
     <informations>Rafael Ferrando.
@@ -35,8 +37,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.33603" x1="46.8015" y2="-7.33603" x2="47.8452"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.12707" x1="46.2797" y2="3.12707" x2="48.3671"/>
         <rect width="2.08737" x="70.8064" y="-11.5213" antialias="false" height="16.741" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-14.7758" y="-33.7554" size="4" rotate="true" text="Bomba ___"/>
-        <terminal x="59.7707" y="-30.7876" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="78.7299" y="-3.6787" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-14.7758" y="-33.7554" size="4" rotate="true" text="Bomba ___" tagg="none"/>
+        <terminal x="59.7707" y="-30.7876" orientation="n"/>
+        <terminal x="78.7299" y="-3.6787" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/calentador-gas.elmt b/elements/12energie/eaux/grifo-aparatos/calentador-gas.elmt
index 44f47e7d2..c1f35ea03 100644
--- a/elements/12energie/eaux/grifo-aparatos/calentador-gas.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/calentador-gas.elmt
@@ -1,5 +1,7 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="34" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="24" hotspot_y="34" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">ACS-gas heater</name>
+        <name lang="fr">Chauffe eau gaz</name>
         <name lang="es">Calentador ACS-gas</name>
     </names>
     <informations>Rafael Ferrando.
@@ -10,9 +12,9 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="28.1476" x1="-13.09" y2="27.697" x2="-8.95617"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26.345" x1="-5.09617" y2="29.9502" x2="-5.09617"/>
         <rect width="36.8829" x="-18.4781" y="-22.636" antialias="false" height="43.7584" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.5983" x1="-4.17754" y2="30.4008" x2="-5.09617"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.5983" x1="-4.17754" y2="30.4008" x2="-5.09617"/>
         <rect width="4.59314" x="-13.09" y="24.5423" antialias="false" height="5.85842" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.5983" x1="-6.0148" y2="30.4008" x2="-5.09617"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.5983" x1="-6.0148" y2="30.4008" x2="-5.09617"/>
         <rect width="4.59314" x="8.1886" y="24.5423" antialias="false" height="5.85842" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="29.9502" x1="-13.09" y2="29.4996" x2="-8.95617"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="29.9502" x1="8.1886" y2="29.4996" x2="12.3224"/>
@@ -29,10 +31,10 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22.7757" x1="-9.29182" y2="-27.2821" x2="-4.23937"/>
         <rect width="9.18628" x="-4.23937" y="-31.7886" antialias="false" height="4.50648" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27.2821" x1="4.9469" y2="-22.7757" x2="11.3773"/>
-        <text x="-12.7832" y="-8.34947" size="4" text="Calentador"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.2994" x1="15.7496" y2="26.0484" x2="16.8537"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.2994" x1="17.9579" y2="26.0484" x2="16.8537"/>
-        <terminal x="10.229" y="31.6757" nameHidden="1" number="" name="" orientation="s"/>
-        <terminal x="-10.7493" y="31.6757" nameHidden="1" number="" name="" orientation="s"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.2994" x1="15.7496" y2="26.0484" x2="16.8537"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.2994" x1="17.9579" y2="26.0484" x2="16.8537"/>
+        <input x="-18" y="-3" size="4" rotate="true" text="Calentador" tagg="none"/>
+        <terminal x="10.229" y="31.6757" orientation="s"/>
+        <terminal x="-10.7493" y="31.6757" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/ducha.elmt b/elements/12energie/eaux/grifo-aparatos/ducha.elmt
index 0b1039783..b7b8e2943 100644
--- a/elements/12energie/eaux/grifo-aparatos/ducha.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/ducha.elmt
@@ -1,6 +1,8 @@
-<definition width="100" version="0.4" hotspot_x="39" hotspot_y="68" height="110" type="element" ic="true" orientation="dyyy">
+<definition width="100" version="0.4" hotspot_x="39" hotspot_y="68" height="110" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">ducha</name>
+        <name lang="en">Douche</name>
+        <name lang="fr">Douche</name>
+        <name lang="es">Ducha</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -38,8 +40,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-46.9061" x1="-0.9" y2="-43.8231" x2="-0.9"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59.855" x1="-2.2" y2="-56.0712" x2="-2.2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59.855" x1="3" y2="-56.0712" x2="3"/>
-        <text x="3" y="8" size="4" text="Ducha"/>
-        <terminal x="0.4" y="-61.1162" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="19.9" y="-61.1162" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-3" y="11" size="4" rotate="true" text="Ducha" tagg="none"/>
+        <terminal x="0.4" y="-61.1162" orientation="n"/>
+        <terminal x="19.9" y="-61.1162" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/fregadero.elmt b/elements/12energie/eaux/grifo-aparatos/fregadero.elmt
index 55b87228c..b330874cc 100644
--- a/elements/12energie/eaux/grifo-aparatos/fregadero.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/fregadero.elmt
@@ -1,5 +1,7 @@
-<definition width="130" version="0.4" hotspot_x="49" hotspot_y="35" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="130" version="0.4" hotspot_x="49" hotspot_y="39" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sink 2</name>
+        <name lang="fr">Evier 2</name>
         <name lang="es">Fregadero 2senos</name>
     </names>
     <informations>Rafael Ferrando.
@@ -39,8 +41,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <arc width="13.2" x="-41.4" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
         <rect width="122.4" x="-45" y="-19" antialias="false" height="42" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.2" x1="45" y2="-9.2" x2="71.4"/>
-        <text x="-24" y="31" size="4" text="Fregadero 2senos"/>
-        <terminal x="-14" y="-31" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="11" y="-31" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-11" y="31" size="4" rotate="true" text="Fregadero 2senos" tagg="none"/>
+        <terminal x="-14" y="-31" orientation="n"/>
+        <terminal x="11" y="-31" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/fregadero1.elmt b/elements/12energie/eaux/grifo-aparatos/fregadero1.elmt
index 13bbfafcd..5e81a5339 100644
--- a/elements/12energie/eaux/grifo-aparatos/fregadero1.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/fregadero1.elmt
@@ -1,5 +1,7 @@
-<definition width="100" version="0.4" hotspot_x="38" hotspot_y="35" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="100" version="0.4" hotspot_x="38" hotspot_y="39" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sink </name>
+        <name lang="fr">Evier</name>
         <name lang="es">Fregadero 1seno</name>
     </names>
     <informations>Rafael Ferrando.
@@ -38,8 +40,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <arc width="13.2" x="-28.4" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
         <rect width="90.4" x="-33" y="-19" antialias="false" height="42" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11.2" x1="27" y2="-11.2" x2="53.4"/>
-        <text x="-20" y="30" size="4" text="Fregadero 1 seno"/>
-        <terminal x="-14" y="-31" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="11" y="-31" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-7" y="27" size="4" rotate="true" text="Fregadero 1 seno" tagg="none"/>
+        <terminal x="-14" y="-31" orientation="n"/>
+        <terminal x="11" y="-31" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/grifo-lavabo.elmt b/elements/12energie/eaux/grifo-aparatos/grifo-lavabo.elmt
index 225f2f9fa..03979cacb 100644
--- a/elements/12energie/eaux/grifo-aparatos/grifo-lavabo.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/grifo-lavabo.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="21" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="20" hotspot_y="21" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Bathroom Sink Faucets</name>
+        <name lang="fr">Robinets de salle de bains évier</name>
         <name lang="es">Grifo Lavabo</name>
     </names>
     <informations>Rafael Ferrando.
@@ -30,7 +32,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="3.7485" x="-13.149" y="-6.50463" antialias="false" height="2.90914" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <ellipse width="3.3075" x="-13.3695" y="14.3883" antialias="true" height="3.43808" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-13.7333" x2="-9.5769" x3="-7.5704" x4="-9.7202" antialias="false" x5="-13.7333" x6="-15.795" x7="-13.8767" x8="-13.8767" closed="false" y1="19.6777" y2="19.6777" y3="15.9704" y4="12.068" y5="12.068" y6="15.9704" y7="19.6777" y8="19.6777"/>
-        <terminal x="-9.15" y="30.1891" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="8.6" y="30.1891" nameHidden="1" number="" name="" orientation="e"/>
+        <terminal x="-9.15" y="30.1891" orientation="w"/>
+        <terminal x="8.6" y="30.1891" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/grifo-lavabo1.elmt b/elements/12energie/eaux/grifo-aparatos/grifo-lavabo1.elmt
index 2f72c236f..fe4de1025 100644
--- a/elements/12energie/eaux/grifo-aparatos/grifo-lavabo1.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/grifo-lavabo1.elmt
@@ -1,5 +1,7 @@
-<definition width="50" version="0.4" hotspot_x="14" hotspot_y="24" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="14" hotspot_y="24" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sink faucet</name>
+        <name lang="fr">Robinet lavabo</name>
         <name lang="es">Grifo lavabo latig</name>
     </names>
     <informations>Rafael Ferrando.
@@ -14,20 +16,20 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="10.85" x="-6.4" y="-13.0108" antialias="false" height="19.0145" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="19.6" x="-11.3" y="7.2109" antialias="false" height="0.603635" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.2836" x1="6.06067" y2="19.2836" x2="7.34261"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.25812" x1="4.45" y2="-16.6326" x2="25.45"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.25812" x1="4.45" y2="-16.6326" x2="25.45"/>
         <arc width="8.4" x="1.3" y="4.49458" antialias="true" height="15.3927" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16.6326" x1="34.2" y2="-16.6326" x2="25.45"/>
         <rect width="1.75" x="5.85" y="18.3782" antialias="false" height="3.62181" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.1851" x1="34.2" y2="-16.338" x2="34.2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21.0945" x1="6.06067" y2="21.0945" x2="7.34261"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.58913" x1="4.45" y2="-13.9163" x2="26.15"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.58913" x1="4.45" y2="-13.9163" x2="26.15"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13.9163" x1="34.2" y2="-13.9163" x2="26.15"/>
         <rect width="5.95" x="27.2" y="-13.9163" antialias="false" height="1.81091" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="7.35" x="-4.3" y="-14.2181" antialias="false" height="1.20727" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5199" x1="-3.25" y2="-17.5381" x2="-1.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.5381" x1="-1.5" y2="-20.5563" x2="13.2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.5381" x1="-1.5" y2="-20.5563" x2="13.2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5199" x1="2.35" y2="-16.6326" x2="2.35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16.6326" x1="2.35" y2="-19.6508" x2="13.2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16.6326" x1="2.35" y2="-19.6508" x2="13.2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20.2545" x1="13.2" y2="-19.6508" x2="13.2"/>
         <arc width="8.4" x="-10.6" y="4.49458" antialias="true" height="15.3927" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <rect width="1.75" x="-8.15" y="18.3782" antialias="false" height="3.62181" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
@@ -35,7 +37,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.2109" x1="-8.5" y2="6.00367" x2="-6.4"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.00367" x1="4.45" y2="7.2109" x2="6.55"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.04" x1="1.3" y2="8.1164" x2="1.3"/>
-        <terminal x="-8.15" y="20.1891" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="7.6" y="20.1891" nameHidden="1" number="" name="" orientation="e"/>
+        <terminal x="-8.15" y="20.1891" orientation="w"/>
+        <terminal x="7.6" y="20.1891" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/grifo-manguera.elmt b/elements/12energie/eaux/grifo-aparatos/grifo-manguera.elmt
index 9bb3dfc3e..59c4450ab 100644
--- a/elements/12energie/eaux/grifo-aparatos/grifo-manguera.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/grifo-manguera.elmt
@@ -1,8 +1,10 @@
-<definition width="70" version="0.4" hotspot_x="29" hotspot_y="21" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="29" hotspot_y="21" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sink hose</name>
+        <name lang="fr">Robinet </name>
         <name lang="es">Grifo-manguera</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <arc width="24" x="11" y="-4" antialias="true" height="27" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.90151" x1="8.9243" y2="-2.90151" x2="12.4862"/>
@@ -29,9 +31,9 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11.6389" x1="2.7" y2="-9.67169" x2="2.7"/>
         <arc width="8" x="19" y="5" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
         <rect width="14" x="24" y="9" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="35" y5="11" x5="35" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="11" x1="27" y2="21" x2="28" y3="21" x3="34" y4="11"/>
+        <polygon x4="35" y5="11" x5="35" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="11" x1="27" y2="21" x2="28" y3="21" x3="34" y4="11"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" x1="28" y2="14" x2="34"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="18" x1="28" y2="18" x2="34"/>
-        <terminal x="-23.9" y="0.667065" nameHidden="0" number="" name="" orientation="w"/>
+        <terminal x="-23.9" y="0.667065" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/inodoro.elmt b/elements/12energie/eaux/grifo-aparatos/inodoro.elmt
index b567168d6..831eed10f 100644
--- a/elements/12energie/eaux/grifo-aparatos/inodoro.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/inodoro.elmt
@@ -1,5 +1,7 @@
-<definition width="70" version="0.4" hotspot_x="36" hotspot_y="13" height="100" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="36" hotspot_y="13" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">toilet tank</name>
+        <name lang="fr">WC</name>
         <name lang="es">Inodoro tanque</name>
     </names>
     <informations>Rafael Ferrando.
@@ -20,7 +22,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.55" x1="25.5528" y2="7.85" x2="28.2211"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.2" x1="-2.01978" y2="0.2" x2="5.09573"/>
         <ellipse width="0.889438" x="-7.35641" y="15.5" antialias="true" height="0.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-3.79866" y="58" size="3" text="Inodoro"/>
-        <terminal x="-30.4818" y="0.2" nameHidden="1" number="" name="" orientation="w"/>
+        <input x="-11" y="60" size="4" rotate="true" text="Inodoro" tagg="none"/>
+        <terminal x="-30.4818" y="0.2" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/lavabo.elmt b/elements/12energie/eaux/grifo-aparatos/lavabo.elmt
index abea54dd5..88f3b5d95 100644
--- a/elements/12energie/eaux/grifo-aparatos/lavabo.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/lavabo.elmt
@@ -1,5 +1,7 @@
-<definition width="90" version="0.4" hotspot_x="44" hotspot_y="41" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="90" version="0.4" hotspot_x="44" hotspot_y="41" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">sink</name>
+        <name lang="fr">Lavabo1</name>
         <name lang="es">Lavabo1</name>
     </names>
     <informations>Rafael Ferrando.
@@ -22,12 +24,12 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="4" y2="-29" x2="9"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="4" y2="-24" x2="9"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-30" y2="-2" x2="-39"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="30" y2="-2" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-30" y2="-2" x2="-39"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="30" y2="-2" x2="40"/>
         <arc width="79" x="-39" y="-26" antialias="true" height="49" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <ellipse width="67" x="-33" y="-17" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-14" y="12" size="4" text="Lavabo"/>
-        <terminal x="-8" y="-34" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="8" y="-34" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-13" y="10" size="4" rotate="true" text="Lavabo" tagg="none"/>
+        <terminal x="-8" y="-34" orientation="n"/>
+        <terminal x="8" y="-34" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/lavadero.elmt b/elements/12energie/eaux/grifo-aparatos/lavadero.elmt
index 91785e0e9..4eff5ce37 100644
--- a/elements/12energie/eaux/grifo-aparatos/lavadero.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/lavadero.elmt
@@ -1,5 +1,7 @@
-<definition width="80" version="0.4" hotspot_x="40" hotspot_y="42" height="110" type="element" ic="true" orientation="dyyy">
+<definition width="80" version="0.4" hotspot_x="40" hotspot_y="42" height="110" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Laundry</name>
+        <name lang="fr">Evier</name>
         <name lang="es">Lavadero</name>
     </names>
     <informations>Rafael Ferrando.
@@ -33,8 +35,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.1976" x1="31" y2="57.1308" x2="31"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-28.9606" y2="21" x2="30.9574"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="-25" y2="29" x2="26"/>
-        <text x="-20" y="17" size="4" text="Lavadero"/>
-        <terminal x="-8" y="-34" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="8" y="-34" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-16" y="13" size="4" rotate="true" text="Lavadero" tagg="none"/>
+        <terminal x="-8" y="-34" orientation="n"/>
+        <terminal x="8" y="-34" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/lavadora.elmt b/elements/12energie/eaux/grifo-aparatos/lavadora.elmt
index 2658ccd5e..7f377a994 100644
--- a/elements/12energie/eaux/grifo-aparatos/lavadora.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/lavadora.elmt
@@ -1,5 +1,7 @@
-<definition width="100" version="0.4" hotspot_x="44" hotspot_y="56" height="100" type="element" ic="true" orientation="dyyy">
+<definition width="100" version="0.4" hotspot_x="44" hotspot_y="56" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Washing machine</name>
+        <name lang="fr">Lave linge</name>
         <name lang="es">Lavadora</name>
     </names>
     <informations>Rafael Ferrando.
@@ -23,7 +25,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <ellipse width="37.1726" x="-18.4141" y="-16.1311" antialias="true" height="34.3052" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <ellipse width="48.1209" x="-24.052" y="-20.7568" antialias="true" height="44.2086" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="3.98278" x="24.0689" y="-2.93678" antialias="false" height="5.27772" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-34" y="27" size="4" text="Lavadora"/>
-        <terminal x="49" y="11" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-29" y="30" size="4" rotate="true" text="Lavadora" tagg="none"/>
+        <terminal x="49" y="11" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/lavavajillas.elmt b/elements/12energie/eaux/grifo-aparatos/lavavajillas.elmt
index c228d8287..8833ccb4e 100644
--- a/elements/12energie/eaux/grifo-aparatos/lavavajillas.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/lavavajillas.elmt
@@ -1,5 +1,7 @@
-<definition width="100" version="0.4" hotspot_x="44" hotspot_y="61" height="100" type="element" ic="true" orientation="dyyy">
+<definition width="100" version="0.4" hotspot_x="44" hotspot_y="61" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Dishwasher</name>
+        <name lang="fr">Lave-vaisselle</name>
         <name lang="es">Lavavajillas</name>
     </names>
     <informations>Rafael Ferrando.
@@ -15,9 +17,9 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="79.6556" x="-39.6556" y="-34.9643" antialias="false" height="69.2493" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-54" x1="-39" y2="-54" x2="40"/>
         <circle x="9" y="-44" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <text x="-25" y="-16" size="4" text="Lavavajillas"/>
         <arc width="15" x="33" y="-13" antialias="true" height="41" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <rect width="4" x="47" y="5" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="49" y="7" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-17" y="-9" size="4" rotate="true" text="Lavavajillas" tagg="none"/>
+        <terminal x="49" y="7" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/manguera.elmt b/elements/12energie/eaux/grifo-aparatos/manguera.elmt
index 34ead688e..157c6f8f7 100644
--- a/elements/12energie/eaux/grifo-aparatos/manguera.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/manguera.elmt
@@ -1,5 +1,7 @@
-<definition width="60" version="0.4" hotspot_x="36" hotspot_y="15" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="36" hotspot_y="15" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Hose irrigation</name>
+        <name lang="fr">Tuyau d'arrosage</name>
         <name lang="es">Manguera riego</name>
     </names>
     <informations>Rafael Ferrando.
@@ -13,13 +15,13 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="4.0725" x="-24.4725" y="-8.25753" antialias="false" height="9.69441" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="54" x="-33" y="-4.25" antialias="true" height="24.75" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <arc width="35.1" x="-24.9" y="2.5" antialias="true" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-270"/>
-        <polygon x4="11.1" y5="11.5" x5="11.1" y6="11.5" x6="11.1" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="11.5" x1="11.1" y2="11.5" x2="7.5" y3="20.5" x3="9.3" y4="12.25"/>
+        <polygon x4="11.1" y5="11.5" x5="11.1" y6="11.5" x6="11.1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="11.5" x1="11.1" y2="11.5" x2="7.5" y3="20.5" x3="9.3" y4="12.25"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.5" x1="-17.7" y2="-9.5" x2="-12.3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.5" x1="-12.3" y2="-11" x2="-9.6"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.5" x1="-12.3" y2="-11" x2="-9.6"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-9.744" y2="-11" x2="-5.844"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.25" x1="-15" y2="-10.25" x2="-14.1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.02606" x1="-24.2767" y2="-5.02606" x2="-21.0696"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.79459" x1="-24.2767" y2="-1.79459" x2="-21.0696"/>
-        <terminal x="-24.9" y="-3.5" nameHidden="110" number="" name="" orientation="w"/>
+        <terminal x="-24.9" y="-3.5" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/termo-electrico.elmt b/elements/12energie/eaux/grifo-aparatos/termo-electrico.elmt
index b396329f2..6fe890a94 100644
--- a/elements/12energie/eaux/grifo-aparatos/termo-electrico.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/termo-electrico.elmt
@@ -1,5 +1,7 @@
-<definition width="50" version="0.4" hotspot_x="29" hotspot_y="34" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="29" hotspot_y="34" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">thermo Electric</name>
+        <name lang="fr">Ballon eau chaude</name>
         <name lang="es">Termo Electrico</name>
     </names>
     <informations>Rafael Ferrando.
@@ -31,7 +33,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36.8095" x1="4.88" y2="38.4249" x2="5.72"/>
         <rect width="4.158" x="-27" y="-5.19046" antialias="false" height="6.46153" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <ellipse width="1.848" x="-25.614" y="-2.36352" antialias="true" height="1.21154" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="9.5" y="40.4441" nameHidden="1" number="" name="" orientation="s"/>
-        <terminal x="-20.08" y="40.0403" nameHidden="1" number="" name="" orientation="s"/>
+        <terminal x="9.5" y="40.4441" orientation="s"/>
+        <terminal x="-20.08" y="40.0403" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/grifo-aparatos/vertedero.elmt b/elements/12energie/eaux/grifo-aparatos/vertedero.elmt
index 3bec3137b..1f41411a8 100644
--- a/elements/12energie/eaux/grifo-aparatos/vertedero.elmt
+++ b/elements/12energie/eaux/grifo-aparatos/vertedero.elmt
@@ -1,5 +1,7 @@
-<definition width="70" version="0.4" hotspot_x="35" hotspot_y="37" height="90" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="35" hotspot_y="37" height="90" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sink</name>
+        <name lang="fr">Evier</name>
         <name lang="es">Vertedero</name>
     </names>
     <informations>Rafael Ferrando.
@@ -27,8 +29,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15.6136" x1="-27.4286" y2="42.7064" x2="-27.4286"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="43.7" x1="27.3857" y2="43.7" x2="-27.4113"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15.6136" x1="27.4044" y2="42.7064" x2="27.4044"/>
-        <text x="-20.2374" y="21.2" size="4" text="Vertedero"/>
-        <terminal x="-7.65275" y="-29.2" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="6.72967" y="-29.2" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-15" y="22" size="4" rotate="true" text="Vertedero" tagg="none"/>
+        <terminal x="-7.65275" y="-29.2" orientation="n"/>
+        <terminal x="6.72967" y="-29.2" orientation="n"/>
     </description>
 </definition>