[qet] qet/qet: [5921] Remove some duplicate elements and organize elements, thanks S.DEFFAUX

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 5921
Author:   scorpio810
Date:     2019-06-15 23:18:41 +0200 (Sat, 15 Jun 2019)
Log Message:
-----------
Remove some duplicate elements and organize elements, thanks S.DEFFAUX

Modified Paths:
--------------
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/qet_directory
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory
    trunk/elements/60_energy/31_solar_thermal/vanne/qet_directory

Added Paths:
-----------
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/calentador-gas.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/deposito-gasoil.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/aerotermo2.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro2.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/alimentation_auto.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars_mano.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-dmf.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-gmf.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/nicoll_ch6.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/qet_directory
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-40/nic_ch4.elmt
    trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois.elmt
    trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_fioul.elmt
    trunk/elements/60_energy/31_solar_thermal/productions/vase_ferme.elmt

Removed Paths:
-------------
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/acs-viv-retorno.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/brida-pn10-rosca1m.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-gasoil.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/bobine2.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_continuite.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_finale.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple_nf.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/foot_no_nc.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_n.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_p.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_1pn.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_3pn.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circu-doble-bridas.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circul-bridas.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-agua-vert.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-circuladora.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-horiz1.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-pozo.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/calentador-gas.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/inodoro2.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termo-electrico.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon-2placas.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon1placa.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-viv-retorno.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-vivienda.elmt
    trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/aerotermo.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/chaufferie/
    trunk/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-dmf.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-gmf.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nic_ch4.elmt
    trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nicoll_ch6.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,29 @@
+<definition width="50" height="50" link_type="simple" hotspot_x="24" hotspot_y="38" version="0.4" type="element" orientation="dyyy">
+<uuid uuid="{5800DED3-2E1A-4627-A625-76702EA0E189}"/><names>
+        <name lang="es">Bomba circuladora c/bridas</name>
+	<name lang="en">Circulating w/flanges pump</name>
+        <name lang="ca">Bomba circuladora brides</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect width="1" height="17.5307" antialias="false" y="-9.0473" x="-18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x1="-9.75" y3="-34.9828" antialias="false" closed="false" x2="-7.25" y5="-8" y4="-10.2506" y2="-34.9828" x5="11.5" x4="11.5" y1="-8.70488" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="9"/>
+        <rect width="5" height="5.76534" antialias="false" y="-3.16467" x="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="1" height="17.5307" antialias="false" y="-9.04734" x="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="-4.75" length2="1.5" antialias="false" end1="none" x2="-6" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line x1="6.5" length2="1.5" antialias="false" end1="none" x2="9" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line x1="4" length2="1.5" antialias="false" end1="none" x2="5.25" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <rect width="5" height="5.76534" antialias="false" y="-3.16467" x="-17.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="-1" length2="1.5" antialias="false" end1="none" x2="-2.25" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <rect width="3.75" height="4.324" antialias="false" y="-30.55" x="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x1="-7.25" length2="1.5" antialias="false" end1="none" x2="9" length1="1.5" end2="none" y2="-30.55" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line x1="-9.75" length2="1.5" antialias="false" end1="none" x2="11.5" length1="1.5" end2="none" y2="-11.8127" y1="-11.8127" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <polygon closed="false" antialias="false" x6="14" y3="5.48333" y4="4.04199" y6="-3.16467" y8="-8.93001" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5.48333" x2="-6" x7="12.75" y10="2.60066" x5="14" y1="2.60066" x3="7.75" x8="-9.75" x1="-12.25" x4="10.25" x9="-12.25" y5="2.60066" y9="-6.04734" x10="-12.25" y7="-8.93001"/>
+        <polygon x1="4.75" y3="-29.226" antialias="false" closed="false" x2="3.5" y5="-23.4607" y4="-23.4607" y2="-26.3433" x5="4.75" x4="4.75" y1="-30.6673" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="6"/>
+        <input y="13.4107" text="_" tagg="label" size="4" x="-8.5" rotate="true"/>
+        <terminal y="0" orientation="w" x="-19"/>
+        <terminal y="0" orientation="e" x="20"/>
+        <terminal y="-29.1087" orientation="e" x="14"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,46 @@
+<definition width="40" hotspot_y="41" hotspot_x="24" type="element" orientation="dyyy" version="0.5" link_type="simple" height="70">
+<uuid uuid="{23206DDD-497C-49AE-BFEB-5FBA86C5E680}"/><names>
+        <name lang="es">Bomba de agua vertical</name>
+	<name lang="en">Vertical water pump</name>
+        <name lang="ca">Bomba aigua  vertical</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <line y1="-12.4386" end1="none" x1="-5.95" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-5.95" antialias="false" y2="21.5796" length2="1.5"/>
+        <line y1="-2.68695" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="-2.68695" length2="1.5"/>
+        <line y1="-12.4386" end1="none" x1="0.55" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="0.55" antialias="false" y2="21.5796" length2="1.5"/>
+        <line y1="4.56986" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="4.56986" length2="1.5"/>
+        <line y1="17.7641" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="17.7641" length2="1.5"/>
+        <line y1="-18.52" end1="none" x1="-12.515" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="0.68" antialias="false" y2="-18.52" length2="1.5"/>
+        <line y1="-31.7142" end1="none" x1="0.225" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="0.225" antialias="false" y2="-18.52" length2="1.5"/>
+        <line y1="-31.7142" end1="none" x1="-0.9125" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-0.9125" antialias="false" y2="-18.52" length2="1.5"/>
+        <line y1="-31.7142" end1="none" x1="-7.7375" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-7.7375" antialias="false" y2="-18.52" length2="1.5"/>
+        <line y1="-31.7142" end1="none" x1="-4.325" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-4.325" antialias="false" y2="-18.52" length2="1.5"/>
+        <line y1="11.8267" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="11.8267" length2="1.5"/>
+        <line y1="-31.7142" end1="none" x1="-9.785" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-9.785" antialias="false" y2="-18.52" length2="1.5"/>
+        <rect width="2.37439" y="-11.3907" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="6.38746" antialias="false" height="5.05146"/>
+        <rect width="3.73118" y="-12.081" style="line-style:normal;line-weight:normal;filling:none;color:black" x="5.03084" antialias="false" height="6.43198"/>
+        <rect width="1.35679" y="-14.2459" style="line-style:normal;line-weight:normal;filling:none;color:black" x="3.67416" antialias="false" height="11.0442"/>
+        <rect width="2.37439" y="16.9768" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="6.38746" antialias="false" height="5.05146"/>
+        <rect width="3.73118" y="16.2865" style="line-style:normal;line-weight:normal;filling:none;color:black" x="5.03084" antialias="false" height="6.43198"/>
+        <rect width="1.35679" y="14.1216" style="line-style:normal;line-weight:normal;filling:none;color:black" x="3.67416" antialias="false" height="11.0442"/>
+        <rect width="19.5" y="-14.5617" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-15.7" antialias="false" height="40.2423"/>
+        <rect width="31.2" y="25.6806" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-21.55" antialias="false" height="1.31942"/>
+        <line y1="-9.94376" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="-9.94376" length2="1.5"/>
+        <rect width="13.65" y="-35.6724" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.515" antialias="false" height="21.1107"/>
+        <arc width="13.65" angle="-180" y="-38.971" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.515" start="-180" antialias="true" height="6.5971"/>
+        <line y1="-31.7142" end1="none" x1="-12.515" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="0.68" antialias="false" y2="-31.7142" length2="1.5"/>
+        <line y1="-31.7142" end1="none" x1="-11.15" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-11.15" antialias="false" y2="-18.52" length2="1.5"/>
+        <rect width="3.185" y="-29.7351" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-15.7" antialias="false" height="7.91652"/>
+        <rect width="1.365" y="-21.8185" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14.79" antialias="false" height="1.31942"/>
+        <line y1="-11.8107" end1="none" x1="-11.8" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-11.8" antialias="false" y2="21.6113" length2="1.5"/>
+        <rect width="19.5" y="-14.5617" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-15.7" antialias="false" height="1.97913"/>
+        <rect width="19.5" y="21.7223" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-15.7" antialias="false" height="3.95826"/>
+        <line y1="-29.7351" end1="none" x1="-14.79" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-14.79" antialias="false" y2="-22.4782" length2="1.5"/>
+        <input size="4" text="_" y="3" tagg="label" x="-29" rotate="true"/>
+        <terminal y="20" orientation="e" x="10"/>
+        <terminal y="-10" orientation="e" x="10"/>
+        <terminal y="-30" orientation="w" x="-20"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,44 @@
+<definition width="90" hotspot_y="26" hotspot_x="25" type="element" orientation="dyyy" version="0.5" link_type="simple" height="50">
+<uuid uuid="{0C893A73-1766-48F2-BA19-B0C28E3D60B0}"/><names>
+        <name lang="es">Bomba agua horiz-1</name>
+	<name lang="en">Horizontal pump 1</name>
+        <name lang="ca">Bomba aigua horiz-1</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <arc width="8.61045" angle="-180" y="-16.0243" style="line-style:normal;line-weight:normal;filling:none;color:black" x="42.191" start="90" antialias="true" height="34.0577"/>
+        <arc width="6.26213" angle="-180" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.1445" start="90" antialias="true" height="25.6434"/>
+        <rect width="2.73967" y="-1.49057" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="53.541" antialias="false" height="5.86449"/>
+        <rect width="7.43623" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="22.2307" antialias="false" height="25.6434"/>
+        <rect width="34.833" y="-10.8155" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.6023" antialias="false" height="23.2394"/>
+        <rect width="15.6553" y="-16.425" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-1.25219" antialias="false" height="5.60951"/>
+        <rect width="7.43623" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-20.0385" antialias="false" height="25.6434"/>
+        <line y1="-9.21276" end1="none" x1="-12.2821" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9166" antialias="false" y2="-9.21276" length2="1.5"/>
+        <line y1="-6.408" end1="none" x1="-12.2821" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9166" antialias="false" y2="-6.408" length2="1.5"/>
+        <line y1="0.804232" end1="none" x1="-12.2821" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9166" antialias="false" y2="0.804232" length2="1.5"/>
+        <line y1="10.8212" end1="none" x1="-12.2918" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.5356" antialias="false" y2="10.8212" length2="1.5"/>
+        <line y1="8.41714" end1="none" x1="-12.2866" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9213" antialias="false" y2="8.41714" length2="1.5"/>
+        <line y1="4.81102" end1="none" x1="-12.2814" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="22.3072" antialias="false" y2="4.81102" length2="1.5"/>
+        <line y1="-3.60323" end1="none" x1="-12.2858" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9205" antialias="false" y2="-3.60323" length2="1.5"/>
+        <line y1="-15.2229" end1="none" x1="-1.25219" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="14.4031" antialias="false" y2="-15.2229" length2="1.5"/>
+        <rect width="8.03955" y="-19.6304" style="line-style:normal;line-weight:normal;filling:none;color:black" x="37.9936" antialias="false" height="3.60612"/>
+        <rect width="5.3052" y="-2.29192" style="line-style:normal;line-weight:normal;filling:none;color:black" x="51.9757" antialias="false" height="7.4672"/>
+        <rect width="2.34829" y="-14.4216" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-3.60048" antialias="false" height="2.0034"/>
+        <line y1="-16.0243" end1="none" x1="37.886" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="46.1052" antialias="false" y2="-16.0243" length2="1.5"/>
+        <line y1="18.0335" end1="none" x1="37.886" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="46.1052" antialias="false" y2="18.0335" length2="1.5"/>
+        <rect width="6.474" y="-19.6304" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="38.7766" antialias="false" height="2.80476"/>
+        <arc width="6.26213" angle="-180" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-22.7782" start="-90" antialias="true" height="25.6434"/>
+        <line y1="-1.59984" end1="none" x1="32.4066" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="33.1893" antialias="false" y2="-1.59984" length2="1.5"/>
+        <line y1="6.41374" end1="none" x1="32.0152" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="33.5808" antialias="false" y2="6.41374" length2="1.5"/>
+        <rect width="1.56553" y="-4.8053" style="line-style:normal;line-weight:normal;filling:none;color:black" x="50.4102" antialias="false" height="12.8218"/>
+        <input size="4" text="_" y="25" tagg="label" x="0" rotate="true"/>
+        <rect width="3" y="-16" style="line-style:normal;line-weight:normal;filling:none;color:black" x="37" antialias="false" height="34"/>
+        <rect width="3" y="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x="34" antialias="false" height="10"/>
+        <polygon y7="18" y1="18" x3="30" y4="20" x5="47" x4="47" x7="47" x1="37" y6="18" y5="18" closed="false" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" x6="47" antialias="false" y2="18"/>
+        <polygon x5="-13" x8="-14" x9="-14" closed="false" y1="13.6844" x3="-22" y9="13.6844" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17.4738" antialias="false" x4="-22" y6="13.6844" y7="13.6844" y4="20" y3="17.4738" x7="-14" x1="-15" y5="20" x2="-15" x6="-13" y8="13.6844"/>
+        <terminal y="-20" orientation="n" x="41"/>
+        <terminal y="0" orientation="e" x="60"/>
+        <terminal y="-18" orientation="n" x="-3"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,43 @@
+<definition link_type="simple" hotspot_x="11" orientation="dyyy" hotspot_y="55" version="0.5" type="element" height="90" width="20">
+<uuid uuid="{3ECAC576-C727-47E3-B9A7-D593D1D124CD}"/><names>
+        <name lang="es">Bomba pozo sumergida</name>
+	<name lang="en">Submerged waterhole pump</name>
+        <name lang="ca">Bomba pozo sumergida</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <polygon antialias="false" y1="-21.5486" closed="false" y2="-25.1956" y3="-25.1956" y4="-21.5486" y5="-19.725" y6="-19.725" x1="-5.82471" y7="-21.5486" x2="-2.84418" y8="-21.5486" x3="3.11686" y9="-21.5486" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
+        <line x1="1.6266" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9.925" y2="-7.225"/>
+        <line x1="-4.33445" length1="1.5" x2="0.136339" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4.525" y2="-8.575"/>
+        <polygon antialias="false" y1="-27.2986" closed="false" y2="-30.9456" y3="-30.9456" y4="-27.2986" y5="-25.475" y6="-25.475" x1="-5.82471" y7="-27.2986" x2="-2.84418" y8="-27.2986" x3="3.11686" y9="-27.2986" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
+        <line x1="-5.82471" length1="1.5" x2="0.136339" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-7.225" y2="-3.175"/>
+        <line x1="-2.84418" length1="1.5" x2="4.60712" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.175" y2="-9.925"/>
+        <polygon antialias="false" y1="-15.7986" closed="false" y2="-19.4456" y3="-19.4456" y4="-15.7986" y5="-13.975" y6="-13.975" x1="-5.82471" y7="-15.7986" x2="-2.84418" y8="-15.7986" x3="3.11686" y9="-15.7986" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
+        <line x1="1.6266" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4.525" y2="-8.575"/>
+        <line x1="-4.33445" length1="1.5" x2="3.11686" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8.575" y2="-3.175"/>
+        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-21.75" y2="-21.75"/>
+        <line x1="0.28034" length1="1.5" x2="0.28034" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
+        <polygon antialias="false" y1="-33.0486" closed="false" y2="-36.6956" y3="-36.6956" y4="-33.0486" y5="-31.225" y6="-31.225" x1="-5.82471" y7="-33.0486" x2="-2.84418" y8="-33.0486" x3="3.11686" y9="-33.0486" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
+        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-33.25" y2="-33.25"/>
+        <line x1="4.96674" length1="1.5" x2="4.96674" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
+        <line x1="-2.84392" length1="1.5" x2="-2.84392" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
+        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-27.5" y2="-27.5"/>
+        <line x1="2.62354" length1="1.5" x2="2.62354" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
+        <line x1="-4.40605" length1="1.5" x2="-4.40605" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
+        <rect antialias="false" x="-5.82471" y="-9.925" height="40.5" style="line-style:normal;line-weight:normal;filling:none;color:black" width="11.9221"/>
+        <rect antialias="false" x="-2.84418" y="30.575" height="2.7" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5.96105"/>
+        <line x1="-5.82471" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.175" y2="-3.175"/>
+        <line x1="-5.82471" length1="1.5" x2="-1.35392" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5.875" y2="-9.925"/>
+        <line x1="-2.84418" length1="1.5" x2="4.60712" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9.925" y2="-4.525"/>
+        <polygon antialias="false" y1="-11.275" closed="false" y2="-13.975" y3="-13.975" y4="-11.275" y5="-9.925" y6="-9.925" x1="-5.82471" y7="-11.275" x2="-2.84418" y8="-11.275" x3="3.11686" y9="-11.275" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
+        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" y2="-16"/>
+        <rect antialias="false" x="-5.82471" y="-43.375" height="6.75" style="line-style:normal;line-weight:normal;filling:none;color:black" width="11.9221"/>
+        <rect antialias="false" x="-7.31497" y="-43.675" height="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="1.49026"/>
+        <rect antialias="false" x="-2.84418" y="-48.775" height="5.4" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5.96105"/>
+        <input text="_" x="4.60712" tagg="label" y="14.375" rotate="true" size="4"/>
+        <polygon x1="-7" y4="-10" x2="-7" y5="-10" antialias="false" x3="-6" y6="-10" x4="-6" x5="-6" x6="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-42" y2="-12" closed="false" y3="-10"/>
+        <terminal orientation="n" x="-7" y="-42"/>
+        <terminal orientation="n" x="0.136339" y="-50.125"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/calentador-gas.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/calentador-gas.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/calentador-gas.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,40 @@
+<definition width="50" version="0.4" hotspot_x="24" hotspot_y="34" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
+<uuid uuid="{C94FF8DF-CD8A-4A8A-A115-18AFE817A84C}"/><names>
+        <name lang="es">Calentador ACS-gas</name>
+	<name lang="en">DHW-gas boiler</name>
+        <name lang="ca">Escalfador ACS-gas</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <arc width="10.1049" x="0.353766" y="11.9242" antialias="true" height="7.21036" 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:thin;filling:none;color:black" y1="28.1476" x1="8.1886" y2="27.697" x2="12.3224"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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.0489" x1="-13.09" y2="28.5983" 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.0489" x1="8.1886" y2="28.5983" x2="12.3224"/>
+        <ellipse width="1.83726" x="-10.2105" y="15.5294" antialias="true" height="1.35194" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
+        <rect width="0.918628" x="-5.61731" y="15.0788" antialias="false" height="1.8026" 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="26.345" x1="17.0039" y2="29.9502" x2="17.0039"/>
+        <rect width="29.3961" x="-14.3443" y="21.3879" antialias="false" height="3.15453" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="6.43039" x="2.65034" y="12.8255" antialias="true" height="5.40777" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="9.64559" x="-4.23937" y="5.06584" antialias="false" height="2.8026" 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="15.5294" x1="5.86553" y2="13.7269" x2="8.1621"/>
+        <arc width="8.26765" x="1.73171" y="11.9242" antialias="true" height="7.21036" 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="-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"/>
+        <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"/>
+        <input x="-18" y="-10" size="4" rotate="true" text="calentador" tagg="label"/>
+        <terminal x="10.229" y="31.6757" orientation="s"/>
+        <terminal x="-10.7493" y="31.6757" orientation="s"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/deposito-gasoil.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/deposito-gasoil.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/deposito-gasoil.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,24 @@
+<definition hotspot_x="14" hotspot_y="22" width="30" type="element" version="0.5" height="50" link_type="simple" orientation="dyyy">
+<uuid uuid="{25DD5360-7BDF-4491-A82F-4E2D5EE8B8D2}"/><names>
+        <name lang="ca">Dipòsit gasoil 1000L</name>
+        <name lang="es">Depósito gasoil 1000L</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7" width="20" antialias="false" height="30" x="-11"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="3" antialias="false" height="2" x="-8"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14" width="7" antialias="false" height="5" x="-10"/>
+        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-8" y2="-12" end1="none" x1="-6" y1="-10" length1="1.5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="3" antialias="false" height="2" x="3"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-6" width="18" antialias="false" height="28" x="-10"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12" width="3" antialias="false" height="3" x="3"/>
+        <polygon y7="-13" x4="9" y3="-14" antialias="false" x3="3" y4="-17" x2="3" x1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="5" x7="6" y5="-16" x5="10" closed="false" y8="-12" y2="-12" x8="6" y6="-13" y1="-12"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11" width="3" antialias="false" height="1" x="6"/>
+        <arc style="line-style:normal;line-weight:thin;filling:none;color:black" y="-13" width="5" angle="-120" antialias="true" height="4" x="-9" start="-180"/>
+        <rect style="line-style:normal;line-weight:thin;filling:brun;color:black" y="3" width="18" antialias="false" height="19" x="-10"/>
+        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="4" y2="20" end1="none" x1="4" y1="-7" length1="1.5"/>
+        <input rotate="true" text="1000L" tagg="label" y="-1.5" x="-11" size="3"/>
+        <terminal y="-10" x="10" orientation="e"/>
+    </description>
+</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/acs-viv-retorno.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/acs-viv-retorno.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/acs-viv-retorno.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,24 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="9" hotspot_y="16" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F4AB313B-95E8-4987-810C-5A4CCE465C4C}"/><names>
-        <name lang="es">ACS +retorno a vivienda</name>
-        <name lang="en">DHW +return to house</name>
-        <name lang="ca">ACS +retorn a vivenda</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <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="-0.332274" x1="3.1904" y2="-0.332274" x2="16.6437"/>
-        <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.55405" x1="-4.63607" y2="-7.55405" x2="12.8224"/>
-        <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.55405" x1="13.4" y2="1.11208" x2="20.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="5.44515" x1="16.2" y2="-3.22099" x2="26"/>
-        <arc width="16.8" x="9.2" y="-8.99841" antialias="true" height="14.4436" style="line-style:normal;line-weight:normal;filling:none;color:black" start="10" angle="-110"/>
-        <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="-0.332274" x1="28.8" y2="4.00079" x2="38.6"/>
-        <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="8.33386" x1="20.4" y2="17" x2="24.6"/>
-        <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="5.44515" x1="26" y2="12.6669" x2="33"/>
-        <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="2.55644" x1="27.4" y2="6.88951" x2="33"/>
-        <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="6.88951" x1="23.2" y2="12.6669" x2="27.4"/>
-        <input x="16" y="-10" size="4" rotate="true" text="ACS" tagg="label"/>
-        <terminal x="-4.8" y="-7.55405" orientation="w"/>
-        <terminal x="-4.8" y="-0.332274" orientation="w"/>
-    </description>
-</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/aerotermo2.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/aerotermo2.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/aerotermo2.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,45 @@
+<definition width="80" version="0.4" hotspot_x="33" hotspot_y="23" height="70" link_type="simple" type="element" orientation="dyyy">
+<uuid uuid="{558C1F38-32E1-436B-B17E-FD53437348EC}"/><names>
+        <name lang="es">Aerotermo</name>
+        <name lang="ca">Aerotermo</name>
+        <name lang="en">air heater</name>
+        <name lang="fr">Aérotherme</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect width="7.2" x="-29.2" y="33.5166" antialias="false" height="2.43128" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="-18.4" y5="-7.00478" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-7.00478" x1="-18.4" y2="-2.95264" x2="-18.4" y3="-2.95264" x3="-15.7" y4="-7.00478"/>
+        <rect width="51.3" x="-18.4" y="-0.874707" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="-18.4" y5="-0.52136" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-0.52136" x1="-18.4" y2="3.53078" x2="-18.4" y3="3.53078" x3="-15.7" y4="-0.52136"/>
+        <polygon x4="-18.4" y5="5.96206" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="5.96206" x1="-18.4" y2="10.0142" x2="-18.4" y3="10.0142" x3="-15.7" y4="5.96206"/>
+        <polygon x4="-18.4" y5="25.4123" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="25.4123" x1="-18.4" y2="29.4644" x2="-18.4" y3="29.4644" x3="-15.7" y4="25.4123"/>
+        <polygon x4="-18.4" y5="12.4455" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="12.4455" x1="-18.4" y2="16.4976" x2="-18.4" y3="16.4976" x3="-15.7" y4="12.4455"/>
+        <polygon x4="-18.4" y5="18.9289" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="18.9289" x1="-18.4" y2="22.981" x2="-18.4" y3="22.981" x3="-15.7" y4="18.9289"/>
+        <polygon x4="-18.4" y5="31.8957" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="31.8957" x1="-18.4" y2="35.9479" x2="-18.4" y3="35.9479" x3="-15.7" y4="31.8957"/>
+        <rect width="51.3" x="-18.4" y="25.059" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="51.3" x="-18.4" y="18.7218" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="58.5" x="-22" y="-16.7299" antialias="false" height="56.7299" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="51.3" x="-18.4" y="31.8836" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="51.3" x="-18.4" y="22.1341" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="51.3" x="-18.4" y="12.3847" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="51.3" x="-18.4" y="35.2959" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="51.3" x="-18.4" y="-7.21184" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="51.3" x="-18.4" y="28.4713" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="51.3" x="-18.4" y="5.9499" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="51.3" x="-18.4" y="2.5376" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="51.3" x="-18.4" y="15.797" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="51.3" x="-18.4" y="-3.79954" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="51.3" x="-18.4" y="-13.549" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="51.3" x="-18.4" y="9.3622" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="51.3" x="-18.4" y="-10.1367" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect width="7.2" x="-29.2" y="-12.6778" antialias="false" height="2.43128" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="-18.4" y5="-13.4882" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-13.4882" x1="-18.4" y2="-9.43606" x2="-18.4" y3="-9.43606" x3="-15.7" y4="-13.4882"/>
+        <rect width="3" x="37" y="9" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="44" y5="4" x5="41" y6="5" x6="42" y7="3" x7="44" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="37" y2="4" x2="40" y3="6" x3="39" y4="3"/>
+        <input x="-5" y="45" size="6" rotate="true" text="_" tagg="label"/>
+        <terminal x="-29.2" y="-11.0569" orientation="w"/>
+        <terminal x="-29.2" y="35.1374" orientation="w"/>
+        <terminal x="41" y="10" orientation="e"/>
+    </description>
+</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/brida-pn10-rosca1m.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/brida-pn10-rosca1m.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/brida-pn10-rosca1m.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,33 +0,0 @@
-<definition version="0.5" type="element" height="30" link_type="simple" width="30" hotspot_x="14" hotspot_y="15" orientation="dyyy">
-<uuid uuid="{2CA8D6B7-08EE-425C-9CD6-C774E9E58311}"/><names>
-        <name lang="ca">Unió amb brides</name>
-        <name lang="es">Union con bridas</name>
-        <name lang="fr">Bride PN10</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line x1="3.19405" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-8.06948" length1="1.5" y1="-8.06948" x2="5.91999" antialias="false" end2="none"/>
-        <line x1="9.54917" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.26965" length1="1.5" y1="4.05312" x2="8.68204" antialias="false" end2="none"/>
-        <line x1="-3.86419" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-8.34579" length1="1.5" y1="-8.34579" x2="-0.818505" antialias="false" end2="none"/>
-        <line x1="1.56437" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="8.93155" length1="1.5" y1="8.93155" x2="5.24708" antialias="false" end2="none"/>
-        <line x1="8.393" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.26965" length1="1.5" y1="4.05312" x2="7.52587" antialias="false" end2="none"/>
-        <line x1="-4.05627" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.8759" length1="1.5" y1="3.65949" x2="-5.18501" antialias="false" end2="none"/>
-        <line x1="3.16365" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-10.6154" length1="1.5" y1="-10.6154" x2="5.56438" antialias="false" end2="none"/>
-        <line x1="-4.1183" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="9.0043" length1="1.5" y1="9.0043" x2="-0.596617" antialias="false" end2="none"/>
-        <line x1="6.05438" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2.9504" length1="1.5" y1="4.37236" x2="5.18726" antialias="false" end2="none"/>
-        <line x1="2.01381" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="11.253" length1="1.5" y1="11.253" x2="5.69585" antialias="false" end2="none"/>
-        <line x1="7.21055" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2.9504" length1="1.5" y1="4.37236" x2="6.34343" antialias="false" end2="none"/>
-        <line x1="-3.86419" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-10.6923" length1="1.5" y1="-10.6923" x2="-0.818505" antialias="false" end2="none"/>
-        <rect x="1.12533" height="25.7732" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.706" width="4.03022" antialias="false"/>
-        <rect x="5.18726" height="7.25991" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.88754" width="4.62468" antialias="false"/>
-        <line x1="-4.00353" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="11.4122" length1="1.5" y1="11.4122" x2="-0.696156" antialias="false" end2="none"/>
-        <line x1="-5.56126" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.8759" length1="1.5" y1="3.65949" x2="-6.69" antialias="false" end2="none"/>
-        <line x1="-8.60544" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.54738" length1="1.5" y1="3.988" x2="-9.73417" antialias="false" end2="none"/>
-        <line x1="-7.10045" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.54738" length1="1.5" y1="3.988" x2="-8.22919" antialias="false" end2="none"/>
-        <rect x="-9.73417" height="7.4707" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.48269" width="6.01996" antialias="false"/>
-        <rect x="-3.57701" height="26.0515" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.8054" width="4.02478" antialias="false"/>
-        <input tagg="label" x="-33" text="Brida a rosca M" rotate="true" size="3" y="24.5"/>
-        <terminal x="-9.80258" y="0.105345" orientation="w"/>
-        <terminal x="10" y="0" orientation="e"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-gasoil.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-gasoil.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-gasoil.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,24 +0,0 @@
-<definition hotspot_x="14" hotspot_y="22" width="30" type="element" version="0.5" height="50" link_type="simple" orientation="dyyy">
-<uuid uuid="{25DD5360-7BDF-4491-A82F-4E2D5EE8B8D2}"/><names>
-        <name lang="ca">Dipòsit gasoil 1000L</name>
-        <name lang="es">Depósito gasoil 1000L</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7" width="20" antialias="false" height="30" x="-11"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="3" antialias="false" height="2" x="-8"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14" width="7" antialias="false" height="5" x="-10"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-8" y2="-12" end1="none" x1="-6" y1="-10" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="3" antialias="false" height="2" x="3"/>
-        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-6" width="18" antialias="false" height="28" x="-10"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12" width="3" antialias="false" height="3" x="3"/>
-        <polygon y7="-13" x4="9" y3="-14" antialias="false" x3="3" y4="-17" x2="3" x1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="5" x7="6" y5="-16" x5="10" closed="false" y8="-12" y2="-12" x8="6" y6="-13" y1="-12"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11" width="3" antialias="false" height="1" x="6"/>
-        <arc style="line-style:normal;line-weight:thin;filling:none;color:black" y="-13" width="5" angle="-120" antialias="true" height="4" x="-9" start="-180"/>
-        <rect style="line-style:normal;line-weight:thin;filling:brun;color:black" y="3" width="18" antialias="false" height="19" x="-10"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="4" y2="20" end1="none" x1="4" y1="-7" length1="1.5"/>
-        <input rotate="true" text="1000L" tagg="label" y="-1.5" x="-11" size="3"/>
-        <terminal y="-10" x="10" orientation="e"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/bobine2.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/bobine2.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/bobine2.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,26 +0,0 @@
-<definition orientation="dyyy" type="element" height="40" link_type="simple" width="30" hotspot_y="24" version="0.5" hotspot_x="15">
-<uuid uuid="{0FE29FE9-D96E-43B7-8C53-AACEE1100E1F}"/><names>
-        <name lang="ru">Обмотка</name>
-        <name lang="pt">Bobine</name>
-        <name lang="fr">Bobine</name>
-        <name lang="cs">Cívka</name>
-        <name lang="en">Coil</name>
-        <name lang="es">Bobina</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input text="A2" rotate="true" size="4" tagg="none" x="-17" y="8"/>
-        <input text="A1" rotate="true" size="4" tagg="none" x="-16" y="-10"/>
-        <line end2="none" x1="1.77636e-15" y1="-15.5011" x2="1.77636e-15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="-9.47518" end1="none" length2="1.5"/>
-        <line end2="none" x1="1.77636e-15" y1="3.75593" x2="1.77636e-15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="9.78185" end1="none" length2="1.5"/>
-        <line end2="none" x1="9" y1="2.57667" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="-9.47518" end1="none" length2="1.5"/>
-        <line end2="none" x1="-9" y1="2.57667" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="2.57667" end1="none" length2="1.5"/>
-        <input text="" size="9" tagg="none" x="12" y="-1.64148"/>
-        <line end2="none" x1="9" y1="-9.47518" x2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="-9.47518" end1="none" length2="1.5"/>
-        <line end2="none" x1="-9" y1="-9.47518" x2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="2.57667" end1="none" length2="1.5"/>
-        <input text="KM_" rotate="true" size="4" tagg="label" x="9" y="-1"/>
-        <terminal orientation="n" x="1.77636e-15" y="-16.1037"/>
-        <terminal orientation="s" x="1.77636e-15" y="9.20518"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_continuite.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_continuite.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_continuite.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,20 +0,0 @@
-<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="30" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{CFD303D2-E8C7-41E3-91F7-A9FC5F91B92C}"/><names>
-        <name lang="ru">Клеммное соединение</name>
-        <name lang="pt">Terminal de combinação</name>
-        <name lang="en">Terminal block</name>
-        <name lang="fr">Borne continuité</name>
-        <name lang="es">Punto de combinación</name>
-        <name lang="cs">Spojovací svorka</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <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" x1="0" y2="3" x2="0"/>
-        <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" x1="0" y2="-3" x2="0"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <input x="2" y="1.5" size="5" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <terminal x="0" y="10" orientation="s"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_finale.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_finale.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_finale.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,18 +0,0 @@
-<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{17DF210F-C1F0-4F37-BAEE-6690CC573A5E}"/><names>
-        <name lang="ru">Клеммник</name>
-        <name lang="pt">Terminal de fim</name>
-        <name lang="en">Terminal block</name>
-        <name lang="fr">Borne finale</name>
-        <name lang="es">Punto de unión</name>
-        <name lang="cs">Koncová svorka</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="4" y="4" size="5" text="_" tagg="label"/>
-        <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" x1="0" y2="-3" x2="0"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="0" y="-10" orientation="n"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,19 +0,0 @@
-<definition width="20" version="0.4" hotspot_x="11" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D0CC280D-849B-4E40-80B1-1666AED89B5B}"/><names>
-        <name lang="ru">Проктой контакт (НР)</name>
-        <name lang="pt">Contacto simples (NO)</name>
-        <name lang="en">Simple contact</name>
-        <name lang="fr">Contact simple</name>
-        <name lang="es">Contactor simple</name>
-        <name lang="cs">Jednoduché spojení</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
-        <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" x1="0" y2="-10" x2="0"/>
-        <input x="5" y="15.5" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple_nf.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple_nf.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple_nf.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,20 +0,0 @@
-<definition width="20" version="0.4" hotspot_x="8" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C9C6013B-0DF9-4234-B279-1C200AF09C46}"/><names>
-        <name lang="ru">Проктой контакт (НЗ)</name>
-        <name lang="pt">Contacto simples (NC)</name>
-        <name lang="en">Simple contact (NC)</name>
-        <name lang="fr">Contact simple (NF)</name>
-        <name lang="es">Contactor simple (NC)</name>
-        <name lang="cs">Jednoduché spojení (NC)</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0"/>
-        <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" x1="0" y2="-9" 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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="8" y="12.5" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/foot_no_nc.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/foot_no_nc.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/foot_no_nc.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,33 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="21" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{493F67D2-58EB-473F-882B-4A6B3F44896F}"/><names>
-        <name lang="ar">مفتاح بدوّاسة (NO/NC)</name>
-        <name lang="el">Ποδοδιακόπτης, ανοικτή και κλειστή επαφή</name>
-        <name lang="en">Foot Switch (NO/NC)</name>
-        <name lang="it">Comando a pedale (NO/NC)</name>
-        <name lang="fr">Interrupteur a pedale (NO/NC)</name>
-        <name lang="pl">Łącznik wielozestykowy napędzany nogą</name>
-        <name lang="es">Doble interruptor A/C</name>
-        <name lang="nl">Voetschakelaar (NO/NC)</name>
-        <name lang="cs">Pedálový spínač (NO/NC)</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <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" x1="20" y2="-9" x2="27"/>
-        <input x="-2" y="-14.5" size="5" rotate="true" text="13" tagg="none"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="2" x1="-19" y2="-4" x2="-13" y3="4" x3="-13"/>
-        <input x="17" y="-14.5" size="5" rotate="true" text="21" tagg="none"/>
-        <input x="18" y="17.5" size="5" rotate="true" text="22" tagg="none"/>
-        <input x="-2" y="17.5" size="5" rotate="true" text="14" tagg="none"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-13" y2="0" x2="23"/>
-        <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" x1="20" y2="-9" x2="20"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="-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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="27" y="5.5" size="6" text="_" tagg="label"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="20" y="-20" orientation="n"/>
-        <terminal x="20" y="20" orientation="s"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_n.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_n.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_n.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,17 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{538CBDB3-56D6-4A98-9280-A4C4868D57EE}"/><names>
-        <name lang="ru">Нейтраль</name>
-        <name lang="en">Neutral source</name>
-        <name lang="fr">Source neutre</name>
-        <name lang="es">Fuente neutro</name>
-        <name lang="cs">Nulový zdroj</name>
-        <name lang="pt">Fonte de neutro</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <text x="-12" y="3" size="5" text="N"/>
-        <terminal x="10" y="0" orientation="e"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_p.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_p.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_p.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,17 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{F5C63761-1730-4820-8E25-529930E663D3}"/><names>
-        <name lang="ru">Фаза</name>
-        <name lang="en">Phase source</name>
-        <name lang="fr">Source phase</name>
-        <name lang="es">Fuente fase</name>
-        <name lang="cs">Fázový zdroj</name>
-        <name lang="pt">Fonte de fase</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <text x="-12" y="3" size="5" text="L"/>
-        <terminal x="10" y="0" orientation="e"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_1pn.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_1pn.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_1pn.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,20 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{4C31B850-3566-475A-9246-6AB021B70FF9}"/><names>
-        <name lang="ru">Однополюсный + нейтраль</name>
-        <name lang="en">Single-pole source + neutral</name>
-        <name lang="fr">Source unipolaire + neutre</name>
-        <name lang="es">Fuente unipolo + neutro</name>
-        <name lang="cs">Jednopólový zdroj + nulový</name>
-        <name lang="pt">Fonte unipolar + neutro</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
-        <text x="-12" y="13" size="5" text="N"/>
-        <text x="-12" y="3" size="5" text="L"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="10" orientation="e"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_3pn.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_3pn.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_3pn.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,26 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dnnn">
-<uuid uuid="{1A2B0439-CCC8-4EC3-BA8D-4653C471429C}"/><names>
-        <name lang="ru">Трёхполюсный + нейтраль</name>
-        <name lang="en">Three-pole source + neutral</name>
-        <name lang="fr">Source tripolaire + neutre</name>
-        <name lang="es">Fuente tripolar + neutro</name>
-        <name lang="cs">Třípólový zdroj + nulový</name>
-        <name lang="pt">Fonte tripolar + neutro</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="10"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
-        <text x="-12" y="13" size="5" text="N"/>
-        <text x="-12" y="3" size="5" text="L3"/>
-        <text x="-12" y="-7" size="5" text="L2"/>
-        <text x="-12" y="-17" size="5" text="L1"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-20" x2="10"/>
-        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="10" orientation="e"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circu-doble-bridas.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circu-doble-bridas.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circu-doble-bridas.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,84 +0,0 @@
-<definition width="50" hotspot_y="21" height="40" type="element" version="0.4" orientation="dyyy" hotspot_x="23" link_type="simple">
-<uuid uuid="{8776D0E5-25DA-4D39-BF32-796551662A3C}"/><names>
-        <name lang="es">Bomba circuladora-doble brida</name>
-	<name lang="en">Circulating double w/flanges pump</name>
-        <name lang="ca">Bomba circu-2 brides</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="0.8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.11229" x="-17.6" height="13.8328"/>
-        <line x1="6.8" antialias="false" y1="-2.11229" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-3.57049" end2="none" length2="1.5" end1="none" x2="5.2"/>
-        <arc start="0" width="21.6" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-10.8615" x="-9.2" height="11.6657" angle="-90"/>
-        <line x1="6" antialias="false" y1="13.1989" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="11.7407" end2="none" length2="1.5" end1="none" x2="4.4"/>
-        <line x1="-5.2" antialias="false" y1="-6.48691" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-6.48691" end2="none" length2="1.5" end1="none" x2="-2.8"/>
-        <line x1="-6" antialias="false" y1="8.82427" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.82427" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-2.8" antialias="false" y1="-2.84139" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-4.2996" end2="none" length2="1.5" end1="none" x2="-1.2"/>
-        <line x1="-3.6" antialias="false" y1="12.4698" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="11.0116" end2="none" length2="1.5" end1="none" x2="-2"/>
-        <line x1="-16.4" antialias="false" y1="2.01323" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="2.01323" end2="none" length2="1.5" end1="none" x2="-14"/>
-        <ellipse width="9.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.8615" x="-2.8" height="8.02014"/>
-        <ellipse width="14.4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.0488" x="-5.2" height="12.3948"/>
-        <rect width="1.2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.11229" x="19.2" height="13.8328"/>
-        <ellipse width="3.2" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-7.94512" x="0.4" height="2.91641"/>
-        <line x1="2" antialias="false" y1="-12.8544" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-11.0722" end2="none" length2="1.5" end1="none" x2="2"/>
-        <line x1="2" antialias="false" y1="-2.84139" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-0.654079" end2="none" length2="1.5" end1="none" x2="2"/>
-        <line x1="-16.4" antialias="false" y1="-1.90318" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-1.90318" end2="none" length2="1.5" end1="none" x2="-14"/>
-        <line x1="6.8" antialias="false" y1="-6.48691" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-6.48691" end2="none" length2="1.5" end1="none" x2="9.2"/>
-        <line x1="5.2" antialias="false" y1="-10.1324" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-11.5906" end2="none" length2="1.5" end1="none" x2="6.8"/>
-        <line x1="-2" antialias="false" y1="-9.40332" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-10.8615" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-1.2" antialias="false" y1="-12.3197" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-10.8615" end2="none" length2="1.5" end1="none" x2="-0.4"/>
-        <ellipse width="9.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="4.44965" x="-3.6" height="8.02014"/>
-        <line x1="3.6" antialias="false" y1="-3.57049" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-1.38318" end2="none" length2="1.5" end1="none" x2="4.4"/>
-        <line x1="3.6" antialias="false" y1="-10.8615" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-12.3197" end2="none" length2="1.5" end1="none" x2="4.4"/>
-        <ellipse width="14.4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="2.26234" x="-6" height="12.3948"/>
-        <line x1="6" antialias="false" y1="-8.67422" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-10.1324" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <ellipse width="3.2" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y="7.36606" x="-0.4" height="2.91641"/>
-        <line x1="6.8" antialias="false" y1="-7.21601" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-7.21601" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <line x1="1.2" antialias="false" y1="2.45677" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="4.23902" end2="none" length2="1.5" end1="none" x2="1.2"/>
-        <line x1="6" antialias="false" y1="-5.0287" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-4.2996" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <line x1="1.2" antialias="false" y1="12.4698" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="14.6571" end2="none" length2="1.5" end1="none" x2="1.2"/>
-        <line x1="6" antialias="false" y1="8.82427" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.82427" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <line x1="-5.2" antialias="false" y1="-8.67422" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-7.94512" end2="none" length2="1.5" end1="none" x2="-2.8"/>
-        <line x1="4.4" antialias="false" y1="5.17875" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="3.72054" end2="none" length2="1.5" end1="none" x2="6"/>
-        <line x1="-4.4" antialias="false" y1="-4.2996" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-5.0287" end2="none" length2="1.5" end1="none" x2="-2.8"/>
-        <line x1="-2.8" antialias="false" y1="5.90785" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="4.44965" end2="none" length2="1.5" end1="none" x2="-4.4"/>
-        <line x1="-1.2" antialias="false" y1="-1.38318" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-2.84139" end2="none" length2="1.5" end1="none" x2="-0.4"/>
-        <line x1="0.4" antialias="false" y1="-5.7578" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-7.21601" end2="none" length2="1.5" end1="none" x2="3.6"/>
-        <line x1="-2" antialias="false" y1="2.99144" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="4.44965" end2="none" length2="1.5" end1="none" x2="-1.2"/>
-        <line x1="2.8" antialias="false" y1="11.7407" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="13.928" end2="none" length2="1.5" end1="none" x2="3.6"/>
-        <arc start="-180" width="17.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14.507" x="-6.8" height="13.1239" angle="-180"/>
-        <line x1="2.8" antialias="false" y1="4.44965" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="2.99144" end2="none" length2="1.5" end1="none" x2="3.6"/>
-        <arc start="-90" width="15.2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.2362" x="-6.8" height="16.0403" angle="-90"/>
-        <line x1="5.2" antialias="false" y1="6.63696" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="5.17875" end2="none" length2="1.5" end1="none" x2="7.6"/>
-        <line x1="6" antialias="false" y1="8.09517" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.09517" end2="none" length2="1.5" end1="none" x2="7.6"/>
-        <line x1="11.4399" antialias="false" y1="-7.94512" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-7.94512" end2="none" length2="1.5" end1="none" x2="13.3734"/>
-        <line x1="5.2" antialias="false" y1="10.2825" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="11.0116" end2="none" length2="1.5" end1="none" x2="7.6"/>
-        <line x1="-6" antialias="false" y1="6.63696" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="7.36606" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-5.2" antialias="false" y1="11.0116" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="10.2825" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-2" antialias="false" y1="13.928" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="12.4698" end2="none" length2="1.5" end1="none" x2="-1.2"/>
-        <line x1="-0.4" antialias="false" y1="9.55337" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.09517" end2="none" length2="1.5" end1="none" x2="2.8"/>
-        <line x1="11.3866" antialias="false" y1="10.2825" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="10.2825" end2="none" length2="1.5" end1="none" x2="12.6311"/>
-        <arc start="-180" width="17.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.804129" x="-7.6" height="13.1239" angle="-180"/>
-        <arc start="-90" width="15.2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.075025" x="-7.6" height="16.0403" angle="-90"/>
-        <arc start="0" width="21.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="4.44965" x="-10" height="11.6657" angle="-90"/>
-        <line x1="14" antialias="false" y1="-7.94512" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-6.48691" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="15.6" antialias="false" y1="-6.48691" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-0.654079" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="16.478" antialias="false" y1="-0.924975" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-0.924975" end2="none" length2="1.5" end1="none" x2="19.2488"/>
-        <line x1="12.4" antialias="false" y1="10.2825" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="8.82427" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="15.6" antialias="false" y1="8.82427" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="2.99144" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="19.2488" antialias="false" y1="3.26234" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="3.26234" end2="none" length2="1.5" end1="none" x2="16.478"/>
-        <line x1="12.4" antialias="false" y1="-4.2996" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="5.90785" end2="none" length2="1.5" end1="none" x2="12.4"/>
-        <line x1="10" antialias="false" y1="7.36606" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="7.36606" end2="none" length2="1.5" end1="none" x2="11.6"/>
-        <polygon x1="-6.8" x5="-13.2" antialias="false" closed="false" y1="-8.67422" y5="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-2.11229" x3="-10.8" y2="-8.67422" x4="-13.2" x2="-9.2" y4="-2"/>
-        <polygon x1="-13.2" x5="-7.6" antialias="false" closed="false" y1="2" y5="10.2825" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="10.2825" x3="-9.2" y2="2.26234" x4="-7.6" x2="-10.8" y4="10.2825"/>
-        <line x1="10.8" antialias="false" y1="7.36606" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="5.90785" end2="none" length2="1.5" end1="none" x2="12.4"/>
-        <line x1="-6" antialias="false" y1="-2.84139" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="0.075025" end2="none" length2="1.5" end1="none" x2="-9.2"/>
-        <line x1="-9.2" antialias="false" y1="0.075025" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="2.99144" end2="none" length2="1.5" end1="none" x2="-6.8"/>
-        <rect width="3.2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.7779" x="0.2" height="2.91641"/>
-        <polygon x1="-6.2" x5="-0.6" antialias="false" closed="false" y1="-15.9451" y5="-17.4033" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-15.216" x3="-3.8" y2="-17.4033" x4="-0.6" x2="-3" y4="-17.4033"/>
-        <input y="19.3963" rotate="true" x="-7.6" size="4" tagg="label" text="_"/>
-        <terminal y="0" x="-18" orientation="w"/>
-        <terminal y="1" x="21" orientation="e"/>
-        <terminal y="-17" x="2" orientation="n"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circul-bridas.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circul-bridas.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circul-bridas.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,29 +0,0 @@
-<definition width="50" height="50" link_type="simple" hotspot_x="24" hotspot_y="38" version="0.4" type="element" orientation="dyyy">
-<uuid uuid="{5800DED3-2E1A-4627-A625-76702EA0E189}"/><names>
-        <name lang="es">Bomba circuladora c/bridas</name>
-	<name lang="en">Circulating w/flanges pump</name>
-        <name lang="ca">Bomba circuladora brides</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="1" height="17.5307" antialias="false" y="-9.0473" x="-18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="-9.75" y3="-34.9828" antialias="false" closed="false" x2="-7.25" y5="-8" y4="-10.2506" y2="-34.9828" x5="11.5" x4="11.5" y1="-8.70488" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="9"/>
-        <rect width="5" height="5.76534" antialias="false" y="-3.16467" x="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" height="17.5307" antialias="false" y="-9.04734" x="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="-4.75" length2="1.5" antialias="false" end1="none" x2="-6" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line x1="6.5" length2="1.5" antialias="false" end1="none" x2="9" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line x1="4" length2="1.5" antialias="false" end1="none" x2="5.25" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="5" height="5.76534" antialias="false" y="-3.16467" x="-17.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="-1" length2="1.5" antialias="false" end1="none" x2="-2.25" length1="1.5" end2="none" y2="-11.8127" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="3.75" height="4.324" antialias="false" y="-30.55" x="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="-7.25" length2="1.5" antialias="false" end1="none" x2="9" length1="1.5" end2="none" y2="-30.55" y1="-30.55" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line x1="-9.75" length2="1.5" antialias="false" end1="none" x2="11.5" length1="1.5" end2="none" y2="-11.8127" y1="-11.8127" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon closed="false" antialias="false" x6="14" y3="5.48333" y4="4.04199" y6="-3.16467" y8="-8.93001" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5.48333" x2="-6" x7="12.75" y10="2.60066" x5="14" y1="2.60066" x3="7.75" x8="-9.75" x1="-12.25" x4="10.25" x9="-12.25" y5="2.60066" y9="-6.04734" x10="-12.25" y7="-8.93001"/>
-        <polygon x1="4.75" y3="-29.226" antialias="false" closed="false" x2="3.5" y5="-23.4607" y4="-23.4607" y2="-26.3433" x5="4.75" x4="4.75" y1="-30.6673" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="6"/>
-        <input y="13.4107" text="_" tagg="label" size="4" x="-8.5" rotate="true"/>
-        <terminal y="0" orientation="w" x="-19"/>
-        <terminal y="0" orientation="e" x="20"/>
-        <terminal y="-29.1087" orientation="e" x="14"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-agua-vert.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-agua-vert.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-agua-vert.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,46 +0,0 @@
-<definition width="40" hotspot_y="41" hotspot_x="24" type="element" orientation="dyyy" version="0.5" link_type="simple" height="70">
-<uuid uuid="{23206DDD-497C-49AE-BFEB-5FBA86C5E680}"/><names>
-        <name lang="es">Bomba de agua vertical</name>
-	<name lang="en">Vertical water pump</name>
-        <name lang="ca">Bomba aigua  vertical</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line y1="-12.4386" end1="none" x1="-5.95" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-5.95" antialias="false" y2="21.5796" length2="1.5"/>
-        <line y1="-2.68695" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="-2.68695" length2="1.5"/>
-        <line y1="-12.4386" end1="none" x1="0.55" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="0.55" antialias="false" y2="21.5796" length2="1.5"/>
-        <line y1="4.56986" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="4.56986" length2="1.5"/>
-        <line y1="17.7641" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="17.7641" length2="1.5"/>
-        <line y1="-18.52" end1="none" x1="-12.515" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="0.68" antialias="false" y2="-18.52" length2="1.5"/>
-        <line y1="-31.7142" end1="none" x1="0.225" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="0.225" antialias="false" y2="-18.52" length2="1.5"/>
-        <line y1="-31.7142" end1="none" x1="-0.9125" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-0.9125" antialias="false" y2="-18.52" length2="1.5"/>
-        <line y1="-31.7142" end1="none" x1="-7.7375" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-7.7375" antialias="false" y2="-18.52" length2="1.5"/>
-        <line y1="-31.7142" end1="none" x1="-4.325" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-4.325" antialias="false" y2="-18.52" length2="1.5"/>
-        <line y1="11.8267" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="11.8267" length2="1.5"/>
-        <line y1="-31.7142" end1="none" x1="-9.785" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-9.785" antialias="false" y2="-18.52" length2="1.5"/>
-        <rect width="2.37439" y="-11.3907" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="6.38746" antialias="false" height="5.05146"/>
-        <rect width="3.73118" y="-12.081" style="line-style:normal;line-weight:normal;filling:none;color:black" x="5.03084" antialias="false" height="6.43198"/>
-        <rect width="1.35679" y="-14.2459" style="line-style:normal;line-weight:normal;filling:none;color:black" x="3.67416" antialias="false" height="11.0442"/>
-        <rect width="2.37439" y="16.9768" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="6.38746" antialias="false" height="5.05146"/>
-        <rect width="3.73118" y="16.2865" style="line-style:normal;line-weight:normal;filling:none;color:black" x="5.03084" antialias="false" height="6.43198"/>
-        <rect width="1.35679" y="14.1216" style="line-style:normal;line-weight:normal;filling:none;color:black" x="3.67416" antialias="false" height="11.0442"/>
-        <rect width="19.5" y="-14.5617" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-15.7" antialias="false" height="40.2423"/>
-        <rect width="31.2" y="25.6806" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-21.55" antialias="false" height="1.31942"/>
-        <line y1="-9.94376" end1="none" x1="-15.7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="3.15" antialias="false" y2="-9.94376" length2="1.5"/>
-        <rect width="13.65" y="-35.6724" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.515" antialias="false" height="21.1107"/>
-        <arc width="13.65" angle="-180" y="-38.971" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.515" start="-180" antialias="true" height="6.5971"/>
-        <line y1="-31.7142" end1="none" x1="-12.515" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="0.68" antialias="false" y2="-31.7142" length2="1.5"/>
-        <line y1="-31.7142" end1="none" x1="-11.15" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-11.15" antialias="false" y2="-18.52" length2="1.5"/>
-        <rect width="3.185" y="-29.7351" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-15.7" antialias="false" height="7.91652"/>
-        <rect width="1.365" y="-21.8185" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14.79" antialias="false" height="1.31942"/>
-        <line y1="-11.8107" end1="none" x1="-11.8" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-11.8" antialias="false" y2="21.6113" length2="1.5"/>
-        <rect width="19.5" y="-14.5617" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-15.7" antialias="false" height="1.97913"/>
-        <rect width="19.5" y="21.7223" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-15.7" antialias="false" height="3.95826"/>
-        <line y1="-29.7351" end1="none" x1="-14.79" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-14.79" antialias="false" y2="-22.4782" length2="1.5"/>
-        <input size="4" text="_" y="3" tagg="label" x="-29" rotate="true"/>
-        <terminal y="20" orientation="e" x="10"/>
-        <terminal y="-10" orientation="e" x="10"/>
-        <terminal y="-30" orientation="w" x="-20"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-circuladora.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-circuladora.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-circuladora.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,33 +0,0 @@
-<definition width="50" hotspot_y="21" hotspot_x="24" type="element" orientation="dyyy" version="0.5" link_type="simple" height="40">
-<uuid uuid="{5436C828-D73E-4941-A6AC-97966A3121AF}"/><names>
-        <name lang="es">Bomba circuladora</name>
-	<name lang="en">Circulating pump</name>
-        <name lang="ca">Bomba circuladora</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line y1="13.0284" end1="none" x1="15" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="18" antialias="false" y2="13.0284" length2="1.5"/>
-        <line y1="13.0284" end1="none" x1="-18" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-15" antialias="false" y2="13.0284" length2="1.5"/>
-        <polygon y1="3.06945" x3="7" y4="1.82462" x5="9" x4="9" x1="-8" y5="1.82462" closed="false" y3="-18.0933" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-6" antialias="false" y2="-18.0933"/>
-        <rect width="4" y="8.04891" style="line-style:normal;line-weight:normal;filling:none;color:black" x="11" antialias="false" height="4.97946"/>
-        <rect width="4" y="5.55918" style="line-style:normal;line-weight:normal;filling:none;color:black" x="15" antialias="false" height="9.95894"/>
-        <line y1="8.04891" end1="none" x1="15" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="18" antialias="false" y2="8.04891" length2="1.5"/>
-        <line y1="-15.6035" end1="none" x1="-4" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-5" antialias="false" y2="0.579701" length2="1.5"/>
-        <line y1="-15.6035" end1="none" x1="5" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="7" antialias="false" y2="0.579701" length2="1.5"/>
-        <line y1="-15.6035" end1="none" x1="3" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="4" antialias="false" y2="0.579701" length2="1.5"/>
-        <rect width="4" y="8.04891" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" antialias="false" height="4.97946"/>
-        <rect width="4" y="5.55918" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18" antialias="false" height="9.95894"/>
-        <line y1="-15.6035" end1="none" x1="-1" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-2" antialias="false" y2="0.579701" length2="1.5"/>
-        <line y1="8.04891" end1="none" x1="-18" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-15" antialias="false" y2="8.04891" length2="1.5"/>
-        <rect width="3" y="-15.6035" style="line-style:normal;line-weight:normal;filling:none;color:black" x="7" antialias="false" height="3.73459"/>
-        <line y1="-15.6035" end1="none" x1="-6" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="7" antialias="false" y2="-15.6035" length2="1.5"/>
-        <line y1="0.579701" end1="none" x1="-8" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="9" antialias="false" y2="0.579701" length2="1.5"/>
-        <polygon x5="11" x8="-8" x9="-10" closed="false" y10="13.0284" y1="13.0284" x3="6" y9="5.55918" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15.5181" antialias="false" x4="8" y6="8.04891" y7="3.06945" y4="14.2732" y3="15.5181" x7="10" x10="-10" x1="-10" y5="13.0284" x2="-5" x6="11" y8="3.06945"/>
-        <polygon y1="-13.1137" x3="3" y4="-6.88948" x5="2" x4="2" x1="2" y5="-6.88948" closed="false" y3="-11.8689" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="1" antialias="false" y2="-9.37915"/>
-        <input size="4" text="_" y="22.3649" tagg="label" x="-7" rotate="true"/>
-        <terminal y="10" orientation="w" x="-20"/>
-        <terminal y="10" orientation="e" x="20"/>
-        <terminal y="-14.3587" orientation="e" x="11"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-horiz1.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-horiz1.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-horiz1.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,44 +0,0 @@
-<definition width="90" hotspot_y="26" hotspot_x="25" type="element" orientation="dyyy" version="0.5" link_type="simple" height="50">
-<uuid uuid="{0C893A73-1766-48F2-BA19-B0C28E3D60B0}"/><names>
-        <name lang="es">Bomba agua horiz-1</name>
-	<name lang="en">Horizontal pump 1</name>
-        <name lang="ca">Bomba aigua horiz-1</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="8.61045" angle="-180" y="-16.0243" style="line-style:normal;line-weight:normal;filling:none;color:black" x="42.191" start="90" antialias="true" height="34.0577"/>
-        <arc width="6.26213" angle="-180" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.1445" start="90" antialias="true" height="25.6434"/>
-        <rect width="2.73967" y="-1.49057" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="53.541" antialias="false" height="5.86449"/>
-        <rect width="7.43623" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="22.2307" antialias="false" height="25.6434"/>
-        <rect width="34.833" y="-10.8155" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.6023" antialias="false" height="23.2394"/>
-        <rect width="15.6553" y="-16.425" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-1.25219" antialias="false" height="5.60951"/>
-        <rect width="7.43623" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-20.0385" antialias="false" height="25.6434"/>
-        <line y1="-9.21276" end1="none" x1="-12.2821" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9166" antialias="false" y2="-9.21276" length2="1.5"/>
-        <line y1="-6.408" end1="none" x1="-12.2821" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9166" antialias="false" y2="-6.408" length2="1.5"/>
-        <line y1="0.804232" end1="none" x1="-12.2821" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9166" antialias="false" y2="0.804232" length2="1.5"/>
-        <line y1="10.8212" end1="none" x1="-12.2918" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.5356" antialias="false" y2="10.8212" length2="1.5"/>
-        <line y1="8.41714" end1="none" x1="-12.2866" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9213" antialias="false" y2="8.41714" length2="1.5"/>
-        <line y1="4.81102" end1="none" x1="-12.2814" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="22.3072" antialias="false" y2="4.81102" length2="1.5"/>
-        <line y1="-3.60323" end1="none" x1="-12.2858" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="21.9205" antialias="false" y2="-3.60323" length2="1.5"/>
-        <line y1="-15.2229" end1="none" x1="-1.25219" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="14.4031" antialias="false" y2="-15.2229" length2="1.5"/>
-        <rect width="8.03955" y="-19.6304" style="line-style:normal;line-weight:normal;filling:none;color:black" x="37.9936" antialias="false" height="3.60612"/>
-        <rect width="5.3052" y="-2.29192" style="line-style:normal;line-weight:normal;filling:none;color:black" x="51.9757" antialias="false" height="7.4672"/>
-        <rect width="2.34829" y="-14.4216" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-3.60048" antialias="false" height="2.0034"/>
-        <line y1="-16.0243" end1="none" x1="37.886" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="46.1052" antialias="false" y2="-16.0243" length2="1.5"/>
-        <line y1="18.0335" end1="none" x1="37.886" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="46.1052" antialias="false" y2="18.0335" length2="1.5"/>
-        <rect width="6.474" y="-19.6304" style="line-style:dotted;line-weight:normal;filling:none;color:red" x="38.7766" antialias="false" height="2.80476"/>
-        <arc width="6.26213" angle="-180" y="-12.0175" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-22.7782" start="-90" antialias="true" height="25.6434"/>
-        <line y1="-1.59984" end1="none" x1="32.4066" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="33.1893" antialias="false" y2="-1.59984" length2="1.5"/>
-        <line y1="6.41374" end1="none" x1="32.0152" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="33.5808" antialias="false" y2="6.41374" length2="1.5"/>
-        <rect width="1.56553" y="-4.8053" style="line-style:normal;line-weight:normal;filling:none;color:black" x="50.4102" antialias="false" height="12.8218"/>
-        <input size="4" text="_" y="25" tagg="label" x="0" rotate="true"/>
-        <rect width="3" y="-16" style="line-style:normal;line-weight:normal;filling:none;color:black" x="37" antialias="false" height="34"/>
-        <rect width="3" y="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x="34" antialias="false" height="10"/>
-        <polygon y7="18" y1="18" x3="30" y4="20" x5="47" x4="47" x7="47" x1="37" y6="18" y5="18" closed="false" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" x6="47" antialias="false" y2="18"/>
-        <polygon x5="-13" x8="-14" x9="-14" closed="false" y1="13.6844" x3="-22" y9="13.6844" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17.4738" antialias="false" x4="-22" y6="13.6844" y7="13.6844" y4="20" y3="17.4738" x7="-14" x1="-15" y5="20" x2="-15" x6="-13" y8="13.6844"/>
-        <terminal y="-20" orientation="n" x="41"/>
-        <terminal y="0" orientation="e" x="60"/>
-        <terminal y="-18" orientation="n" x="-3"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-pozo.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-pozo.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-pozo.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,43 +0,0 @@
-<definition link_type="simple" hotspot_x="11" orientation="dyyy" hotspot_y="55" version="0.5" type="element" height="90" width="20">
-<uuid uuid="{3ECAC576-C727-47E3-B9A7-D593D1D124CD}"/><names>
-        <name lang="es">Bomba pozo sumergida</name>
-	<name lang="en">Submerged waterhole pump</name>
-        <name lang="ca">Bomba pozo sumergida</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <polygon antialias="false" y1="-21.5486" closed="false" y2="-25.1956" y3="-25.1956" y4="-21.5486" y5="-19.725" y6="-19.725" x1="-5.82471" y7="-21.5486" x2="-2.84418" y8="-21.5486" x3="3.11686" y9="-21.5486" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
-        <line x1="1.6266" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9.925" y2="-7.225"/>
-        <line x1="-4.33445" length1="1.5" x2="0.136339" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4.525" y2="-8.575"/>
-        <polygon antialias="false" y1="-27.2986" closed="false" y2="-30.9456" y3="-30.9456" y4="-27.2986" y5="-25.475" y6="-25.475" x1="-5.82471" y7="-27.2986" x2="-2.84418" y8="-27.2986" x3="3.11686" y9="-27.2986" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
-        <line x1="-5.82471" length1="1.5" x2="0.136339" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-7.225" y2="-3.175"/>
-        <line x1="-2.84418" length1="1.5" x2="4.60712" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.175" y2="-9.925"/>
-        <polygon antialias="false" y1="-15.7986" closed="false" y2="-19.4456" y3="-19.4456" y4="-15.7986" y5="-13.975" y6="-13.975" x1="-5.82471" y7="-15.7986" x2="-2.84418" y8="-15.7986" x3="3.11686" y9="-15.7986" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
-        <line x1="1.6266" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4.525" y2="-8.575"/>
-        <line x1="-4.33445" length1="1.5" x2="3.11686" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8.575" y2="-3.175"/>
-        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-21.75" y2="-21.75"/>
-        <line x1="0.28034" length1="1.5" x2="0.28034" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
-        <polygon antialias="false" y1="-33.0486" closed="false" y2="-36.6956" y3="-36.6956" y4="-33.0486" y5="-31.225" y6="-31.225" x1="-5.82471" y7="-33.0486" x2="-2.84418" y8="-33.0486" x3="3.11686" y9="-33.0486" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
-        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-33.25" y2="-33.25"/>
-        <line x1="4.96674" length1="1.5" x2="4.96674" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
-        <line x1="-2.84392" length1="1.5" x2="-2.84392" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
-        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-27.5" y2="-27.5"/>
-        <line x1="2.62354" length1="1.5" x2="2.62354" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
-        <line x1="-4.40605" length1="1.5" x2="-4.40605" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.24047" y2="30.28"/>
-        <rect antialias="false" x="-5.82471" y="-9.925" height="40.5" style="line-style:normal;line-weight:normal;filling:none;color:black" width="11.9221"/>
-        <rect antialias="false" x="-2.84418" y="30.575" height="2.7" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5.96105"/>
-        <line x1="-5.82471" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.175" y2="-3.175"/>
-        <line x1="-5.82471" length1="1.5" x2="-1.35392" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5.875" y2="-9.925"/>
-        <line x1="-2.84418" length1="1.5" x2="4.60712" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9.925" y2="-4.525"/>
-        <polygon antialias="false" y1="-11.275" closed="false" y2="-13.975" y3="-13.975" y4="-11.275" y5="-9.925" y6="-9.925" x1="-5.82471" y7="-11.275" x2="-2.84418" y8="-11.275" x3="3.11686" y9="-11.275" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="6.09739" x5="6.09739" x6="-5.82471" x7="-5.82471" x8="-5.82471" x9="-5.82471"/>
-        <line x1="-4.33445" length1="1.5" x2="6.09739" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" y2="-16"/>
-        <rect antialias="false" x="-5.82471" y="-43.375" height="6.75" style="line-style:normal;line-weight:normal;filling:none;color:black" width="11.9221"/>
-        <rect antialias="false" x="-7.31497" y="-43.675" height="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="1.49026"/>
-        <rect antialias="false" x="-2.84418" y="-48.775" height="5.4" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5.96105"/>
-        <input text="_" x="4.60712" tagg="label" y="14.375" rotate="true" size="4"/>
-        <polygon x1="-7" y4="-10" x2="-7" y5="-10" antialias="false" x3="-6" y6="-10" x4="-6" x5="-6" x6="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-42" y2="-12" closed="false" y3="-10"/>
-        <terminal orientation="n" x="-7" y="-42"/>
-        <terminal orientation="n" x="0.136339" y="-50.125"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/calentador-gas.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/calentador-gas.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/calentador-gas.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,40 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="34" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C94FF8DF-CD8A-4A8A-A115-18AFE817A84C}"/><names>
-        <name lang="es">Calentador ACS-gas</name>
-	<name lang="en">DHW-gas boiler</name>
-        <name lang="ca">Escalfador ACS-gas</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="10.1049" x="0.353766" y="11.9242" antialias="true" height="7.21036" 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:thin;filling:none;color:black" y1="28.1476" x1="8.1886" y2="27.697" x2="12.3224"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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.0489" x1="-13.09" y2="28.5983" 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.0489" x1="8.1886" y2="28.5983" x2="12.3224"/>
-        <ellipse width="1.83726" x="-10.2105" y="15.5294" antialias="true" height="1.35194" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="0.918628" x="-5.61731" y="15.0788" antialias="false" height="1.8026" 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="26.345" x1="17.0039" y2="29.9502" x2="17.0039"/>
-        <rect width="29.3961" x="-14.3443" y="21.3879" antialias="false" height="3.15453" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="6.43039" x="2.65034" y="12.8255" antialias="true" height="5.40777" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.64559" x="-4.23937" y="5.06584" antialias="false" height="2.8026" 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="15.5294" x1="5.86553" y2="13.7269" x2="8.1621"/>
-        <arc width="8.26765" x="1.73171" y="11.9242" antialias="true" height="7.21036" 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="-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"/>
-        <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"/>
-        <input x="-18" y="-10" size="4" rotate="true" text="calentador" tagg="label"/>
-        <terminal x="10.229" y="31.6757" orientation="s"/>
-        <terminal x="-10.7493" y="31.6757" orientation="s"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/inodoro2.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/inodoro2.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/inodoro2.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,21 +0,0 @@
-<definition width="60" type="element" hotspot_x="31" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="43" height="80">
-<uuid uuid="{788236FF-6887-4792-9BEB-D200660DE1BE}"/><names>
-        <name lang="es">Inodoro tanque</name>
-	<name lang="en">Toilet</name>
-        <name lang="ca">Inodor1</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect antialias="false" width="15" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-34" height="30" x="-24"/>
-        <arc antialias="true" width="15" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-38" angle="180" height="7" x="-24"/>
-        <rect antialias="false" width="45" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3" height="5" x="-21"/>
-        <rect antialias="false" width="28" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6" height="2" x="-6"/>
-        <polygon x14="23" x16="23" y16="3" y3="12" x4="-6" y11="11" y6="27" y12="9" y8="23" y15="3" y4="17" x3="-6" y17="3" x7="18" x5="-16" y10="15" x1="-16" y7="27" x11="11" x12="19" y1="2" x2="-16" y13="5" x13="23" style="line-style:normal;line-weight:normal;filling:none;color:black" x8="20" y2="7" y5="22" y14="3" x6="-16" x9="16" y9="17" antialias="false" x10="11" x15="23" closed="false" x17="23"/>
-        <circle antialias="false" diameter="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-32" x="-21"/>
-        <rect antialias="false" width="13" style="line-style:dashed;line-weight:normal;filling:none;color:black" y="22" height="6" x="-14"/>
-        <input tagg="label" rotate="true" y="-20" text="_" x="20" size="5"/>
-        <terminal orientation="w" y="-31" x="-24"/>
-        <terminal orientation="s" y="29" x="-7"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termo-electrico.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termo-electrico.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termo-electrico.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,40 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="29" hotspot_y="34" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{AA992F41-6486-463D-92B1-D56C817E7918}"/><names>
-        <name lang="es">Calentador Termo Electrico</name>
-	<name lang="en">Thermo electric boiler</name>
-        <name lang="ca">Escalfador eléctric</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <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="38.8288" x1="7.4" y2="38.4249" x2="11.18"/>
-        <arc width="9.786" x="-10.62" y="39.3811" antialias="true" height="2.57749" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <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="38.8288" x1="-22.18" y2="38.4249" x2="-18.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="37.2133" x1="-15.88" y2="40.4441" x2="-15.88"/>
-        <rect width="4.158" x="14.118" y="-4.38275" antialias="false" height="6.46153" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="37.0986" x="-22.842" y="-26.4691" antialias="false" height="59.4061" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="37.0986" x="-22.3338" y="-29.5048" antialias="true" height="6.5043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <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="39.2326" x1="-15.04" y2="40.848" x2="-15.88"/>
-        <ellipse width="1.848" x="15.504" y="-1.55583" antialias="true" height="1.21154" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.2" x="-22.18" y="35.598" antialias="false" height="5.25" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <arc width="37.0986" x="-22.842" y="29.9013" antialias="true" height="6.5043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <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="39.2326" x1="-16.72" y2="40.848" x2="-15.88"/>
-        <rect width="4.2" x="7.4" y="35.598" antialias="false" height="5.25" 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="40.4441" x1="-22.18" y2="40.0403" x2="-18.4"/>
-        <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="40.4441" x1="7.4" y2="40.0403" x2="11.18"/>
-        <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="39.6364" x1="-22.18" y2="39.2326" x2="-18.4"/>
-        <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="39.6364" x1="7.4" y2="39.2326" x2="11.18"/>
-        <ellipse width="1.68" x="-8.52" y="37.9201" antialias="true" height="1.51442" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="0.16" x="-2.8" y="37.9201" antialias="false" height="2.01922" 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="40.949" x1="-10.62" y2="36.4056" x2="-10.62"/>
-        <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="40.949" x1="-0.96" y2="36.4056" x2="-0.96"/>
-        <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="37.2133" x1="4.88" y2="40.4441" x2="4.88"/>
-        <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="4.04"/>
-        <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"/>
-        <input x="-10" y="6" size="4" rotate="true" text="_L" tagg="label"/>
-        <terminal x="9.5" y="40.4441" orientation="s"/>
-        <terminal x="-20.08" y="40.0403" orientation="s"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon-2placas.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon-2placas.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon-2placas.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,66 +0,0 @@
-<definition width="130" version="0.4" hotspot_x="31" hotspot_y="80" height="130" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1CB90822-F8FF-47C9-BBA9-082DC1E9E75E}"/><names>
-        <name lang="es">Termosifón solar 2</name>
-	<name lang="en">Solar thermosyphon 2</name>
-        <name lang="ca">Solar temosifó 2</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="51.6" x="36" y="-42.9288" antialias="false" height="84.7476" 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="-59" x1="-21" y2="-59" x2="-13"/>
-        <rect width="51.6" x="-20" y="-42.9288" antialias="false" height="84.7476" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="3" x="88" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="6" x="-24" y="-58.9" antialias="true" height="17.05" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="3" x="32" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="10" x="-26" y="-62" antialias="true" height="23.25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="9" x="-12" y="-71" antialias="true" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="6" x="85" y="28" antialias="true" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="6" x="87" y="-36" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:none;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="-70.9529" x1="56" y2="-47.051" x2="56"/>
-        <rect width="5" x="63" y="-54" antialias="false" height="3" 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:thin;filling:none;color:black" y1="34.8971" x1="64.8" y2="-37.6958" x2="64.8"/>
-        <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="-47" x1="54" y2="-43" x2="54"/>
-        <arc width="10" x="83" y="26" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="6" x="31" y="-36" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:none;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="34.8971" x1="8.8" y2="-37.6958" x2="8.8"/>
-        <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="34.8971" x1="73.8" y2="-37.6958" x2="73.8"/>
-        <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="34.8971" x1="46.8" y2="-37.6958" x2="46.8"/>
-        <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="-47" x1="3" y2="-43" x2="3"/>
-        <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="34.8971" x1="81.6" y2="-37.6958" x2="81.6"/>
-        <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="34.8971" x1="17.8" y2="-37.6958" x2="17.8"/>
-        <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="34.8971" x1="55.8" y2="-37.6958" x2="55.8"/>
-        <rect width="46.8" x="38.4" y="-40.0065" antialias="false" height="78.9029" style="line-style:normal;line-weight:thin;filling:none;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="34.8971" x1="-9.2" y2="-37.6958" x2="-9.2"/>
-        <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="34.8971" x1="60" y2="-37.6958" x2="60"/>
-        <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="34.8971" x1="25.6" y2="-37.6958" x2="25.6"/>
-        <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="34.8971" x1="-0.2" y2="-37.6958" x2="-0.2"/>
-        <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="34.8971" x1="51" y2="-37.6958" x2="51"/>
-        <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="34.8971" x1="69" y2="-37.6958" x2="69"/>
-        <rect width="46.8" x="-17.6" y="-40.0065" antialias="false" height="78.9029" style="line-style:normal;line-weight:thin;filling:none;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="34.8971" x1="78" y2="-37.6958" x2="78"/>
-        <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="34.8971" x1="4" y2="-37.6958" x2="4"/>
-        <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="34.8971" x1="42" y2="-37.6958" x2="42"/>
-        <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="34.8971" x1="-5" y2="-37.6958" x2="-5"/>
-        <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="34.8971" x1="13" y2="-37.6958" x2="13"/>
-        <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="34.8971" x1="22" y2="-37.6958" x2="22"/>
-        <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="-47" x1="56" y2="-43" x2="56"/>
-        <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="34.8971" x1="-14" y2="-37.6958" x2="-14"/>
-        <arc width="9" x="55" y="-71" antialias="true" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="56" x="39" y="44" antialias="false" height="2" style="line-style:normal;line-weight:thin;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="-71" x1="-6.117" y2="-71" x2="59.1267"/>
-        <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="-47" x1="-7.096" y2="-47" x2="59.104"/>
-        <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="-71" x1="-5" y2="-48" x2="-5"/>
-        <rect width="5" x="63" y="-67" antialias="false" height="3" 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="-47" x1="5" y2="-43" x2="5"/>
-        <rect width="3.6" x="46" y="-75.8687" antialias="false" height="4.86869" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.8" x="46.6" y="-77.0859" antialias="false" height="1.21717" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="-26" y="-36" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" x="-23" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="67" x="-28" y="44" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <input x="20" y="-56.5" size="4" rotate="true" text="_L" tagg="label"/>
-        <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="-62" x1="-21" y2="-62" x2="-13"/>
-        <terminal x="69" y="-65.5" orientation="e"/>
-        <terminal x="69" y="-52.5" orientation="e"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon1placa.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon1placa.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon1placa.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,47 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="37" hotspot_y="80" height="130" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3E2ABBFC-472E-40B4-9430-2BA640712E6E}"/><names>
-        <name lang="es">Termosifón solar 1</name>
-	<name lang="en">Solar thermosyphon 1</name>	
-        <name lang="ca">Solar temosifó 1</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="51.6" x="-20" y="-42.9288" antialias="false" height="84.7476" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="3" x="32" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="9" x="-34" y="-71" antialias="true" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="6" x="-23" y="-52" antialias="true" height="11" 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:thin;filling:none;color:black" y1="-70.9529" x1="34" y2="-47.051" x2="34"/>
-        <rect width="5" x="41" y="-54" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="6" x="29" y="28" antialias="true" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="6" x="31" y="-36" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:none;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="34.8971" x1="8.8" y2="-37.6958" x2="8.8"/>
-        <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="-47" x1="25" y2="-43" x2="25"/>
-        <arc width="10" x="27" y="26" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <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="34.8971" x1="17.8" y2="-37.6958" x2="17.8"/>
-        <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="34.8971" x1="-9.2" y2="-37.6958" x2="-9.2"/>
-        <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="34.8971" x1="25.6" y2="-37.6958" x2="25.6"/>
-        <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="34.8971" x1="-0.2" y2="-37.6958" x2="-0.2"/>
-        <rect width="46.8" x="-17.6" y="-40.0065" antialias="false" height="78.9029" style="line-style:normal;line-weight:thin;filling:none;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="34.8971" x1="4" y2="-37.6958" x2="4"/>
-        <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="34.8971" x1="-5" y2="-37.6958" x2="-5"/>
-        <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="34.8971" x1="13" y2="-37.6958" x2="13"/>
-        <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="34.8971" x1="22" y2="-37.6958" x2="22"/>
-        <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="34.8971" x1="-14" y2="-37.6958" x2="-14"/>
-        <arc width="9" x="33" y="-71" antialias="true" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <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="-71" x1="-28.117" y2="-71" x2="37.1267"/>
-        <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="-47" x1="-29.096" y2="-47" x2="37.104"/>
-        <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="-71" x1="-27" y2="-48" x2="-27"/>
-        <rect width="5" x="41" y="-67" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-25" y="-54" antialias="true" height="15" 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="-47" x1="27" y2="-43" x2="27"/>
-        <rect width="3.6" x="24" y="-75.8687" antialias="false" height="4.86869" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.8" x="24.6" y="-77.0859" antialias="false" height="1.21717" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="-26" y="-36" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" x="-23" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="67" x="-28" y="44" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <input x="-2" y="-56.5" size="4" rotate="true" text="_L" tagg="label"/>
-        <terminal x="47" y="-65.5" orientation="e"/>
-        <terminal x="47" y="-52.5" orientation="e"/>
-    </description>
-</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro2.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro2.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro2.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,21 @@
+<definition width="60" type="element" hotspot_x="31" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="43" height="80">
+<uuid uuid="{788236FF-6887-4792-9BEB-D200660DE1BE}"/><names>
+        <name lang="es">Inodoro tanque</name>
+	<name lang="en">Toilet</name>
+        <name lang="ca">Inodor1</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect antialias="false" width="15" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-34" height="30" x="-24"/>
+        <arc antialias="true" width="15" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-38" angle="180" height="7" x="-24"/>
+        <rect antialias="false" width="45" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3" height="5" x="-21"/>
+        <rect antialias="false" width="28" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6" height="2" x="-6"/>
+        <polygon x14="23" x16="23" y16="3" y3="12" x4="-6" y11="11" y6="27" y12="9" y8="23" y15="3" y4="17" x3="-6" y17="3" x7="18" x5="-16" y10="15" x1="-16" y7="27" x11="11" x12="19" y1="2" x2="-16" y13="5" x13="23" style="line-style:normal;line-weight:normal;filling:none;color:black" x8="20" y2="7" y5="22" y14="3" x6="-16" x9="16" y9="17" antialias="false" x10="11" x15="23" closed="false" x17="23"/>
+        <circle antialias="false" diameter="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-32" x="-21"/>
+        <rect antialias="false" width="13" style="line-style:dashed;line-weight:normal;filling:none;color:black" y="22" height="6" x="-14"/>
+        <input tagg="label" rotate="true" y="-20" text="_" x="20" size="5"/>
+        <terminal orientation="w" y="-31" x="-24"/>
+        <terminal orientation="s" y="29" x="-7"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,33 @@
+<definition version="0.5" type="element" height="30" link_type="simple" width="30" hotspot_x="14" hotspot_y="15" orientation="dyyy">
+<uuid uuid="{2CA8D6B7-08EE-425C-9CD6-C774E9E58311}"/><names>
+        <name lang="ca">Unió amb brides</name>
+        <name lang="es">Union con bridas</name>
+        <name lang="fr">Bride PN10</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line x1="3.19405" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-8.06948" length1="1.5" y1="-8.06948" x2="5.91999" antialias="false" end2="none"/>
+        <line x1="9.54917" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.26965" length1="1.5" y1="4.05312" x2="8.68204" antialias="false" end2="none"/>
+        <line x1="-3.86419" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-8.34579" length1="1.5" y1="-8.34579" x2="-0.818505" antialias="false" end2="none"/>
+        <line x1="1.56437" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="8.93155" length1="1.5" y1="8.93155" x2="5.24708" antialias="false" end2="none"/>
+        <line x1="8.393" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.26965" length1="1.5" y1="4.05312" x2="7.52587" antialias="false" end2="none"/>
+        <line x1="-4.05627" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.8759" length1="1.5" y1="3.65949" x2="-5.18501" antialias="false" end2="none"/>
+        <line x1="3.16365" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-10.6154" length1="1.5" y1="-10.6154" x2="5.56438" antialias="false" end2="none"/>
+        <line x1="-4.1183" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="9.0043" length1="1.5" y1="9.0043" x2="-0.596617" antialias="false" end2="none"/>
+        <line x1="6.05438" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2.9504" length1="1.5" y1="4.37236" x2="5.18726" antialias="false" end2="none"/>
+        <line x1="2.01381" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="11.253" length1="1.5" y1="11.253" x2="5.69585" antialias="false" end2="none"/>
+        <line x1="7.21055" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2.9504" length1="1.5" y1="4.37236" x2="6.34343" antialias="false" end2="none"/>
+        <line x1="-3.86419" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-10.6923" length1="1.5" y1="-10.6923" x2="-0.818505" antialias="false" end2="none"/>
+        <rect x="1.12533" height="25.7732" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.706" width="4.03022" antialias="false"/>
+        <rect x="5.18726" height="7.25991" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.88754" width="4.62468" antialias="false"/>
+        <line x1="-4.00353" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="11.4122" length1="1.5" y1="11.4122" x2="-0.696156" antialias="false" end2="none"/>
+        <line x1="-5.56126" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.8759" length1="1.5" y1="3.65949" x2="-6.69" antialias="false" end2="none"/>
+        <line x1="-8.60544" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.54738" length1="1.5" y1="3.988" x2="-9.73417" antialias="false" end2="none"/>
+        <line x1="-7.10045" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3.54738" length1="1.5" y1="3.988" x2="-8.22919" antialias="false" end2="none"/>
+        <rect x="-9.73417" height="7.4707" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.48269" width="6.01996" antialias="false"/>
+        <rect x="-3.57701" height="26.0515" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.8054" width="4.02478" antialias="false"/>
+        <input tagg="label" x="-33" text="Brida a rosca M" rotate="true" size="3" y="24.5"/>
+        <terminal x="-9.80258" y="0.105345" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-viv-retorno.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-viv-retorno.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-viv-retorno.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,24 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="15" hotspot_y="27" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F7015FA9-D3DB-48FF-8406-3138CABCA156}"/><names>
-        <name lang="es">ACS +retorno para vivienda</name>
-	<name lang="en">DHW +return line for house</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <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="-0.332274" x1="3.1904" y2="-0.332274" x2="16.6437"/>
-        <text x="-5" y="7" size="6" text="ret."/>
-        <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.55405" x1="-4.69893" y2="-7.55405" x2="11.8905"/>
-        <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.55405" x1="13.4" y2="1.11208" x2="20.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="5.44515" x1="16.2" y2="-3.22099" x2="26"/>
-        <arc width="16.8" x="9.2" y="-8.99841" antialias="true" height="14.4436" style="line-style:normal;line-weight:normal;filling:none;color:black" start="10" angle="-110"/>
-        <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="-0.332274" x1="28.8" y2="4.00079" x2="38.6"/>
-        <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="8.33386" x1="20.4" y2="17" x2="24.6"/>
-        <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="5.44515" x1="26" y2="12.6669" x2="33"/>
-        <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="2.55644" x1="27.4" y2="6.88951" x2="33"/>
-        <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="6.88951" x1="23.2" y2="12.6669" x2="27.4"/>
-        <text x="-7.6" y="-11.8871" size="6" text="ACS"/>
-        <terminal x="-4.8" y="-7.55405" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-4.8" y="-0.332274" nameHidden="1" number="" name="" orientation="w"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-vivienda.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-vivienda.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-vivienda.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,22 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="7" hotspot_y="25" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{71CE2200-B8F1-4BD4-A5E0-F737A209090A}"/><names>
-        <name lang="es">ACS a consumo</name>
-	<name lang="en">DHW to consume</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <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.7505" x1="-1.80893" y2="-9.7505" x2="10.8764"/>
-        <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.7505" x1="11.5" y2="-1.72091" x2="19"/>
-        <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.29388" x1="14.5" y2="-5.7357" x2="25"/>
-        <arc width="18" x="7" y="-11.0888" antialias="true" height="13.3826" style="line-style:normal;line-weight:normal;filling:none;color:black" start="10" angle="-110"/>
-        <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.05917" x1="28" y2="0.955619" x2="38.5"/>
-        <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="4.97041" x1="19" y2="13" x2="23.5"/>
-        <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="2.29388" x1="25" y2="8.98521" x2="32.5"/>
-        <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="-0.382645" x1="26.5" y2="3.63215" x2="32.5"/>
-        <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.63215" x1="22" y2="8.98521" x2="26.5"/>
-        <text x="-3.5" y="-15.1036" size="5" text="ACS"/>
-        <polygon x4="7" y5="-4" x5="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-2" y2="-4" x2="12" y3="-5" x3="7" y4="-3"/>
-        <terminal x="-2" y="-10" nameHidden="1" number="" name="" orientation="w"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/aerotermo.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/aerotermo.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/aerotermo.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,45 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="33" hotspot_y="23" height="70" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{558C1F38-32E1-436B-B17E-FD53437348EC}"/><names>
-        <name lang="es">Aerotermo</name>
-        <name lang="ca">Aerotermo</name>
-        <name lang="en">air heater</name>
-        <name lang="fr">Aérotherme</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="7.2" x="-29.2" y="33.5166" antialias="false" height="2.43128" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-18.4" y5="-7.00478" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-7.00478" x1="-18.4" y2="-2.95264" x2="-18.4" y3="-2.95264" x3="-15.7" y4="-7.00478"/>
-        <rect width="51.3" x="-18.4" y="-0.874707" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-18.4" y5="-0.52136" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-0.52136" x1="-18.4" y2="3.53078" x2="-18.4" y3="3.53078" x3="-15.7" y4="-0.52136"/>
-        <polygon x4="-18.4" y5="5.96206" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="5.96206" x1="-18.4" y2="10.0142" x2="-18.4" y3="10.0142" x3="-15.7" y4="5.96206"/>
-        <polygon x4="-18.4" y5="25.4123" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="25.4123" x1="-18.4" y2="29.4644" x2="-18.4" y3="29.4644" x3="-15.7" y4="25.4123"/>
-        <polygon x4="-18.4" y5="12.4455" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="12.4455" x1="-18.4" y2="16.4976" x2="-18.4" y3="16.4976" x3="-15.7" y4="12.4455"/>
-        <polygon x4="-18.4" y5="18.9289" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="18.9289" x1="-18.4" y2="22.981" x2="-18.4" y3="22.981" x3="-15.7" y4="18.9289"/>
-        <polygon x4="-18.4" y5="31.8957" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="31.8957" x1="-18.4" y2="35.9479" x2="-18.4" y3="35.9479" x3="-15.7" y4="31.8957"/>
-        <rect width="51.3" x="-18.4" y="25.059" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="51.3" x="-18.4" y="18.7218" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="58.5" x="-22" y="-16.7299" antialias="false" height="56.7299" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="51.3" x="-18.4" y="31.8836" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="51.3" x="-18.4" y="22.1341" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="51.3" x="-18.4" y="12.3847" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="51.3" x="-18.4" y="35.2959" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="51.3" x="-18.4" y="-7.21184" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="51.3" x="-18.4" y="28.4713" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="51.3" x="-18.4" y="5.9499" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="51.3" x="-18.4" y="2.5376" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="51.3" x="-18.4" y="15.797" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="51.3" x="-18.4" y="-3.79954" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="51.3" x="-18.4" y="-13.549" antialias="false" height="3.4123" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="51.3" x="-18.4" y="9.3622" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="51.3" x="-18.4" y="-10.1367" antialias="false" height="1.46242" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="7.2" x="-29.2" y="-12.6778" antialias="false" height="2.43128" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-18.4" y5="-13.4882" x5="-18.4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-13.4882" x1="-18.4" y2="-9.43606" x2="-18.4" y3="-9.43606" x3="-15.7" y4="-13.4882"/>
-        <rect width="3" x="37" y="9" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="44" y5="4" x5="41" y6="5" x6="42" y7="3" x7="44" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="37" y2="4" x2="40" y3="6" x3="39" y4="3"/>
-        <input x="-5" y="45" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="-29.2" y="-11.0569" orientation="w"/>
-        <terminal x="-29.2" y="35.1374" orientation="w"/>
-        <terminal x="41" y="10" orientation="e"/>
-    </description>
-</definition>

Modified: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -3,6 +3,7 @@
         <name lang="es">Captador solar terraza 2</name>
         <name lang="en">Terrace solar capturator 2</name>
         <name lang="ca">Captador solar terrassa 2</name>
+        <name lang="fr">Capteur solaire incliné 2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>

Modified: trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt
===================================================================
--- trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -3,6 +3,7 @@
         <name lang="es">Purgador</name>
         <name lang="en">Purger</name>
         <name lang="ca">Purgador</name>
+        <name lang="fr">Purgeur</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/alimentation_auto.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/alimentation_auto.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/alimentation_auto.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,59 @@
+<definition type="element" link_type="simple" height="100" hotspot_x="66" orientation="dyyy" width="100" hotspot_y="50" version="0.51">
+    <uuid uuid="{c4a413e6-42c9-4478-aee0-ca84e70ff2bc}"/>
+    <names>
+        <name lang="fr">Alimentation automatique</name>
+        <name lang="it">Alimentazione automatica</name>
+    </names>
+    <informations>Baboune41-2016</informations>
+    <description>
+        <polygon y5="14" x7="-30" y1="5" x6="-30" y4="15" y6="15" closed="false" antialias="false" y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" y7="5" x5="-25" x2="-38" y3="15" x3="-38" x4="-25"/>
+        <polygon y5="-27" x7="-33" y1="-23" x6="3" y4="-46" y6="-23" antialias="false" y2="-27" style="line-style:normal;line-weight:normal;filling:lightgray;color:black" x1="-33" y7="-23" x5="-2" x2="-28" y3="-46" x3="-28" x4="-2"/>
+        <rect y="34" height="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" x="-19"/>
+        <text y="-18" size="4" text="0-4 bars" x="-63"/>
+        <input y="-71" size="9" text="_" rotate="true" tagg="label" x="-29"/>
+        <circle y="-25.5" diameter="23" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="8.5"/>
+        <text y="-5.75736" size="3" text="4" rotation="45" x="19.1716"/>
+        <text y="-13.7574" size="3" text="0" rotation="45" x="10.1716"/>
+        <text y="-20.7574" size="3" text="1" rotation="45" x="14.1716"/>
+        <text y="-19.7574" size="3" text="2" rotation="45" x="24.1716"/>
+        <text y="-8.75736" size="3" text="3" rotation="45" x="25.1716"/>
+        <circle y="-15" diameter="2" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" x="19"/>
+        <polygon y1="-19" y4="-19" antialias="false" y2="-13" style="line-style:normal;line-weight:thin;filling:black;color:black" x1="14" x2="20" y3="-14" x3="21" x4="14"/>
+        <circle y="-24.5" diameter="21" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" x="9.5"/>
+        <polygon y5="14" y1="14" y4="34" closed="false" antialias="false" y2="11" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-25" x5="-25" x2="-5" y3="34" x3="-5" x4="-25"/>
+        <rect y="39" height="8" antialias="false" style="line-style:normal;line-weight:thin;filling:lightgray;color:black" width="14" x="-22"/>
+        <line length1="1.5" end2="none" y1="39" length2="1.5" end1="none" antialias="false" y2="47" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-20" x2="-20"/>
+        <line length1="1.5" end2="none" y1="39" length2="1.5" end1="none" antialias="false" y2="47" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-18" x2="-18"/>
+        <line length1="1.5" end2="none" y1="39" length2="1.5" end1="none" antialias="false" y2="47" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-16" x2="-16"/>
+        <line length1="1.5" end2="none" y1="39" length2="1.5" end1="none" antialias="false" y2="47" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-14" x2="-14"/>
+        <line length1="1.5" end2="none" y1="39" length2="1.5" end1="none" antialias="false" y2="47" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-12" x2="-12"/>
+        <line length1="1.5" end2="none" y1="39" length2="1.5" end1="none" antialias="false" y2="47" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-10" x2="-10"/>
+        <line length1="1.5" end2="none" y1="34" length2="1.5" end1="none" antialias="false" y2="39" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-17" x2="-17"/>
+        <line length1="1.5" end2="none" y1="34" length2="1.5" end1="none" antialias="false" y2="39" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-13" x2="-13"/>
+        <rect y="-17" height="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="34" x="-32"/>
+        <rect y="-23" height="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="36" x="-33"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-27" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-28" x2="-2"/>
+        <line length1="1.5" end2="none" y1="-34" length2="1.5" end1="none" antialias="false" y2="-34" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-28" x2="-2"/>
+        <line length1="1.5" end2="none" y1="-34" length2="1.5" end1="none" antialias="false" y2="-28" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" x2="-22"/>
+        <line length1="1.5" end2="none" y1="-34" length2="1.5" end1="none" antialias="false" y2="-28" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-9" x2="-9"/>
+        <line length1="1.5" end2="none" y1="-5" length2="1.5" end1="none" antialias="false" y2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="7"/>
+        <polygon y5="-4" y1="-4" y4="-2" closed="false" antialias="false" y2="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="9" x5="9" x2="11" y3="-4" x3="13" x4="11"/>
+        <polygon y1="-21" y4="-21" antialias="false" y2="-14" style="line-style:normal;line-weight:thin;filling:red;color:black" x1="24" x2="19" y3="-13" x3="20" x4="24"/>
+        <circle y="-15" diameter="2" antialias="false" style="line-style:normal;line-weight:thin;filling:red;color:black" x="19"/>
+        <rect y="5" height="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="7" x="-45"/>
+        <line length1="1.5" end2="none" y1="10" length2="1.5" end1="none" antialias="false" y2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-45" x2="-44"/>
+        <line length1="1.5" end2="none" y1="5" length2="1.5" end1="none" antialias="false" y2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-45" x2="-43"/>
+        <line length1="1.5" end2="none" y1="5" length2="1.5" end1="none" antialias="false" y2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-44" x2="-42"/>
+        <line length1="1.5" end2="none" y1="5" length2="1.5" end1="none" antialias="false" y2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-43" x2="-41"/>
+        <line length1="1.5" end2="none" y1="5" length2="1.5" end1="none" antialias="false" y2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-42" x2="-40"/>
+        <line length1="1.5" end2="none" y1="5" length2="1.5" end1="none" antialias="false" y2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-41" x2="-39"/>
+        <line length1="1.5" end2="none" y1="5" length2="1.5" end1="none" antialias="false" y2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-40" x2="-38"/>
+        <line length1="1.5" end2="none" y1="5" length2="1.5" end1="none" antialias="false" y2="10" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-39" x2="-38"/>
+        <rect y="3" height="14" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" width="9" x="13"/>
+        <line length1="1.5" end2="triangle" y1="0" length2="1.5" end1="none" antialias="false" y2="0" style="line-style:normal;line-weight:hight;filling:none;color:black" x1="-20" x2="-10"/>
+        <polygon y5="15" y1="15" y4="10" closed="false" antialias="false" y2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" x5="-30" x2="-30" y3="-15" x3="0" x4="0"/>
+        <polygon y5="11" x7="0" y1="5" x6="0" y4="15" y6="10" closed="false" antialias="false" y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y7="5" x5="-5" x2="13" y3="15" x3="13" x4="-5"/>
+        <polygon y5="-46" y1="-46" y4="-46" closed="false" antialias="false" y2="-48" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-28" x5="-28" x2="-26" y3="-48" x3="-4" x4="-2"/>
+        <polygon y2="-1" x8="5" antialias="false" y9="5" y5="-1" y4="-6" y6="2" x5="13" x9="0" x1="0" x6="10" y7="2" y3="-3" style="line-style:normal;line-weight:normal;filling:white;color:black" y8="5" x3="5" x4="8" y1="4" x2="5" x7="8"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,40 @@
+<definition hotspot_y="15" type="element" link_type="simple" orientation="dyyy" hotspot_x="24" width="50" height="30" version="0.51">
+    <uuid uuid="{3818ea81-8775-4e7f-b2bc-4b255684d901}"/>
+    <names>
+        <name lang="fr">Clapet anti-retour</name>
+        <name lang="it">Valvola di ritegno</name>
+    </names>
+    <informations>Baboune41-2016
+</informations>
+    <description>
+        <rect style="line-style:normal;line-weight:normal;filling:white;color:black" y="-7" antialias="false" x="13" width="7" height="14"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7" antialias="false" x="-20" width="7" height="14"/>
+        <line y2="-5" x2="-20" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-5" end1="none" length1="1.5" end2="none" x1="-15"/>
+        <line y2="-4" x2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-4" end1="none" length1="1.5" end2="none" x1="20"/>
+        <line y2="3" x2="-15" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="3" end1="none" length1="1.5" end2="none" x1="-20"/>
+        <line y2="4" x2="20" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="4" end1="none" length1="1.5" end2="none" x1="15"/>
+        <input text="_" size="9" y="21" x="-7" tagg="label" rotate="true"/>
+        <arc start="90" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-5" antialias="true" x="-17" angle="-180" width="4" height="8"/>
+        <arc start="270" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-11" antialias="true" x="-17" angle="90" width="4" height="6"/>
+        <arc start="0" style="line-style:normal;line-weight:thin;filling:none;color:black" y="3" antialias="true" x="-17" angle="90" width="4" height="6"/>
+        <arc start="180" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-10" antialias="true" x="13" angle="90" width="4" height="6"/>
+        <arc start="-90" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-4" antialias="true" x="13" angle="-180" width="4" height="8"/>
+        <arc start="90" style="line-style:normal;line-weight:thin;filling:none;color:black" y="4" antialias="true" x="13" angle="90" width="4" height="6"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" antialias="false" x="-13" width="26" height="18"/>
+        <line y2="9" x2="10" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-9" end1="none" length1="1.5" end2="none" x1="10"/>
+        <line y2="-1" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-1" end1="none" length1="1.5" end2="none" x1="-4"/>
+        <line y2="-2" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-1" end1="none" length1="1.5" end2="none" x1="3"/>
+        <line y2="0" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-2" end1="none" length1="1.5" end2="none" x1="7"/>
+        <line y2="2" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="0" end1="none" length1="1.5" end2="none" x1="5"/>
+        <line y2="1" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="2" end1="none" length1="1.5" end2="none" x1="5"/>
+        <line y2="1" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="1" end1="none" length1="1.5" end2="none" x1="3"/>
+        <line y2="-2" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-2" end1="none" length1="1.5" end2="none" x1="5"/>
+        <line y2="2" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="2" end1="none" length1="1.5" end2="none" x1="5"/>
+        <line y2="2" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="1" end1="none" length1="1.5" end2="none" x1="-4"/>
+        <line y2="-2" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-1" end1="none" length1="1.5" end2="none" x1="-4"/>
+        <line y2="0" x2="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-2" end1="none" length1="1.5" end2="none" x1="-4"/>
+        <line y2="2" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="0" end1="none" length1="1.5" end2="none" x1="-7"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="0" x="-20" orientation="w"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,46 @@
+<definition type="element" link_type="simple" height="60" hotspot_x="31" orientation="dyyy" width="50" hotspot_y="42" version="0.51">
+    <uuid uuid="{decde9d7-85ab-4264-83f5-054f46ed5f16}"/>
+    <names>
+        <name lang="es">Valv seg 3/4Hembra</name>
+        <name lang="it">Valvola sicurezza 3/4 F</name>
+        <name lang="cs">Bezpečnostní ventil 3/4"</name>
+        <name lang="fr">Soupape 3 bars</name>
+        <name lang="pl">Zawór bezpieczeństwa 3/4"</name>
+    </names>
+    <informations>Baboune41-2016</informations>
+    <description>
+        <arc y="-36" height="2" start="-180" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="10" x="-5" angle="-180"/>
+        <line length1="1.5" end2="none" y1="-19" length2="1.5" end1="none" antialias="false" y2="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="8" x2="8"/>
+        <line length1="1.5" end2="none" y1="-23" length2="1.5" end1="none" antialias="false" y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-8" x2="-8"/>
+        <line length1="1.5" end2="none" y1="-23" length2="1.5" end1="none" antialias="false" y2="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="7"/>
+        <rect y="0" height="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="14" x="-7"/>
+        <line length1="1.5" end2="none" y1="-17" length2="1.5" end1="none" antialias="false" y2="-17" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="14"/>
+        <line length1="1.5" end2="none" y1="-3" length2="1.5" end1="none" antialias="false" y2="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="14"/>
+        <line length1="1.5" end2="none" y1="-16" length2="1.5" end1="none" antialias="false" y2="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="14"/>
+        <line length1="1.5" end2="none" y1="-19" length2="1.5" end1="none" antialias="false" y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="7"/>
+        <line length1="1.5" end2="none" y1="0" length2="1.5" end1="none" antialias="false" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="7"/>
+        <line length1="1.5" end2="none" y1="0" length2="1.5" end1="none" antialias="false" y2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="7"/>
+        <text y="-21" size="4" text="3 bars" x="-27"/>
+        <input y="-66" size="9" text="_" rotate="true" tagg="label" x="-13"/>
+        <line length1="1.5" end2="none" y1="-17" length2="1.5" end1="none" antialias="false" y2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="5"/>
+        <line length1="1.5" end2="none" y1="-3" length2="1.5" end1="none" antialias="false" y2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="5"/>
+        <arc y="-19" height="2" start="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="2" x="-9" angle="90"/>
+        <line length1="1.5" end2="none" y1="-17" length2="1.5" end1="none" antialias="false" y2="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="-7"/>
+        <arc y="-19" height="2" start="90" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="2" x="7" angle="90"/>
+        <rect y="-36" height="13" antialias="false" style="line-style:normal;line-weight:thin;filling:red;color:black" width="18" x="-9"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="7" x2="7"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="0" x2="0"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="3" x2="3"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-3" x2="-3"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-6" x2="-6"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="6" x2="6"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-7" x2="-7"/>
+        <line length1="1.5" end2="none" y1="10" length2="1.5" end1="none" antialias="false" y2="2" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-3" x2="-3"/>
+        <line length1="1.5" end2="none" y1="10" length2="1.5" end1="none" antialias="false" y2="2" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="3" x2="3"/>
+        <arc y="0.5" height="3" start="90" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4" x="3" angle="90"/>
+        <arc y="0.5" height="3" start="0" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4" x="-7" angle="90"/>
+        <arc y="0.5" height="3" start="-180" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" width="6" x="-3" angle="-180"/>
+        <terminal y="-10" orientation="e" x="14"/>
+        <terminal y="10" orientation="s" x="0"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars_mano.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars_mano.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars_mano.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,57 @@
+<definition type="element" link_type="simple" height="60" hotspot_x="40" orientation="dyyy" width="60" hotspot_y="42" version="0.51">
+    <uuid uuid="{b550a0f1-a852-48ce-a74e-f6c3f0901a19}"/>
+    <names>
+        <name lang="es">Valv seg 3/4Hembra</name>
+        <name lang="it">Valvola sicurezza 3/4 F</name>
+        <name lang="cs">Bezpečnostní ventil 3/4"</name>
+        <name lang="fr">Soupape 3 bars mano</name>
+        <name lang="pl">Zawór bezpieczeństwa 3/4"</name>
+    </names>
+    <informations>Baboune41-2016</informations>
+    <description>
+        <arc y="-36" height="2" start="-180" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="10" x="-5" angle="-180"/>
+        <line length1="1.5" end2="none" y1="-19" length2="1.5" end1="none" antialias="false" y2="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="8" x2="8"/>
+        <line length1="1.5" end2="none" y1="-23" length2="1.5" end1="none" antialias="false" y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-8" x2="-8"/>
+        <line length1="1.5" end2="none" y1="-23" length2="1.5" end1="none" antialias="false" y2="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="7"/>
+        <rect y="0" height="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="14" x="-7"/>
+        <line length1="1.5" end2="none" y1="-17" length2="1.5" end1="none" antialias="false" y2="-17" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="14"/>
+        <line length1="1.5" end2="none" y1="-3" length2="1.5" end1="none" antialias="false" y2="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="14"/>
+        <line length1="1.5" end2="none" y1="-16" length2="1.5" end1="none" antialias="false" y2="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="14"/>
+        <line length1="1.5" end2="none" y1="-19" length2="1.5" end1="none" antialias="false" y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="7"/>
+        <line length1="1.5" end2="none" y1="0" length2="1.5" end1="none" antialias="false" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="7"/>
+        <line length1="1.5" end2="none" y1="0" length2="1.5" end1="none" antialias="false" y2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="7"/>
+        <text y="-27" size="4" text="3 bars" x="-28"/>
+        <input y="-66" size="9" text="_" rotate="true" tagg="label" x="-13"/>
+        <line length1="1.5" end2="none" y1="-17" length2="1.5" end1="none" antialias="false" y2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="5"/>
+        <line length1="1.5" end2="none" y1="-3" length2="1.5" end1="none" antialias="false" y2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="5"/>
+        <arc y="-19" height="2" start="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="2" x="-9" angle="90"/>
+        <line length1="1.5" end2="none" y1="-17" length2="1.5" end1="none" antialias="false" y2="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" x2="-7"/>
+        <arc y="-19" height="2" start="90" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="2" x="7" angle="90"/>
+        <rect y="-36" height="13" antialias="false" style="line-style:normal;line-weight:thin;filling:red;color:black" width="18" x="-9"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="7" x2="7"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="0" x2="0"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="3" x2="3"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-3" x2="-3"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-6" x2="-6"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="6" x2="6"/>
+        <line length1="1.5" end2="none" y1="-27" length2="1.5" end1="none" antialias="false" y2="-36" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-7" x2="-7"/>
+        <line length1="1.5" end2="none" y1="10" length2="1.5" end1="none" antialias="false" y2="2" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-3" x2="-3"/>
+        <line length1="1.5" end2="none" y1="10" length2="1.5" end1="none" antialias="false" y2="2" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="3" x2="3"/>
+        <arc y="0.5" height="3" start="90" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4" x="3" angle="90"/>
+        <arc y="0.5" height="3" start="0" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4" x="-7" angle="90"/>
+        <arc y="0.5" height="3" start="-180" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" width="6" x="-3" angle="-180"/>
+        <circle y="-21.5" diameter="23" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-37.5"/>
+        <rect y="-11" height="3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="3" x="-14"/>
+        <text y="-16" size="3" text="4" rotation="270" x="-21"/>
+        <rect y="-12" height="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="4" x="-11"/>
+        <text y="-2" size="3" text="0" rotation="270" x="-21"/>
+        <text y="-2" size="3" text="1" rotation="270" x="-29"/>
+        <text y="-9" size="3" text="2" rotation="270" x="-32"/>
+        <text y="-15" size="3" text="3" rotation="270" x="-29"/>
+        <circle y="-11" diameter="2" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" x="-27"/>
+        <polygon y1="-6" y4="-6" antialias="false" y2="-11" style="line-style:normal;line-weight:thin;filling:black;color:black" x1="-32" x2="-26" y3="-10" x3="-25" x4="-32"/>
+        <circle y="-20.5" diameter="21" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-36.5"/>
+        <terminal y="-10" orientation="e" x="14"/>
+        <terminal y="10" orientation="s" x="0"/>
+    </description>
+</definition>

Deleted: trunk/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,39 +0,0 @@
-<definition type="element" orientation="dyyy" height="30" hotspot_x="24" hotspot_y="15" version="0.51" width="50" link_type="simple">
-    <uuid uuid="{5602fd65-f7ff-4639-b35b-652fa0e3d8c2}"/>
-    <names>
-        <name lang="fr">Clapet anti-retour</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <polygon antialias="false" x1="-13" y4="9" y5="-9" y1="-9" x4="-13" x3="13" x2="13" x5="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="9" closed="false" y2="-9"/>
-        <polygon antialias="false" x1="-20" y4="7" y6="7" y5="7" y1="7" x4="-13" x6="-20" x3="-13" x2="-20" x5="-20" style="line-style:normal;line-weight:normal;filling:white;color:black" y3="-7" y2="-7"/>
-        <polygon antialias="false" x1="13" y4="7" y6="-7" y5="-7" y1="-7" x4="13" x6="13" x3="20" x7="13" x2="20" x5="13" y7="-7" style="line-style:normal;line-weight:normal;filling:white;color:black" y3="7" y2="-7"/>
-        <line length1="1.5" antialias="false" x1="-15" end1="none" y1="-5" length2="1.5" end2="none" x2="-20" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-5"/>
-        <line length1="1.5" antialias="false" x1="20" end1="none" y1="-4" length2="1.5" end2="none" x2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-4"/>
-        <line length1="1.5" antialias="false" x1="-20" end1="none" y1="3" length2="1.5" end2="none" x2="-15" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3"/>
-        <line length1="1.5" antialias="false" x1="15" end1="none" y1="4" length2="1.5" end2="none" x2="20" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="4"/>
-        <input y="21" x="-7" tagg="label" text="_" rotate="true" size="9"/>
-        <arc height="8" y="-5" angle="-180" antialias="true" x="-17" start="90" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="-11" angle="90" antialias="true" x="-17" start="270" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="3" angle="90" antialias="true" x="-17" start="0" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="-10" angle="90" antialias="true" x="13" start="180" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="8" y="-4" angle="-180" antialias="true" x="13" start="-90" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="4" angle="90" antialias="true" x="13" start="90" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <line length1="1.5" antialias="false" x1="10" end1="none" y1="-9" length2="1.5" end2="none" x2="10" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="9"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="-1" length2="1.5" end2="none" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-1"/>
-        <line length1="1.5" antialias="false" x1="3" end1="none" y1="-1" length2="1.5" end2="none" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2"/>
-        <line length1="1.5" antialias="false" x1="7" end1="none" y1="-2" length2="1.5" end2="none" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="0" length2="1.5" end2="none" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="2" length2="1.5" end2="none" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1"/>
-        <line length1="1.5" antialias="false" x1="3" end1="none" y1="1" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="-2" length2="1.5" end2="none" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="2" length2="1.5" end2="none" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="1" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="-1" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="-2" length2="1.5" end2="none" x2="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0"/>
-        <line length1="1.5" antialias="false" x1="-7" end1="none" y1="0" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <terminal orientation="w" y="0" x="-20"/>
-        <terminal orientation="e" y="0" x="20"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-dmf.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-dmf.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-dmf.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,18 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="25" hotspot_y="39" height="70" link_type="simple" type="element" orientation="dyyy">
-    <names>
-        <name lang="fr">Coude 87°30 PVC 100</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="9" x="-4.5" y="-3" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-1" y="27" size="4" rotate="true" text="87°30 - 100" tagg="label"/>
-        <arc width="56" x="-23" y="-33" antialias="true" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" angle="90"/>
-        <arc width="6" x="2" y="-8" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" 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="-6" x1="8" y2="-20" x2="8"/>
-        <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" x1="8" y2="-20" x2="32"/>
-        <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" x1="33" y2="-6" x2="33"/>
-        <terminal x="-6" y="10" orientation="w"/>
-        <terminal x="20" y="-20.95" orientation="n"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-gmf.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-gmf.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-gmf.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,18 +0,0 @@
-<definition width="70" version="0.4" hotspot_x="39" hotspot_y="35" height="60" link_type="simple" type="element" orientation="dyyy">
-    <names>
-        <name lang="fr">Coude 87°30 PVC 100 MF</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="27" x="-3" y="-14.5" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-11" y="27" size="4" rotate="true" text="87°30 - 100" tagg="label"/>
-        <arc width="56" x="-33" y="-33" antialias="true" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" angle="90"/>
-        <arc width="6" x="-8" y="-8" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" 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" x1="-6" y2="-2" x2="-20"/>
-        <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" x1="-20" y2="23" x2="-20"/>
-        <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="23" x1="-20" y2="23" x2="-6"/>
-        <terminal x="-21" y="10" orientation="w"/>
-        <terminal x="10" y="-15.95" orientation="n"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,17 +0,0 @@
-<definition version="0.51" hotspot_y="41" width="70" height="70" type="element" hotspot_x="30" orientation="dyyy" link_type="simple">
-    <uuid uuid="{8914e6a5-beed-47f1-8f03-108a2ca8cb8d}"/>
-    <names>
-        <name lang="fr">Coude 87°30 PVC 100</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect x="-5" width="9" height="26" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" antialias="false"/>
-        <rect x="7" width="26" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16" antialias="false"/>
-        <input size="4" tagg="label" x="-1.5" text="87°30 - 100" y="26" rotate="true"/>
-        <arc x="-24" angle="90" width="56" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" antialias="true" start="270"/>
-        <arc x="2" angle="90" width="6" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" antialias="true" start="270"/>
-        <terminal x="-5" orientation="w" y="10"/>
-        <terminal x="20" orientation="n" y="-16"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nic_ch4.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nic_ch4.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nic_ch4.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,48 +0,0 @@
-<definition version="0.51" hotspot_y="18" width="200" height="120" type="element" hotspot_x="34" orientation="dyyy" link_type="simple">
-    <uuid uuid="{bdc86f4f-b3a3-4617-884a-13581685e56d}"/>
-    <names>
-        <name lang="fr">Coude 45°  PVC 40 MF</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect x="-7" width="7" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" y="3" antialias="false"/>
-        <input size="4" tagg="label" x="-9" text="45° - 40" y="29" rotate="true"/>
-        <arc x="-16" angle="45" width="32" height="32" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16" antialias="true" start="270"/>
-        <arc x="-4" angle="45" width="8" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" antialias="true" start="270"/>
-        <line y2="-6" y1="3" x1="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="12" antialias="false" length1="1.5"/>
-        <line y2="2" y1="11" x1="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="21" antialias="false" length1="1.5"/>
-        <line y2="-6" y1="2" x1="21" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="12" antialias="false" length1="1.5"/>
-        <line y2="35" y1="45" x1="47" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" end2="none" end1="none" x2="57" antialias="false" length1="1.5"/>
-        <circle x="-15" diameter="30" style="line-style:normal;line-weight:normal;filling:none;color:black" y="40" antialias="false"/>
-        <line y2="58" y1="58" x1="65" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="79" antialias="false" length1="1.5"/>
-        <circle x="88" diameter="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y="13" antialias="false"/>
-        <circle x="68" diameter="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y="58" antialias="false"/>
-        <line y2="70" y1="58" x1="80" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="80" antialias="false" length1="1.5"/>
-        <line y2="70" y1="70" x1="80" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="65" antialias="false" length1="1.5"/>
-        <line y2="43" y1="35" x1="57" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" end2="none" end1="none" x2="65" antialias="false" length1="1.5"/>
-        <line y2="52" y1="43" x1="65" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" end2="none" end1="none" x2="56" antialias="false" length1="1.5"/>
-        <polygon y2="44" x4="151" closed="false" y1="54" y5="54" x1="142" y3="53" x5="142" y4="63" x3="161" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="152" antialias="false"/>
-        <arc x="27.5" angle="45" width="33" height="32" style="line-style:normal;line-weight:normal;filling:none;color:red" y="25" antialias="true" start="270"/>
-        <arc x="40" angle="45" width="8" height="9" style="line-style:normal;line-weight:normal;filling:none;color:red" y="37.5" antialias="true" start="270"/>
-        <arc x="42" angle="90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="45" antialias="true" start="0"/>
-        <arc x="42" angle="90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="57" antialias="true" start="270"/>
-        <line y2="45" y1="45" x1="42" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="35" antialias="false" length1="1.5"/>
-        <line y2="59" y1="45" x1="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="35" antialias="false" length1="1.5"/>
-        <line y2="59" y1="59" x1="43" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="35" antialias="false" length1="1.5"/>
-        <line y2="57" y1="47" x1="44" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="44" antialias="false" length1="1.5"/>
-        <arc x="47.5" angle="45" width="33" height="32" style="line-style:normal;line-weight:normal;filling:none;color:black" y="58" antialias="true" start="90"/>
-        <arc x="59.5" angle="45" width="9" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" y="70" antialias="true" start="90"/>
-        <line y2="72" y1="63" x1="52" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="60" antialias="false" length1="1.5"/>
-        <arc x="50.5" angle="-90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="63" antialias="true" start="-225"/>
-        <arc x="57.5" angle="90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="71" antialias="true" start="315"/>
-        <circle x="-29" diameter="28" style="line-style:normal;line-weight:normal;filling:none;color:black" y="71" antialias="false"/>
-        <line y2="68" y1="64" x1="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="46" antialias="false" length1="1.5"/>
-        <line y2="77" y1="73" x1="59" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="55" antialias="false" length1="1.5"/>
-        <line y2="77" y1="68" x1="46" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="55" antialias="false" length1="1.5"/>
-        <ellipse x="44" width="16" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black" y="63" antialias="false"/>
-        <polygon y2="41" x4="98" closed="false" y1="51" y5="51" x1="90" y3="49" x5="90" y4="59" x3="108" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="100" antialias="false"/>
-        <terminal x="-7" orientation="w" y="10"/>
-        <terminal x="16" orientation="n" y="-3"/>
-    </description>
-</definition>

Deleted: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nicoll_ch6.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nicoll_ch6.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nicoll_ch6.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,19 +0,0 @@
-<definition version="0.51" hotspot_y="50" width="70" height="70" type="element" hotspot_x="23" orientation="dyyy" link_type="simple">
-    <uuid uuid="{9f3eee3e-143f-4702-8cdb-c9fee571f43b}"/>
-    <names>
-        <name lang="fr">Coude 67°30 PVC 100</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect x="1" width="9" height="26" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13" antialias="false"/>
-        <input size="4" tagg="label" x="4" text="67°30 - 100" y="17" rotate="true"/>
-        <arc x="-18" angle="67" width="56" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-44" antialias="true" start="270"/>
-        <arc x="7" angle="67" width="6" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-18" antialias="true" start="270"/>
-        <line y2="-14" y1="-28" x1="19" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="13" antialias="false" length1="1.5"/>
-        <line y2="-5" y1="-19" x1="41" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="36" antialias="false" length1="1.5"/>
-        <line y2="-19" y1="-28" x1="19" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="41" antialias="false" length1="1.5"/>
-        <terminal x="1" orientation="w" y="0"/>
-        <terminal x="30" orientation="n" y="-24"/>
-    </description>
-</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-dmf.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-dmf.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-dmf.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,18 @@
+<definition width="60" version="0.4" hotspot_x="25" hotspot_y="39" height="70" link_type="simple" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Coude 87°30 PVC 100</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect width="9" x="-4.5" y="-3" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-1" y="27" size="4" rotate="true" text="87°30 - 100" tagg="label"/>
+        <arc width="56" x="-23" y="-33" antialias="true" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" angle="90"/>
+        <arc width="6" x="2" y="-8" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" 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="-6" x1="8" y2="-20" x2="8"/>
+        <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" x1="8" y2="-20" x2="32"/>
+        <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" x1="33" y2="-6" x2="33"/>
+        <terminal x="-6" y="10" orientation="w"/>
+        <terminal x="20" y="-20.95" orientation="n"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-gmf.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-gmf.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-gmf.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,18 @@
+<definition width="70" version="0.4" hotspot_x="39" hotspot_y="35" height="60" link_type="simple" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Coude 87°30 PVC 100 MF</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect width="27" x="-3" y="-14.5" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-11" y="27" size="4" rotate="true" text="87°30 - 100" tagg="label"/>
+        <arc width="56" x="-33" y="-33" antialias="true" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" angle="90"/>
+        <arc width="6" x="-8" y="-8" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="270" 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" x1="-6" y2="-2" x2="-20"/>
+        <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" x1="-20" y2="23" x2="-20"/>
+        <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="23" x1="-20" y2="23" x2="-6"/>
+        <terminal x="-21" y="10" orientation="w"/>
+        <terminal x="10" y="-15.95" orientation="n"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,17 @@
+<definition version="0.51" hotspot_y="41" width="70" height="70" type="element" hotspot_x="30" orientation="dyyy" link_type="simple">
+    <uuid uuid="{8914e6a5-beed-47f1-8f03-108a2ca8cb8d}"/>
+    <names>
+        <name lang="fr">Coude 87°30 PVC 100</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect x="-5" width="9" height="26" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" antialias="false"/>
+        <rect x="7" width="26" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16" antialias="false"/>
+        <input size="4" tagg="label" x="-1.5" text="87°30 - 100" y="26" rotate="true"/>
+        <arc x="-24" angle="90" width="56" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" antialias="true" start="270"/>
+        <arc x="2" angle="90" width="6" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" antialias="true" start="270"/>
+        <terminal x="-5" orientation="w" y="10"/>
+        <terminal x="20" orientation="n" y="-16"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/nicoll_ch6.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/nicoll_ch6.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/nicoll_ch6.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,19 @@
+<definition version="0.51" hotspot_y="50" width="70" height="70" type="element" hotspot_x="23" orientation="dyyy" link_type="simple">
+    <uuid uuid="{9f3eee3e-143f-4702-8cdb-c9fee571f43b}"/>
+    <names>
+        <name lang="fr">Coude 67°30 PVC 100</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect x="1" width="9" height="26" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13" antialias="false"/>
+        <input size="4" tagg="label" x="4" text="67°30 - 100" y="17" rotate="true"/>
+        <arc x="-18" angle="67" width="56" height="56" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-44" antialias="true" start="270"/>
+        <arc x="7" angle="67" width="6" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-18" antialias="true" start="270"/>
+        <line y2="-14" y1="-28" x1="19" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="13" antialias="false" length1="1.5"/>
+        <line y2="-5" y1="-19" x1="41" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="36" antialias="false" length1="1.5"/>
+        <line y2="-19" y1="-28" x1="19" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="41" antialias="false" length1="1.5"/>
+        <terminal x="1" orientation="w" y="0"/>
+        <terminal x="30" orientation="n" y="-24"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/qet_directory
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/qet_directory	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/qet_directory	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Raccords PVC 100</name>
+    </names>
+</qet-directory>

Added: trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-40/nic_ch4.elmt
===================================================================
--- trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-40/nic_ch4.elmt	                        (rev 0)
+++ trunk/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-40/nic_ch4.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,48 @@
+<definition version="0.51" hotspot_y="18" width="200" height="120" type="element" hotspot_x="34" orientation="dyyy" link_type="simple">
+    <uuid uuid="{bdc86f4f-b3a3-4617-884a-13581685e56d}"/>
+    <names>
+        <name lang="fr">Coude 45°  PVC 40 MF</name>
+    </names>
+    <informations>Rafael Ferrando.
+Mantenimiento de Instalaciones Térmicas</informations>
+    <description>
+        <rect x="-7" width="7" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" y="3" antialias="false"/>
+        <input size="4" tagg="label" x="-9" text="45° - 40" y="29" rotate="true"/>
+        <arc x="-16" angle="45" width="32" height="32" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16" antialias="true" start="270"/>
+        <arc x="-4" angle="45" width="8" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" antialias="true" start="270"/>
+        <line y2="-6" y1="3" x1="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="12" antialias="false" length1="1.5"/>
+        <line y2="2" y1="11" x1="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="21" antialias="false" length1="1.5"/>
+        <line y2="-6" y1="2" x1="21" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="12" antialias="false" length1="1.5"/>
+        <line y2="35" y1="45" x1="47" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" end2="none" end1="none" x2="57" antialias="false" length1="1.5"/>
+        <circle x="-15" diameter="30" style="line-style:normal;line-weight:normal;filling:none;color:black" y="40" antialias="false"/>
+        <line y2="58" y1="58" x1="65" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="79" antialias="false" length1="1.5"/>
+        <circle x="88" diameter="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y="13" antialias="false"/>
+        <circle x="68" diameter="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y="58" antialias="false"/>
+        <line y2="70" y1="58" x1="80" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="80" antialias="false" length1="1.5"/>
+        <line y2="70" y1="70" x1="80" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="65" antialias="false" length1="1.5"/>
+        <line y2="43" y1="35" x1="57" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" end2="none" end1="none" x2="65" antialias="false" length1="1.5"/>
+        <line y2="52" y1="43" x1="65" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" end2="none" end1="none" x2="56" antialias="false" length1="1.5"/>
+        <polygon y2="44" x4="151" closed="false" y1="54" y5="54" x1="142" y3="53" x5="142" y4="63" x3="161" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="152" antialias="false"/>
+        <arc x="27.5" angle="45" width="33" height="32" style="line-style:normal;line-weight:normal;filling:none;color:red" y="25" antialias="true" start="270"/>
+        <arc x="40" angle="45" width="8" height="9" style="line-style:normal;line-weight:normal;filling:none;color:red" y="37.5" antialias="true" start="270"/>
+        <arc x="42" angle="90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="45" antialias="true" start="0"/>
+        <arc x="42" angle="90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="57" antialias="true" start="270"/>
+        <line y2="45" y1="45" x1="42" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="35" antialias="false" length1="1.5"/>
+        <line y2="59" y1="45" x1="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="35" antialias="false" length1="1.5"/>
+        <line y2="59" y1="59" x1="43" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="35" antialias="false" length1="1.5"/>
+        <line y2="57" y1="47" x1="44" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="44" antialias="false" length1="1.5"/>
+        <arc x="47.5" angle="45" width="33" height="32" style="line-style:normal;line-weight:normal;filling:none;color:black" y="58" antialias="true" start="90"/>
+        <arc x="59.5" angle="45" width="9" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" y="70" antialias="true" start="90"/>
+        <line y2="72" y1="63" x1="52" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="60" antialias="false" length1="1.5"/>
+        <arc x="50.5" angle="-90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="63" antialias="true" start="-225"/>
+        <arc x="57.5" angle="90" width="2" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y="71" antialias="true" start="315"/>
+        <circle x="-29" diameter="28" style="line-style:normal;line-weight:normal;filling:none;color:black" y="71" antialias="false"/>
+        <line y2="68" y1="64" x1="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="46" antialias="false" length1="1.5"/>
+        <line y2="77" y1="73" x1="59" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="55" antialias="false" length1="1.5"/>
+        <line y2="77" y1="68" x1="46" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" end1="none" x2="55" antialias="false" length1="1.5"/>
+        <ellipse x="44" width="16" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black" y="63" antialias="false"/>
+        <polygon y2="41" x4="98" closed="false" y1="51" y5="51" x1="90" y3="49" x5="90" y4="59" x3="108" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="100" antialias="false"/>
+        <terminal x="-7" orientation="w" y="10"/>
+        <terminal x="16" orientation="n" y="-3"/>
+    </description>
+</definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/qet_directory
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/qet_directory	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/qet_directory	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,7 +1,7 @@
 <qet-directory>
     <names>
         <name lang="de">Grundschema</name>
-        <name lang="fr">schema de base</name>
+        <name lang="fr">Schéma de base</name>
         <name lang="ar">مُخططات أساسية</name>
         <name lang="en">Basic scheme</name>
         <name lang="cs">Základní nákres</name>

Deleted: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,29 +0,0 @@
-<definition width="30" hotspot_x="16" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="8">
-    <uuid uuid="{072b6cfb-fa19-4412-a137-dd531e9e8d67}"/>
-    <names>
-        <name lang="cs">Baterie</name>
-        <name lang="pl">Bateria</name>
-        <name lang="it">Rubinetto</name>
-        <name lang="en">Faucet</name>
-        <name lang="nl">Tappunt</name>
-        <name lang="ar">حنفيّة</name>
-        <name lang="fr">Robinet de Puisage</name>
-        <name lang="es">Grifo</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input tagg="label" rotate="true" size="9" y="-5.45" x="10" text="_"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-1" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1" x1="-10" x2="1"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-10" x2="0"/>
-        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="0" x="-6" height="4"/>
-        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="-0.8" x="-5" height="5.6"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="5" x2="4"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3" x1="-1" x2="3"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1" x1="1" x2="1"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="8" x2="9"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="7" x2="7"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="6" x2="6"/>
-        <terminal y="0" x="-10" orientation="w"/>
-    </description>
-</definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,12 +1,12 @@
 <qet-directory>
     <names>
         <name lang="de">Ausdehnungstechnik</name>
-        <name lang="fr">accesoire</name>
-        <name lang="en">accesories</name>
+        <name lang="fr">Accessoires</name>
+        <name lang="en">Accesories</name>
         <name lang="ar">توسعة و صمّامات</name>
         <name lang="pl">Naczynia i zawory</name>
         <name lang="cs">Nádoby a uzávěry</name>
         <name lang="it">Vasi di espansione</name>
-        <name lang="nl">accesoires</name>
+        <name lang="nl">Accesoires</name>
     </names>
 </qet-directory>

Added: trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois.elmt	                        (rev 0)
+++ trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,53 @@
+<definition hotspot_y="73" type="element" link_type="simple" orientation="dyyy" hotspot_x="44" width="90" height="140" version="0.51">
+    <uuid uuid="{9667ecbe-c332-4559-b3aa-55a63b18d405}"/>
+    <names>
+        <name lang="fr">Chaudière Bois</name>
+        <name lang="pl">Kocioł</name>
+        <name lang="nl">boiler hout</name>
+        <name lang="cs">Kotel na dřevo</name>
+        <name lang="el">Καυστήρας ξύλου</name>
+        <name lang="it">Caldaia a legna</name>
+        <name lang="en">Wood boiler</name>
+        <name lang="ar">مرجل خشب</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+Baboune41-2016
+modifications</informations>
+    <description>
+        <rect style="line-style:normal;line-weight:normal;filling:lightgray;color:black" y="-2" antialias="false" x="-31" width="62" height="17"/>
+        <polygon y2="-65" x2="20" style="line-style:normal;line-weight:normal;filling:lightgray;color:black" x7="21" x3="20" y5="-65" antialias="false" y1="-64" x4="25" y4="-67" y3="-67" x6="24" y6="-64" x5="25" x1="21" y7="-64"/>
+        <polygon x3="27" y8="-48" antialias="true" y6="-46" style="line-style:normal;line-weight:normal;filling:lightgray;color:black" x6="29" x2="-29" x1="-29" x7="27" y5="-6" y7="-46" x9="-29" x4="27" y4="-6" x8="27" x5="29" y3="-4" y1="-48" y2="-4" y9="-48"/>
+        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" y="-60" antialias="false" x="-35" width="70" height="10"/>
+        <circle style="line-style:normal;line-weight:thin;filling:white;color:black" y="-58.6056" antialias="true" x="-23.6056" diameter="7.2111"/>
+        <input text="_" size="9" y="-116" x="-8" tagg="label" rotate="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-60" antialias="false" x="-35" width="70" height="120"/>
+        <line y2="50" x2="40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="50" end1="none" length1="1.5" end2="circle" x1="35"/>
+        <line y2="-40" x2="40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="-40" end1="none" length1="1.5" end2="circle" x1="35"/>
+        <line y2="50" x2="-36" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="50" end1="circle" length1="1.5" end2="none" x1="-40"/>
+        <line y2="-40" x2="-40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="-40" end1="none" length1="1.5" end2="circle" x1="-35"/>
+        <circle style="line-style:normal;line-weight:normal;filling:white;color:black" y="-31" antialias="true" x="-5" diameter="10"/>
+        <circle style="line-style:normal;line-weight:normal;filling:orange;color:black" y="-28.5" antialias="true" x="-2.5" diameter="5"/>
+        <line y2="-55" x2="-19" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-55" end1="none" length1="1.5" end2="none" x1="-18"/>
+        <line y2="-55" x2="-21" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-55" end1="none" length1="1.5" end2="none" x1="-22"/>
+        <line y2="-56" x2="-20" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-57" end1="none" length1="1.5" end2="none" x1="-20"/>
+        <polygon x3="25" y8="19" antialias="true" y6="21" style="line-style:normal;line-weight:normal;filling:lightgray;color:black" x6="27" x2="-27" x1="-27" x7="25" y5="54" y7="21" x9="-26" x4="25" y4="54" x8="25" x5="27" y3="56" y1="19" y2="56" y9="19"/>
+        <line y2="-61" x2="39" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="-66" end1="none" length1="1.5" end2="circle" x1="13"/>
+        <polygon closed="false" x12="21" y14="-62" x3="25" y8="-67" x14="20" antialias="false" y6="-64" x17="21" style="line-style:normal;line-weight:normal;filling:none;color:black" y16="-61" x10="20" x6="24" x16="21" x2="24" x1="24" x7="25" y5="-63" x11="21" y7="-65" x9="20" x4="25" y4="-63" y10="-65" x15="21" x8="25" y17="-61" x5="24" y11="-64" y3="-62" y12="-63" y15="-62" y1="-60" y13="-63" y2="-62" x13="20" y9="-67"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:gray;color:black" y="-32" antialias="true" x="-26" width="2" height="15"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" y="46.5858" antialias="true" x="14.5858" diameter="2.82843"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="43.5" antialias="true" x="-4.5" width="9" height="3"/>
+        <polygon y2="50" x2="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="18" y5="40" antialias="false" y1="40" x4="17" y4="40" y3="50" x5="-17" x1="-17"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="17" antialias="false" x="-29" width="58" height="41"/>
+        <line y2="-2" x2="30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="-2" end1="none" length1="1.5" end2="none" x1="-31"/>
+        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" y="-50" antialias="false" x="-35" width="4" height="110"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:gray;color:black" y="29" antialias="true" x="-25" width="2" height="15"/>
+        <line y2="15" x2="30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="15" end1="none" length1="1.5" end2="none" x1="-31"/>
+        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" y="-50" antialias="false" x="31" width="4" height="110"/>
+        <line y2="47" x2="16" style="line-style:dashed;line-weight:normal;filling:none;color:black" antialias="true" length2="1.5" y1="-60" end1="none" length1="1.5" end2="none" x1="37"/>
+        <terminal y="-40" x="-40" orientation="w"/>
+        <terminal y="50" x="40" orientation="e"/>
+        <terminal y="50" x="-40" orientation="w"/>
+        <terminal y="-40" x="40" orientation="e"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_fioul.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_fioul.elmt	                        (rev 0)
+++ trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_fioul.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,47 @@
+<definition hotspot_y="65" type="element" link_type="simple" orientation="dyyy" hotspot_x="44" width="90" height="130" version="0.51">
+    <uuid uuid="{704bd575-bf5b-42ef-92ee-d3a2af3945a5}"/>
+    <names>
+        <name lang="fr">Chaudière Fioul</name>
+        <name lang="it">Caldaia a gasolio</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license.
+Baboune41-2016
+Modifications
+</informations>
+    <description>
+        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" y="-60" antialias="false" x="-35" width="70" height="120"/>
+        <circle style="line-style:normal;line-weight:normal;filling:white;color:black" y="-53.6056" antialias="true" x="-1.3945" diameter="7.2111"/>
+        <circle style="line-style:normal;line-weight:normal;filling:lightgray;color:black" y="48.5858" antialias="true" x="-23.4142" diameter="2.82843"/>
+        <circle style="line-style:normal;line-weight:normal;filling:lightgray;color:black" y="21.5858" antialias="true" x="-23.4142" diameter="2.82843"/>
+        <line y2="-50" x2="3.2111" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-50" end1="none" length1="1.5" end2="none" x1="4.2111"/>
+        <circle style="line-style:normal;line-weight:normal;filling:lightgray;color:black" y="48.5858" antialias="true" x="20.5858" diameter="2.82843"/>
+        <circle style="line-style:normal;line-weight:normal;filling:lightgray;color:black" y="21.5858" antialias="true" x="20.5858" diameter="2.82843"/>
+        <input text="_" size="9" y="0.55" x="43" tagg="label" rotate="true"/>
+        <line y2="-50" x2="1.2111" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-50" end1="none" length1="1.5" end2="none" x1="0.2111"/>
+        <line y2="-51" x2="2.2111" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-52" end1="none" length1="1.5" end2="none" x1="2.2111"/>
+        <line y2="50" x2="40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="50" end1="none" length1="1.5" end2="circle" x1="35"/>
+        <line y2="-30" x2="40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="-30" end1="none" length1="1.5" end2="circle" x1="35"/>
+        <circle style="line-style:normal;line-weight:normal;filling:white;color:black" y="-53.6056" antialias="true" x="-23.6056" diameter="7.2111"/>
+        <line y2="50" x2="-36" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="50" end1="circle" length1="1.5" end2="none" x1="-40"/>
+        <line y2="-30" x2="-40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" y1="-30" end1="none" length1="1.5" end2="circle" x1="-35"/>
+        <line y2="-50" x2="-19" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-50" end1="none" length1="1.5" end2="none" x1="-18"/>
+        <line y2="-50" x2="-21" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-50" end1="none" length1="1.5" end2="none" x1="-22"/>
+        <line y2="-51" x2="-20" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-52" end1="none" length1="1.5" end2="none" x1="-20"/>
+        <rect style="line-style:normal;line-weight:normal;filling:yellow;color:black" y="26" antialias="false" x="-15" width="30" height="25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:red;color:black" y="29.5858" antialias="true" x="8.5858" diameter="2.82843"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="39.5" antialias="true" x="-1.75" diameter="3"/>
+        <polygon x3="25" y8="19" antialias="true" y6="21" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="27" x2="-27" x1="-27" x7="27" y5="54" y7="19" x9="-26" x4="27" y4="56" x8="25" x5="27" y3="56" y1="19" y2="56" y9="19"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="17" antialias="false" x="-29" width="58" height="41"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-60" antialias="false" x="-35" width="70" height="20"/>
+        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" y="-40" antialias="false" x="-35" width="4" height="100"/>
+        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" y="-40" antialias="false" x="31" width="4" height="100"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" antialias="false" x="-29" width="58" height="45"/>
+        <rect style="line-style:normal;line-weight:normal;filling:lightgray;color:black" y="-55" antialias="false" x="15" width="15" height="10"/>
+        <line y2="34" x2="14" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="34" end1="none" length1="1.5" end2="none" x1="-15"/>
+        <terminal y="50" x="40" orientation="e"/>
+        <terminal y="-30" x="-40" orientation="w"/>
+        <terminal y="-30" x="40" orientation="e"/>
+        <terminal y="50" x="-40" orientation="w"/>
+    </description>
+</definition>

Added: trunk/elements/60_energy/31_solar_thermal/productions/vase_ferme.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/productions/vase_ferme.elmt	                        (rev 0)
+++ trunk/elements/60_energy/31_solar_thermal/productions/vase_ferme.elmt	2019-06-15 21:18:41 UTC (rev 5921)
@@ -0,0 +1,36 @@
+<definition type="element" width="50" link_type="simple" height="70" orientation="dyyy" hotspot_y="35" version="0.51" hotspot_x="25">
+    <uuid uuid="{9c969a20-39c9-470a-a398-0aa20948a3c6}"/>
+    <names>
+        <name lang="en">Heating Vase </name>
+        <name lang="nl">Expansie tank</name>
+        <name lang="fr">Vase Chauffage 50L</name>
+        <name lang="pl">Naczynie wzbiorcze</name>
+        <name lang="it">Vaso di espansione 50L</name>
+        <name lang="ar">إناء تسخين 02</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+Baboune41-2016
+Modifications</informations>
+    <description>
+        <line y2="-25" y1="-24" x1="-2" end2="none" x2="2" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <polygon y2="-28" y3="-28" x3="2" x4="2" y1="-24" x1="-2" x2="-2" y5="-24" x5="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y4="-24"/>
+        <ellipse width="40" height="15" style="line-style:normal;line-weight:thin;filling:red;color:none" antialias="false" x="-20" y="-24.5"/>
+        <rect width="40" height="17" style="line-style:normal;line-weight:thin;filling:red;color:none" antialias="false" x="-20" y="-17"/>
+        <rect width="40" height="20" style="line-style:normal;line-weight:thin;filling:red;color:none" antialias="false" x="-20" y="0"/>
+        <ellipse width="40" height="15" style="line-style:normal;line-weight:thin;filling:red;color:none" antialias="false" x="-20" y="12.5"/>
+        <polygon y2="3" y3="3" x3="3" x4="0" y1="0" x1="0" x2="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y4="0"/>
+        <input tagg="label" text="50L" size="7" x="-11" y="44.5" rotate="true"/>
+        <line y2="20" y1="-17" x1="20" end2="none" x2="20" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true"/>
+        <line y2="20" y1="-17" x1="-20" end2="none" x2="-20" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true"/>
+        <arc width="40" start="-180" height="15" angle="-180" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" x="-20" y="-24.5"/>
+        <arc width="40" start="0" height="15" angle="-180" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" x="-20" y="12.5"/>
+        <line y2="30" y1="28" x1="0" end2="none" x2="0" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <rect width="1" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-0.5" y="29"/>
+        <line y2="0" y1="0" x1="-20" end2="none" x2="20" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <line y2="-28" y1="-27" x1="-2" end2="none" x2="2" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <line y2="-27" y1="-26" x1="-2" end2="none" x2="2" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <line y2="-26" y1="-25" x1="-2" end2="none" x2="2" end1="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <terminal orientation="n" x="0" y="-28"/>
+    </description>
+</definition>

Modified: trunk/elements/60_energy/31_solar_thermal/vanne/qet_directory
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/vanne/qet_directory	2019-06-13 14:39:02 UTC (rev 5920)
+++ trunk/elements/60_energy/31_solar_thermal/vanne/qet_directory	2019-06-15 21:18:41 UTC (rev 5921)
@@ -1,7 +1,7 @@
 <qet-directory>
     <names>
         <name lang="de">Ventile</name>
-        <name lang="fr">vannes clapets soupapes</name>
+        <name lang="fr">Vannes clapets soupapes</name>
         <name lang="en">Valves</name>
         <name lang="es">Válvulas</name>
         <name lang="ar">صمّامات</name>


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/