[qet] [4179] Add tag label

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


Revision: 4179
Author:   scorpio810
Date:     2015-08-29 23:09:52 +0200 (Sat, 29 Aug 2015)
Log Message:
-----------
Add tag label

Modified Paths:
--------------
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_01.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_02.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combine_01.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combiner_ecs_01.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_demi_strat.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_elec.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_horizon_01.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_stock1000l.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_strat_ecs.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/echangeur_plaque.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_chauffant_01.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_radian.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/plancher_chauffant_01.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/radiateur_01.elmt
    trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/sksw-0.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_chicane-plus.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_combiner_ecs.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_double_enveloppe.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_echang_plaque.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_vanne.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/chicane.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/direct.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_chauffage.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_ecs.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/echangeur.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/indirecte.elmt
    trunk/elements/60_energy/31_solar_thermal/base_distrib/semi-direct_bis.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/circulateur_sanitaire.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumuls_elec_01.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumulus_elec_2.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01d.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01g.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_sanitaire.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/douche.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/eau_ville.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/ecs_robinet.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro-vanne3v.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro_vanne2v_01.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_01.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_02.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_03.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_thermostatique.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_plaques.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_tubulaire.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauffeur_ecs.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_melangeur_01.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt
    trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_tournant_boulle_01.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/bouteille_guy_delsol.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/event_01.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01d.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01g.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/manometre_01.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/purgeur.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01d.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01g.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/termovar.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_rond_01.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_vertical_01.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_01d.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_03.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_1g.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3d.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3g.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_01.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_02.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_03.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_01.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_02.elmt
    trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vidange.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_reversible_01.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_01.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_clapet_01.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/debimetre_helice_01.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_01.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_02.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/pompe_01.elmt
    trunk/elements/60_energy/31_solar_thermal/pompe/pompe_clapet_01.elmt
    trunk/elements/60_energy/31_solar_thermal/productions/cap_thersolaire.elmt
    trunk/elements/60_energy/31_solar_thermal/productions/capteur_tubes_01.elmt
    trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois_01.elmt
    trunk/elements/60_energy/31_solar_thermal/productions/poele_01.elmt
    trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90.elmt
    trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90_grandrayon.elmt
    trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/cumulus2.elmt
    trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/te_droit.elmt
    trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/te_oblique.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/diametre_01.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/entre_ef_ecs.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche2.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche3.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche4.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche_3voies_01.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche_3voies_02.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche_3voies_03.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche_3voies_04.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/fleche_fluide.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/flechedroite.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/percement.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/percement_murale_01.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/percement_plancher_01.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/sens3voies.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/sortie_ecs.elmt
    trunk/elements/60_energy/31_solar_thermal/signaletiques/vanne_3v_secteur.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/clap_anti-retour_simple.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/clap_antiretour_bille.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/clapet_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/clapet_02.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/clapet_03.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/clapet_pompe.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/filtre_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/soupape-diff.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/soupape_capteur_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/soupape_thermique_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/te_reglage_couder_01d.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/te_reglage_couder_01g.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/te_reglage_droit_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne-arret.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne2.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne2voies_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne3.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne3voies_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne_3v_a_secteur_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_debimetre_01.elmt
    trunk/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_ta_01.elmt

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,48 +1,49 @@
-<definition width="150" version="0.3" hotspot_x="75" hotspot_y="120" height="260" type="element" orientation="dyyy">
-<uuid uuid="{4919CDB8-77FD-49BA-A104-105D4D439B53}"/><names>
-        <name lang="ar">بالون مُبادل نسخة 1</name>
-        <name lang="en">Balloon version 1</name>
-        <name lang="fr">ballon version 1</name>
+<definition width="130" hotspot_x="63" type="element" link_type="simple" orientation="dyyy" version="0.5" height="250" hotspot_y="115">
+    <uuid uuid="{b20fe177-7722-4658-b9a6-a9e0cf41efb2}"/>
+    <names>
+        <name lang="cs">Zásobnik s výměníkem 1</name>
         <name lang="pl">Zasobnik z wymiennikiem 1</name>
-        <name lang="cs">Zásobnik s výměníkem 1</name>
         <name lang="it">Scambiatore di calore</name>
+        <name lang="en">Balloon version 1</name>
         <name lang="nl">Boiler 1</name>
+        <name lang="ar">بالون مُبادل نسخة 1</name>
+        <name lang="fr">ballon version 1</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="120" x="-58.125" y="-93.25" antialias="true" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="120" x="-58" y="-111.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="-51.5" y="88.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <circle x="-1.5" y="118.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <circle x="-1.5" y="-111.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <circle x="-51.5" y="-81.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-75" x1="53" y2="-75" x2="59"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55" x1="53" y2="-55" x2="59"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="53" y2="-14" x2="59"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="53" y2="6" x2="59"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="53" y2="26" x2="59"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="86" x1="53" y2="86" x2="59"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="105" x1="59" y2="105" x2="53"/>
-        <polygon x4="-30" y5="20" x5="46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="80" x1="46" y2="70" x2="-30" y3="50" x3="30" y4="30"/>
-        <polygon x4="-30" y5="0" x5="46" y6="0" x6="46" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-60" x1="46" y2="-50" x2="-30" y3="-30" x3="30" y4="-10"/>
-        <circle x="46.125" y="-84" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.25" y="-3.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.25" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.125" y="-64" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.25" y="-23.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <input x="-55" y="6" size="7" rotate="true" text="  Ballon&#xa;Echangeurs"/>
-        <circle x="46.25" y="76.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <polygon x4="41.875" y5="120.75" x5="41.875" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="56.875" y2="130.75" x2="56.875" y3="130.75" x3="41.875" y4="120.75"/>
-        <polygon x4="-38.125" y5="120.75" x5="-38.125" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="-53.125" y2="130.75" x2="-53.125" y3="130.75" x3="-38.125" y4="120.75"/>
-        <arc width="120" x="-58.125" y="89.25" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="46.25" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <terminal x="50" y="100" orientation="e"/>
-        <terminal x="50" y="0" orientation="e"/>
-        <terminal x="50" y="80" orientation="e"/>
-        <terminal x="50" y="20" orientation="e"/>
-        <terminal x="50" y="-80" orientation="e"/>
-        <terminal x="50" y="-60" orientation="e"/>
-        <terminal x="50" y="-20" orientation="e"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-93.25" x="-58.125" height="201"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-111.5" x="-58" height="36"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="88.5" x="-51.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="118.5" x="-1.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="-111.5" x="-1.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="-81.5" x="-51.5"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-75" x1="53" x2="59"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-55" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="-55" x1="53" x2="59"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="-14" x1="53" x2="59"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6" x1="53" x2="59"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="26" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="26" x1="53" x2="59"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="86" antialias="false" length2="1.5" end1="none" length1="1.5" y1="86" x1="53" x2="59"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="105" antialias="false" length2="1.5" end1="none" length1="1.5" y1="105" x1="59" x2="53"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="70" x4="-30" antialias="false" y5="20" y1="80" x1="46" closed="false" x3="30" y3="50" y4="30" x2="-30" x5="46"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-50" x4="-30" x6="46" antialias="true" y6="0" y5="0" y1="-60" x1="46" closed="false" x3="30" y3="-30" y4="-10" x2="-30" x5="46"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-84" x="46.125"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-3.75" x="46.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="16.25" x="46.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-64" x="46.125"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-23.75" x="46.25"/>
+        <input tagg="label" rotate="true" size="7" y="6" x="-55" text="  Ballon&#xa;Echangeurs"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="76.25" x="46.25"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="130.75" x4="41.875" antialias="true" y5="120.75" y1="115.75" x1="56.875" x3="41.875" y3="130.75" y4="120.75" x2="56.875" x5="41.875"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="130.75" x4="-38.125" antialias="true" y5="120.75" y1="115.75" x1="-53.125" x3="-38.125" y3="130.75" y4="120.75" x2="-53.125" x5="-38.125"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="89.25" x="-58.125" height="36"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="96.25" x="46.25"/>
+        <terminal y="100" x="50" orientation="e"/>
+        <terminal y="0" x="50" orientation="e"/>
+        <terminal y="80" x="50" orientation="e"/>
+        <terminal y="20" x="50" orientation="e"/>
+        <terminal y="-80" x="50" orientation="e"/>
+        <terminal y="-60" x="50" orientation="e"/>
+        <terminal y="-20" x="50" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_02.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_02.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_02.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,48 +1,49 @@
-<definition width="150" version="0.3" hotspot_x="75" hotspot_y="120" height="260" type="element" orientation="dyyy">
-<uuid uuid="{12EA1D7B-1CBF-4BCE-9C1E-43688277A546}"/><names>
-        <name lang="ar">بالون مبادل نسخة 2</name>
-        <name lang="en">balloon version 2</name>
-        <name lang="fr">ballon version 2</name>
+<definition width="130" hotspot_x="63" type="element" link_type="simple" orientation="dyyy" version="0.5" height="250" hotspot_y="115">
+    <uuid uuid="{880fb144-6d02-4b12-8979-41cfc75806b7}"/>
+    <names>
+        <name lang="cs">Zásobnik s výměníkem 2</name>
         <name lang="pl">Zasobnik z wymiennikiem 2</name>
-        <name lang="cs">Zásobnik s výměníkem 2</name>
         <name lang="it">Scambiatore di calore</name>
+        <name lang="en">balloon version 2</name>
         <name lang="nl">Boiler 2</name>
+        <name lang="ar">بالون مبادل نسخة 2</name>
+        <name lang="fr">ballon version 2</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="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="105" x1="-57" y2="105" x2="-51"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28" x1="-55" y2="28" x2="-49"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="-56" y2="-53" x2="-50"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-55" y2="-13" x2="-49"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-56" y2="7" x2="-50"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="86" x1="-55" y2="86" x2="-49"/>
-        <rect width="120" x="-58" y="-94" antialias="true" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-74" x1="-56" y2="-74" x2="-50"/>
-        <circle x="-1.5" y="118.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <circle x="-1.5" y="-111.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <circle x="48.5" y="89.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <circle x="49.5" y="-81.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <polygon x4="30" y5="80" x5="-46" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-46" y2="30" x2="30" y3="50" x3="-31" y4="70"/>
-        <polygon x4="30" y5="0" x5="-47" y6="0" x6="-46" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-60" x1="-46" y2="-50" x2="29" y3="-30" x3="-30" y4="-11"/>
-        <arc width="120" x="-58" y="-112.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="-53.75" y="-83.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-53.875" y="-4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-53.75" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-53.75" y="-63.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-53.75" y="-23.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <input x="-2" y="9" size="7" rotate="true" text="  Ballon&#xa;Echangeurs"/>
-        <circle x="-53.75" y="76.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <polygon x4="41.875" y5="120.75" x5="41.875" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="56.875" y2="130.75" x2="56.875" y3="130.75" x3="41.875" y4="120.75"/>
-        <polygon x4="-38.125" y5="120.75" x5="-38.125" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="-53.125" y2="130.75" x2="-53.125" y3="130.75" x3="-38.125" y4="120.75"/>
-        <arc width="120" x="-58.125" y="89.25" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="-53.75" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <terminal x="-50" y="100" orientation="w"/>
-        <terminal x="-50" y="0" orientation="w"/>
-        <terminal x="-50" y="80" orientation="w"/>
-        <terminal x="-50" y="20" orientation="w"/>
-        <terminal x="-50" y="-80" orientation="w"/>
-        <terminal x="-50" y="-60" orientation="w"/>
-        <terminal x="-50" y="-20" orientation="w"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="105" antialias="false" length2="1.5" end1="none" length1="1.5" y1="105" x1="-57" x2="-51"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="28" antialias="false" length2="1.5" end1="none" length1="1.5" y1="28" x1="-55" x2="-49"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-53" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-53" x1="-56" x2="-50"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="-13" x1="-55" x2="-49"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="7" x1="-56" x2="-50"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="86" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="86" x1="-55" x2="-49"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-94" x="-58" height="201"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-74" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="-74" x1="-56" x2="-50"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="118.5" x="-1.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="-111.5" x="-1.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="89.5" x="48.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="3" y="-81.5" x="49.5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="30" x4="30" antialias="true" y5="80" y1="20" x1="-46" closed="false" x3="-31" y3="50" y4="70" x2="30" x5="-46"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-50" x4="30" x6="-46" antialias="true" y6="0" y5="0" y1="-60" x1="-46" closed="false" x3="-30" y3="-30" y4="-11" x2="29" x5="-47"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-112.5" x="-58" height="36"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-83.75" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-4" x="-53.875"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="16.25" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-63.75" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-23.75" x="-53.75"/>
+        <input tagg="label" rotate="true" size="7" y="9" x="-2" text="  Ballon&#xa;Echangeurs"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="76.25" x="-53.75"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="130.75" x4="41.875" antialias="true" y5="120.75" y1="115.75" x1="56.875" x3="41.875" y3="130.75" y4="120.75" x2="56.875" x5="41.875"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="130.75" x4="-38.125" antialias="true" y5="120.75" y1="115.75" x1="-53.125" x3="-38.125" y3="130.75" y4="120.75" x2="-53.125" x5="-38.125"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="89.25" x="-58.125" height="36"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="96.25" x="-53.75"/>
+        <terminal y="100" x="-50" orientation="w"/>
+        <terminal y="0" x="-50" orientation="w"/>
+        <terminal y="80" x="-50" orientation="w"/>
+        <terminal y="20" x="-50" orientation="w"/>
+        <terminal y="-80" x="-50" orientation="w"/>
+        <terminal y="-60" x="-50" orientation="w"/>
+        <terminal y="-20" x="-50" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combine_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combine_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combine_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,102 +1,103 @@
-<definition width="150" version="0.3" hotspot_x="75" hotspot_y="75" height="260" type="element" orientation="dyyy">
-<uuid uuid="{98607478-57B2-42B0-BC1A-A65C4339F40E}"/><names>
-        <name lang="ar">بالون جامع 1000 ل</name>
-        <name lang="en">Combined ball 1000L</name>
-        <name lang="fr">Ballon Combiné 1000L</name>
+<definition width="130" hotspot_x="65" type="element" link_type="simple" orientation="dyyy" version="0.5" height="250" hotspot_y="70">
+    <uuid uuid="{ea6d140d-f082-4324-9116-e6726f74cfd7}"/>
+    <names>
+        <name lang="cs">Kombinovaný zásobnik 1000L</name>
         <name lang="pl">Zasobnik kombinowany 1000L</name>
-        <name lang="cs">Kombinovaný zásobnik 1000L</name>
         <name lang="it">Scambiatore combinato 1000L</name>
+        <name lang="en">Combined ball 1000L</name>
         <name lang="nl">Boiler combinatie 1000L</name>
+        <name lang="ar">بالون جامع 1000 ل</name>
+        <name lang="fr">Ballon Combiné 1000L</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="120" x="-60" y="133.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="120" x="-60" y="-67.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="2" x="-11" y="-60" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="9" y="-60" antialias="false" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="-24" y2="23" x2="-17"/>
-        <circle x="-53.75" y="46.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="8" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="46.25" y="46.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.25" y="136.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <rect width="120" x="-60" y="-50" antialias="false" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="25" y2="24" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="-15" y2="28" x2="-15"/>
-        <arc width="4" x="15" y="24" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="15" y2="27" x2="15"/>
-        <arc width="4" x="-19" y="23" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="10" x="-30" y="16" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="10" x="20" y="17" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="30" x="-15" y="46" antialias="true" height="9" 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="-34" x1="-30" y2="20" x2="-30"/>
-        <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="-34" x1="30" y2="20" x2="30"/>
-        <arc width="60" x="-30" y="-42.5" antialias="true" height="16" 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="58" x1="-49" y2="58" x2="39"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="62" x1="-49" y2="62" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="68" x1="-13" y2="68" x2="39"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="78" x1="-13" y2="78" x2="39"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="88" x1="-12" y2="88" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="98" x1="-12" y2="98" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="108" x1="-13" y2="108" x2="39"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="118" x1="-12" y2="118" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="128" x1="-50" y2="118" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="132" x1="-49" y2="122" x2="40"/>
-        <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="128" x1="40" y2="128" x2="-14"/>
-        <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="72" x1="-49" y2="72" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="82" x1="-49" y2="82" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="92" x1="-49" y2="92" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="102" x1="-49" y2="102" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="112" x1="-50" y2="112" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="122" x1="-49" y2="122" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="132" x1="-49" y2="132" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="88" x1="-50" y2="78" x2="40"/>
-        <arc width="4" x="-51.5" y="128" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-51.5" y="118" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="82" x1="-49" y2="72" x2="40"/>
-        <arc width="4" x="-51.5" y="108" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-51.5" y="98" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="78" x1="-50" y2="68" x2="40"/>
-        <arc width="4" x="-51.5" y="88" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="72" x1="-49" y2="62" x2="40"/>
-        <arc width="4" x="-51.5" y="78" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-51.5" y="68" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="68" x1="-50" y2="58" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="98" x1="-50" y2="88" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="108" x1="-50" y2="98" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="118" x1="-50" y2="108" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="92" x1="-49" y2="82" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="102" x1="-49" y2="92" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="112" x1="-49" y2="102" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="122" x1="-49" y2="112" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="138" x1="-50" y2="128" x2="40"/>
-        <arc width="4" x="38.5" y="58" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="38.5" y="68" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="38.5" y="78" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="38.5" y="88" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="38.5" y="98" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="38.5" y="108" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="38.5" y="118" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="142" x1="-49" y2="132" x2="40"/>
-        <arc width="4" x="38.5" y="128" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <polygon x4="2" y5="170" x5="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="170" x1="-2" y2="173" x2="-2" y3="173" x3="2" y4="170"/>
-        <input x="12" y="44" size="6" rotate="true" text="  Ballon&#xa;Combiné&#xa;  1000L"/>
-        <circle x="-53.75" y="-43.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-12" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <polygon x4="40" y5="164" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="55" y2="174" x2="55" y3="174" x3="40" y4="164"/>
-        <polygon x4="-40" y5="164" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="-55" y2="174" x2="-55" y3="174" x3="-40" y4="164"/>
-        <circle x="46.25" y="-43.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-52" y="138" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-52" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <terminal x="-50" y="-40" orientation="w"/>
-        <terminal x="-50" y="140" orientation="w"/>
-        <terminal x="10" y="-60" orientation="n"/>
-        <terminal x="0" y="173" orientation="s"/>
-        <terminal x="50" y="50" orientation="e"/>
-        <terminal x="50" y="-40" orientation="e"/>
-        <terminal x="50" y="140" orientation="e"/>
-        <terminal x="-50" y="60" orientation="w"/>
-        <terminal x="-50" y="50" orientation="w"/>
-        <terminal x="-10" y="-60" orientation="n"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="133.5" x="-60" height="36"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-67.5" x="-60" height="36"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-60" x="-11" height="30"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-60" x="9" height="100"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="23" antialias="true" length2="1.5" end1="none" length1="1.5" y1="23" x1="-24" x2="-17"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="46.25" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-62" x="8"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="46.25" x="46.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="136.25" x="46.25"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-50" x="-60" height="201"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="24" antialias="true" length2="1.5" end1="none" length1="1.5" y1="24" x1="25" x2="17"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="28" antialias="true" length2="1.5" end1="none" length1="1.5" y1="51" x1="-15" x2="-15"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="24" x="15" height="9"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27" antialias="true" length2="1.5" end1="none" length1="1.5" y1="50" x1="15" x2="15"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="23" x="-19" height="9"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="16" x="-30" height="7"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="17" x="20" height="7"/>
+        <arc width="30" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="46" x="-15" height="9"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-34" x1="-30" x2="-30"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-34" x1="30" x2="30"/>
+        <arc width="60" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-42.5" x="-30" height="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="58" antialias="false" length2="1.5" end1="none" length1="1.5" y1="58" x1="-49" x2="39"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="62" antialias="false" length2="1.5" end1="none" length1="1.5" y1="62" x1="-49" x2="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="68" antialias="true" length2="1.5" end1="none" length1="1.5" y1="68" x1="-13" x2="39"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="78" antialias="true" length2="1.5" end1="none" length1="1.5" y1="78" x1="-13" x2="39"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="88" antialias="true" length2="1.5" end1="none" length1="1.5" y1="88" x1="-12" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="98" antialias="true" length2="1.5" end1="none" length1="1.5" y1="98" x1="-12" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="108" antialias="true" length2="1.5" end1="none" length1="1.5" y1="108" x1="-13" x2="39"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="118" antialias="false" length2="1.5" end1="none" length1="1.5" y1="118" x1="-12" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="118" antialias="true" length2="1.5" end1="none" length1="1.5" y1="128" x1="-50" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="122" antialias="true" length2="1.5" end1="none" length1="1.5" y1="132" x1="-49" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="128" antialias="false" length2="1.5" end1="none" length1="1.5" y1="128" x1="40" x2="-14"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="72" x1="-49" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="82" antialias="false" length2="1.5" end1="none" length1="1.5" y1="82" x1="-49" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="92" antialias="false" length2="1.5" end1="none" length1="1.5" y1="92" x1="-49" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="102" antialias="false" length2="1.5" end1="none" length1="1.5" y1="102" x1="-49" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="112" antialias="false" length2="1.5" end1="none" length1="1.5" y1="112" x1="-50" x2="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="122" antialias="false" length2="1.5" end1="none" length1="1.5" y1="122" x1="-49" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="132" antialias="false" length2="1.5" end1="none" length1="1.5" y1="132" x1="-49" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="78" antialias="true" length2="1.5" end1="none" length1="1.5" y1="88" x1="-50" x2="40"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="128" x="-51.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="118" x="-51.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="72" antialias="true" length2="1.5" end1="none" length1="1.5" y1="82" x1="-49" x2="40"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="108" x="-51.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="98" x="-51.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="68" antialias="true" length2="1.5" end1="none" length1="1.5" y1="78" x1="-50" x2="40"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="88" x="-51.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="62" antialias="true" length2="1.5" end1="none" length1="1.5" y1="72" x1="-49" x2="40"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="78" x="-51.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="68" x="-51.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="58" antialias="true" length2="1.5" end1="none" length1="1.5" y1="68" x1="-50" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="88" antialias="true" length2="1.5" end1="none" length1="1.5" y1="98" x1="-50" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="98" antialias="true" length2="1.5" end1="none" length1="1.5" y1="108" x1="-50" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="108" antialias="true" length2="1.5" end1="none" length1="1.5" y1="118" x1="-50" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="82" antialias="true" length2="1.5" end1="none" length1="1.5" y1="92" x1="-49" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="92" antialias="true" length2="1.5" end1="none" length1="1.5" y1="102" x1="-49" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="102" antialias="true" length2="1.5" end1="none" length1="1.5" y1="112" x1="-49" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="112" antialias="true" length2="1.5" end1="none" length1="1.5" y1="122" x1="-49" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="128" antialias="true" length2="1.5" end1="none" length1="1.5" y1="138" x1="-50" x2="40"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="58" x="38.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="68" x="38.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="78" x="38.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="88" x="38.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="98" x="38.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="108" x="38.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="118" x="38.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="132" antialias="true" length2="1.5" end1="none" length1="1.5" y1="142" x1="-49" x2="40"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="128" x="38.5" height="4"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="173" x4="2" antialias="false" y5="170" y1="170" x1="-2" closed="false" x3="2" y3="173" y4="170" x2="-2" x5="2"/>
+        <input tagg="label" rotate="true" size="6" y="44" x="12" text="  Ballon&#xa;Combiné&#xa;  1000L"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-43.75" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-62" x="-12"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="174" x4="40" antialias="true" y5="164" y1="159" x1="55" x3="40" y3="174" y4="164" x2="55" x5="40"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="174" x4="-40" antialias="true" y5="164" y1="159" x1="-55" x3="-40" y3="174" y4="164" x2="-55" x5="-40"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-43.75" x="46.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="138" x="-52"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="58" x="-52"/>
+        <terminal y="-40" x="-50" orientation="w"/>
+        <terminal y="140" x="-50" orientation="w"/>
+        <terminal y="-60" x="10" orientation="n"/>
+        <terminal y="173" x="0" orientation="s"/>
+        <terminal y="50" x="50" orientation="e"/>
+        <terminal y="-40" x="50" orientation="e"/>
+        <terminal y="140" x="50" orientation="e"/>
+        <terminal y="60" x="-50" orientation="w"/>
+        <terminal y="50" x="-50" orientation="w"/>
+        <terminal y="-60" x="-10" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combiner_ecs_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combiner_ecs_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_combiner_ecs_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,43 +1,45 @@
-<definition width="120" version="0.3" hotspot_x="60" hotspot_y="100" height="200" type="element" orientation="dyyy">
-<uuid uuid="{0C80480B-125F-46DE-9234-D693FCBA7242}"/><names>
-        <name lang="ar">بالون جامع ECS</name>
-        <name lang="en">Combined ball ECS</name>
-        <name lang="fr">Ballon Combinée ECS</name>
+<definition width="100" hotspot_x="50" type="element" link_type="simple" orientation="dyyy" version="0.5" height="200" hotspot_y="96">
+    <uuid uuid="{5c58e3de-d8ec-44db-b023-31dbc0bd2775}"/>
+    <names>
+        <name lang="cs">Kombinovaný zásobnik ECS</name>
         <name lang="pl">Zasobnik kombinowany CWU</name>
-        <name lang="cs">Kombinovaný zásobnik ECS</name>
         <name lang="it">Scambiatore combinato ACS</name>
+        <name lang="en">Combined ball ECS</name>
         <name lang="nl">Boiler combinatie </name>
+        <name lang="ar">بالون جامع ECS</name>
+        <name lang="fr">Ballon Combinée ECS</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon y29="-50" x23="-30" x24="30" x25="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x26="30" x27="-30" x1="20" x28="30" x2="20" x29="-30" x3="-30" y30="-52" x4="30" y31="-54" x5="-30" y32="-56" x6="30" y33="-58" x7="-30" x8="30" y34="-60" x9="-30" y35="-62" x30="30" y36="-64" x31="-30" y37="-66" x32="30" y38="-68" x33="-30" y39="-70" x34="30" x35="-30" x36="30" y1="-90" x37="-30" y2="20" x38="30" y3="10" x39="-30" y4="6" y40="-72" y5="0" y41="-74" y6="-4" y42="-90" y7="-6" y43="-90" y8="-8" y9="-10" x40="30" x41="-20" x42="-20" x43="-20" antialias="true" closed="false" y10="-12" y11="-14" y12="-16" y13="-18" y14="-20" y15="-22" y16="-24" x10="30" y17="-26" x11="-30" y18="-28" x12="30" y19="-30" x13="-30" x14="30" x15="-30" x16="30" x17="-30" x18="30" x19="-30" y20="-32" y21="-34" y22="-36" y23="-38" y24="-40" y25="-42" y26="-44" x20="30" y27="-46" x21="-30" y28="-48" x22="30"/>
-        <rect width="90" x="-45" y="-65" antialias="true" height="133" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="90" x="-45" y="52" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <input x="-20" y="75.5" size="9" rotate="true" text="500L"/>
-        <text x="-35" y="95" size="7" text="Ballon type SKS"/>
-        <polygon x4="40" y5="76" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="76" x1="-40" y2="87" x2="-40" y3="87" x3="40" y4="76"/>
-        <rect width="4" x="18" y="-92" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-22" y="-92" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-42.5" y="-62.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-26" x2="-26" x3="-30" x4="-30" antialias="false" x5="30" x6="30" x7="26" x8="26" x9="26" closed="false" y1="-79" y2="-86" y3="-86" y4="-88" y5="-88" y6="-86" y7="-86" y8="-79" y9="-79"/>
-        <arc width="90" x="-45" y="-82" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="37.5" y="-22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="37.5" y="37.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="37.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="37.5" y="-52.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-42.5" y="-32.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-42.5" y="27.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-42.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="-40" y="-60" orientation="w"/>
-        <terminal x="-40" y="-30" orientation="w"/>
-        <terminal x="-40" y="30" orientation="w"/>
-        <terminal x="-40" y="60" orientation="w"/>
-        <terminal x="-20" y="-90" orientation="n"/>
-        <terminal x="20" y="-90" orientation="n"/>
-        <terminal x="40" y="-50" orientation="e"/>
-        <terminal x="40" y="-20" orientation="e"/>
-        <terminal x="40" y="40" orientation="e"/>
-        <terminal x="40" y="60" orientation="e"/>
+        <polygon y40="-72" y21="-34" x4="30" x31="-30" y7="-6" y15="-22" x5="-30" x7="-30" y29="-50" y37="-66" x35="-30" y27="-46" x18="30" x17="-30" y19="-30" x16="30" y16="-24" x27="-30" y8="-8" y12="-16" y39="-70" x36="30" x25="-30" y11="-14" x22="30" y6="-4" x37="-30" y20="-32" y28="-48" y5="0" x11="-30" y43="-90" y33="-58" x8="30" x41="-20" y30="-52" x26="30" x23="-30" x42="-20" x24="30" x43="-20" y22="-36" x34="30" y26="-44" x29="-30" x13="-30" y1="-90" x10="30" x1="20" y3="10" y13="-18" y18="-28" x15="-30" x6="30" x28="30" x38="30" x12="30" y4="6" y25="-42" closed="false" y41="-74" y36="-64" x19="-30" y42="-90" y34="-60" y2="20" x30="30" y10="-12" x39="-30" y23="-38" x32="30" x9="-30" x21="-30" x40="30" y17="-26" y14="-20" x14="30" y31="-54" x2="20" y32="-56" y35="-62" y38="-68" x33="-30" antialias="true" y24="-40" style="line-style:normal;line-weight:normal;filling:none;color:black" y9="-10" x3="-30" x20="30"/>
+        <rect width="90" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-65" x="-45" height="133"/>
+        <arc width="90" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="52" x="-45" height="33"/>
+        <input tagg="none" rotate="true" size="9" y="75.5" x="-20" text="500L"/>
+        <text size="7" y="95" x="-35" text="Ballon type SKS"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="87" x4="40" antialias="false" y5="76" y1="76" x1="-40" closed="false" x3="40" y3="87" y4="76" x2="-40" x5="40"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-92" x="18" height="4"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-92" x="-22" height="4"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-62.5" x="-42.5"/>
+        <polygon y3="-86" x7="26" y9="-79" closed="false" y8="-79" x8="26" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="30" x9="26" y4="-88" x1="-26" x4="-30" y6="-86" x5="30" y5="-88" y2="-86" x2="-26" x3="-30" y7="-86" y1="-79"/>
+        <arc width="90" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-82" x="-45" height="33"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-22.5" x="37.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="37.5" x="37.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="57.5" x="37.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-52.5" x="37.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-32.5" x="-42.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="27.5" x="-42.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="57.5" x="-42.5"/>
+        <input tagg="label" rotate="true" size="9" y="101.5" x="-17" text="_"/>
+        <terminal y="30" x="-40" orientation="w"/>
+        <terminal y="-90" x="-20" orientation="n"/>
+        <terminal y="-60" x="-40" orientation="w"/>
+        <terminal y="60" x="40" orientation="e"/>
+        <terminal y="-90" x="20" orientation="n"/>
+        <terminal y="-50" x="40" orientation="e"/>
+        <terminal y="40" x="40" orientation="e"/>
+        <terminal y="60" x="-40" orientation="w"/>
+        <terminal y="-20" x="40" orientation="e"/>
+        <terminal y="-30" x="-40" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_demi_strat.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_demi_strat.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_demi_strat.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,40 +1,42 @@
-<definition width="150" version="0.3" hotspot_x="75" hotspot_y="125" height="260" type="element" orientation="dyyy">
-<uuid uuid="{0A45EAD6-F57D-419C-9C9D-38E47384F93E}"/><names>
-        <name lang="ar">خزّان تراتب</name>
-        <name lang="en">Stratification storage tank 1000L</name>
-        <name lang="fr">ballon 1000L chicane et strat</name>
+<definition width="130" hotspot_x="65" type="element" link_type="simple" orientation="dyyy" version="0.5" height="250" hotspot_y="121">
+    <uuid uuid="{4a15f335-370e-4d8e-88ef-f911c6f544bf}"/>
+    <names>
+        <name lang="cs">Vrstvový zásobník 1000L</name>
         <name lang="pl">Zasobnik warstwowy 1000L</name>
-        <name lang="cs">Vrstvový zásobník 1000L</name>
         <name lang="it">Serbatoio a stratificazione 1000L</name>
+        <name lang="en">Stratification storage tank 1000L</name>
         <name lang="nl">Opslagtank 1000L</name>
+        <name lang="ar">خزّان تراتب</name>
+        <name lang="fr">ballon 1000L chicane et strat</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-25" y="73.5" size="9" rotate="true" text="2000L"/>
-        <rect width="16" x="-8" y="-116" antialias="false" height="232" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
-        <input x="16" y="53" size="7" rotation="-90" rotate="true" text="Stockage / Destockage"/>
-        <arc width="120" x="-60" y="-117.5" antialias="true" height="36" 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="0" x1="-10" y2="0" x2="9"/>
-        <rect width="4" x="-2" y="-115" antialias="false" height="110" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
-        <circle x="48" y="98" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <rect width="4" x="-2" y="5" antialias="false" height="110" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
-        <arc width="120" x="-60" y="82" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="60" y2="101" x2="60"/>
-        <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="-99" x1="-60" y2="101" x2="-60"/>
-        <circle x="-2.75" y="-112.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <input x="-17" y="56" size="7" rotation="-90" rotate="true" text="Ballon Stratificateur"/>
-        <circle x="48" y="-102" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-2.75" y="107.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <polygon x4="40" y5="114" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="55" y2="124" x2="55" y3="124" x3="40" y4="114"/>
-        <polygon x4="-40" y5="114" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="-55" y2="124" x2="-55" y3="124" x3="-40" y4="114"/>
-        <circle x="48" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="48" y="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <terminal x="50" y="-30" orientation="e"/>
-        <terminal x="0" y="110" orientation="s"/>
-        <terminal x="0" y="-110" orientation="n"/>
-        <terminal x="50" y="30" orientation="e"/>
-        <terminal x="50" y="-100" orientation="e"/>
-        <terminal x="50" y="100" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="140.55" x="-7" text="_"/>
+        <input tagg="none" rotate="true" size="9" y="73.5" x="-25" text="2000L"/>
+        <rect width="16" style="line-style:dotted;line-weight:normal;filling:none;color:black" antialias="false" y="-116" x="-8" height="232"/>
+        <input tagg="none" rotation="-90" rotate="true" size="7" y="53" x="16" text="Stockage / Destockage"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-117.5" x="-60" height="36"/>
+        <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="9"/>
+        <rect width="4" style="line-style:dotted;line-weight:thin;filling:none;color:black" antialias="false" y="-115" x="-2" height="110"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="98" x="48"/>
+        <rect width="4" style="line-style:dotted;line-weight:thin;filling:none;color:black" antialias="false" y="5" x="-2" height="110"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="82" x="-60" height="36"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="101" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-100" x1="60" x2="60"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="101" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-99" x1="-60" x2="-60"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5.5" y="-112.75" x="-2.75"/>
+        <input tagg="none" rotation="-90" rotate="true" size="7" y="56" x="-17" text="Ballon Stratificateur"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-102" x="48"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5.5" y="107.25" x="-2.75"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="124" x4="40" antialias="true" y5="114" y1="109" x1="55" x3="40" y3="124" y4="114" x2="55" x5="40"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="124" x4="-40" antialias="true" y5="114" y1="109" x1="-55" x3="-40" y3="124" y4="114" x2="-55" x5="-40"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="28" x="48"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-32" x="48"/>
+        <terminal y="-110" x="0" orientation="n"/>
+        <terminal y="110" x="0" orientation="s"/>
+        <terminal y="100" x="50" orientation="e"/>
+        <terminal y="-100" x="50" orientation="e"/>
+        <terminal y="-30" x="50" orientation="e"/>
+        <terminal y="30" x="50" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_elec.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_elec.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_elec.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,27 +1,29 @@
-<definition width="120" version="0.3" hotspot_x="60" hotspot_y="90" height="180" type="element" orientation="dyyy">
-<uuid uuid="{C7A50C94-48CB-40D2-B35B-0DB2B7C3E8AE}"/><names>
-        <name lang="ar">سخّان ماء كهربائي</name>
-        <name lang="en">Electric DHW</name>
-        <name lang="fr">ballon ECS electrique</name>
+<definition width="110" hotspot_x="53" type="element" link_type="simple" orientation="dyyy" version="0.5" height="180" hotspot_y="87">
+    <uuid uuid="{5a48f359-0b98-4e2a-bc86-338a963f5743}"/>
+    <names>
+        <name lang="cs">Elektrický zásobnik ECS</name>
         <name lang="pl">Zasobnik elektryczny CWU</name>
-        <name lang="cs">Elektrický zásobnik ECS</name>
         <name lang="it">Scambiatore elettrico ACS</name>
+        <name lang="en">Electric DHW</name>
         <name lang="nl">Boiler Electrisch</name>
+        <name lang="ar">سخّان ماء كهربائي</name>
+        <name lang="fr">ballon ECS electrique</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-37" y="-24" size="9" text="Ballon&#xa; ECS"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-10" x3="9" x4="-10" antialias="false" x5="10" x6="-10" x7="10" x8="-11" x9="10" closed="false" y1="82" y2="70" y10="30" y3="65" y11="30" y4="60" y12="30" y5="56" x10="-10" y6="50" x11="2" y7="45" x12="2" y8="40" y9="35"/>
-        <rect width="11" x="41" y="10" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="-31" y="60" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="29" y="-80" antialias="false" height="20" 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="-60" x1="50" y2="70" x2="50"/>
-        <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="-50" y2="70" x2="-50"/>
-        <arc width="100" x="-50" y="57.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="100" x="-50" y="-72.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="-31" y="84" orientation="s"/>
-        <terminal x="29" y="-80" orientation="n"/>
-        <terminal x="51" y="10" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="90.55" x="-7" text="_"/>
+        <text size="9" y="-24" x="-37" text="Ballon&#xa; ECS"/>
+        <polygon y3="65" x7="10" y9="35" closed="false" y8="40" x8="-11" x12="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="30" x6="-10" x9="10" y4="60" x1="0" x4="-10" y10="30" y6="50" x5="10" y5="56" y2="70" x2="-10" x3="9" x11="2" y11="30" y7="45" y1="82" x10="-10"/>
+        <rect width="11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="10" x="41" height="1"/>
+        <rect width="1" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="60" x="-31" height="25"/>
+        <rect width="1" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-80" x="29" height="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="70" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-60" x1="50" x2="50"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="70" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-59" x1="-50" x2="-50"/>
+        <arc width="100" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="57.5" x="-50" height="25"/>
+        <arc width="100" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-72.5" x="-50" height="25"/>
+        <terminal y="10" x="51" orientation="e"/>
+        <terminal y="-80" x="29" orientation="n"/>
+        <terminal y="84" x="-31" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_horizon_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_horizon_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_ecs_horizon_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,27 +1,28 @@
-<definition width="230" version="0.3" hotspot_x="125" hotspot_y="75" height="160" type="element" orientation="dyyy">
-<uuid uuid="{6763BCFB-2425-4883-8221-BFEA55510C09}"/><names>
-        <name lang="ar">خزان ماء أفقي</name>
-        <name lang="en">DHW horizontal</name>
-        <name lang="fr">Ballon ECS horizontal</name>
+<definition width="210" hotspot_x="113" type="element" link_type="simple" orientation="dyyy" version="0.5" height="130" hotspot_y="54">
+    <uuid uuid="{f0ecb77e-0827-4b79-b6e5-5eda4157058a}"/>
+    <names>
+        <name lang="cs">Vodorovný zásobnik ECS</name>
         <name lang="pl">Zasobnik poziomy CWU</name>
-        <name lang="cs">Vodorovný zásobnik ECS</name>
         <name lang="it">Scambiatore orizzontale ACS</name>
+        <name lang="en">DHW horizontal</name>
         <name lang="nl">Boiler elektrisch</name>
+        <name lang="ar">خزان ماء أفقي</name>
+        <name lang="fr">Ballon ECS horizontal</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="84" y5="-18" x5="84" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-22" x1="83" y2="-22" x2="90" y3="-18" x3="90" y4="-18"/>
-        <polygon x4="84" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="42" x1="83" y2="42" x2="90" y3="38" x3="90" y4="38"/>
-        <rect width="4" x="58" y="60" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-92" y="-50" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="165" x="-94" y="-40" antialias="true" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-60" y="11" size="7" rotate="true" text="Ballon ECS"/>
-        <arc width="28" x="58" y="-40" antialias="true" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="28" x="-108" y="-40" antialias="true" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <terminal x="-90" y="-50" orientation="n"/>
-        <terminal x="60" y="70" orientation="s"/>
-        <terminal x="90" y="-20" orientation="e"/>
-        <terminal x="90" y="40" orientation="e"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-22" x4="84" antialias="true" y5="-18" y1="-22" x1="83" closed="false" x3="90" y3="-18" y4="-18" x2="90" x5="84"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="42" x4="84" antialias="true" y1="42" x1="83" closed="false" x3="90" y3="38" y4="38" x2="90"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="60" x="58" height="10"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-50" x="-92" height="10"/>
+        <rect width="165" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-40" x="-94" height="100"/>
+        <input tagg="label" rotate="true" size="7" y="11" x="-60" text="Ballon ECS"/>
+        <arc width="28" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-40" x="58" height="100"/>
+        <arc width="28" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-40" x="-108" height="100"/>
+        <terminal y="-50" x="-90" orientation="n"/>
+        <terminal y="70" x="60" orientation="s"/>
+        <terminal y="-20" x="90" orientation="e"/>
+        <terminal y="40" x="90" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_stock1000l.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_stock1000l.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_stock1000l.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,47 +1,48 @@
-<definition width="150" version="0.3" hotspot_x="75" hotspot_y="65" height="260" type="element" orientation="ndny">
-<uuid uuid="{44E2E2CF-2B23-4E7D-A2FE-8511B7564789}"/><names>
-        <name lang="ar">خزّان 1000ل</name>
-        <name lang="en">Storage tank 1000L</name>
-        <name lang="fr">Ballon Stockage 1000L</name>
+<definition width="130" hotspot_x="65" type="element" link_type="simple" orientation="dyyy" version="0.5" height="250" hotspot_y="61">
+    <uuid uuid="{1b695f32-6994-4af2-a0a0-893a4e1fddd6}"/>
+    <names>
+        <name lang="cs">Zásobník 1000L</name>
         <name lang="pl">Zasobnik 1000L</name>
-        <name lang="cs">Zásobník 1000L</name>
         <name lang="it">Serbatoio 1000L</name>
+        <name lang="en">Storage tank 1000L</name>
         <name lang="nl">Opslagtank 1000L</name>
+        <name lang="ar">خزّان 1000ل</name>
+        <name lang="fr">Ballon Stockage 1000L</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="-53.75" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <rect width="120" x="-60" y="-40" antialias="false" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="120" x="-60" y="143.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="46.25" y="-33.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.25" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-53.75" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.25" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="46.25" y="146.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <polygon x4="2" y5="180" x5="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="180" x1="-2" y2="183" x2="-2" y3="183" x3="2" y4="180"/>
-        <arc width="120" x="-60" y="-58" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <input x="-31" y="29" size="7" rotate="true" text="  Ballon&#xa;Stockage&#xa;  1000L"/>
-        <circle x="-53.75" y="-33.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-2" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-2.75" y="-52.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <polygon x4="40" y5="174" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="55" y2="184" x2="55" y3="184" x3="40" y4="174"/>
-        <polygon x4="-40" y5="174" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="-55" y2="184" x2="-55" y3="184" x3="-40" y4="174"/>
-        <circle x="-53.75" y="146.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-2" y="128" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-2" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <terminal x="-50" y="-30" orientation="w"/>
-        <terminal x="-50" y="150" orientation="w"/>
-        <terminal x="0" y="-50" orientation="n"/>
-        <terminal x="0" y="183" orientation="s"/>
-        <terminal x="0" y="-10" orientation="e"/>
-        <terminal x="0" y="60" orientation="e"/>
-        <terminal x="0" y="130" orientation="e"/>
-        <terminal x="50" y="150" orientation="e"/>
-        <terminal x="50" y="-30" orientation="e"/>
-        <terminal x="50" y="20" orientation="e"/>
-        <terminal x="50" y="100" orientation="e"/>
-        <terminal x="-50" y="20" orientation="w"/>
-        <terminal x="-50" y="100" orientation="w"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="16.25" x="-53.75"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-40" x="-60" height="201"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="143.5" x="-60" height="36"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-33.75" x="46.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="96.25" x="46.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="96.25" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="16.25" x="46.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="146.25" x="46.25"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="183" x4="2" antialias="false" y5="180" y1="180" x1="-2" closed="false" x3="2" y3="183" y4="180" x2="-2" x5="2"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-58" x="-60" height="36"/>
+        <input tagg="label" rotate="true" size="7" y="29" x="-31" text="  Ballon&#xa;Stockage&#xa;  1000L"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-33.75" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-12" x="-2"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5.5" y="-52.75" x="-2.75"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="184" x4="40" antialias="true" y5="174" y1="169" x1="55" x3="40" y3="184" y4="174" x2="55" x5="40"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="184" x4="-40" antialias="true" y5="174" y1="169" x1="-55" x3="-40" y3="184" y4="174" x2="-55" x5="-40"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="146.25" x="-53.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="128" x="-2"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="58" x="-2"/>
+        <terminal y="-30" x="-50" orientation="w"/>
+        <terminal y="150" x="-50" orientation="w"/>
+        <terminal y="-50" x="0" orientation="n"/>
+        <terminal y="183" x="0" orientation="s"/>
+        <terminal y="-10" x="0" orientation="e"/>
+        <terminal y="60" x="0" orientation="e"/>
+        <terminal y="130" x="0" orientation="e"/>
+        <terminal y="150" x="50" orientation="e"/>
+        <terminal y="-30" x="50" orientation="e"/>
+        <terminal y="20" x="50" orientation="e"/>
+        <terminal y="100" x="50" orientation="e"/>
+        <terminal y="20" x="-50" orientation="w"/>
+        <terminal y="100" x="-50" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_strat_ecs.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_strat_ecs.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/ballon_strat_ecs.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,124 +1,125 @@
-<definition width="150" version="0.3" hotspot_x="75" hotspot_y="75" height="260" type="element" orientation="dyyy">
-<uuid uuid="{3967AF50-C121-4B80-9380-2962B957D153}"/><names>
-        <name lang="ar">بالون تراتب</name>
-        <name lang="en">Stratification balloon ECS</name>
-        <name lang="fr">Ballon Stratification ECS</name>
+<definition width="130" hotspot_x="65" type="element" link_type="simple" orientation="dyyy" version="0.5" height="250" hotspot_y="70">
+    <uuid uuid="{4ff65c49-2f85-4214-a548-3153de9f25ff}"/>
+    <names>
+        <name lang="cs">Vrstvový zásobnik ECS</name>
         <name lang="pl">Zasobnik warstwowy CWU</name>
-        <name lang="cs">Vrstvový zásobnik ECS</name>
         <name lang="it">Scambiatore a stratificazione ACS</name>
+        <name lang="en">Stratification balloon ECS</name>
         <name lang="nl">Opslagtank met wisselaar</name>
+        <name lang="ar">بالون تراتب</name>
+        <name lang="fr">Ballon Stratification ECS</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="155" x1="-59" y2="155" x2="-20" y3="168" x3="-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="72" x1="46" y2="65" x2="42"/>
-        <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="66" x1="38" y2="71" x2="41"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="43" x1="42" y2="60" x2="42"/>
-        <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="44" x1="38" y2="60" x2="38"/>
-        <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="42" y2="37" x2="42"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="38" y2="38" x2="38"/>
-        <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="72" x1="-13" y2="72" x2="45"/>
-        <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="76" x1="-43" y2="76" x2="45"/>
-        <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="50" x1="-29" y2="60" x2="41"/>
-        <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="51" x1="-44" y2="62" x2="31"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="76" x1="-44" y2="64" x2="46"/>
-        <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="72" x1="-45" y2="60" x2="46"/>
-        <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="38" x1="45" y2="27" x2="-28"/>
-        <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" x1="32" y2="29" x2="-43"/>
-        <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="51" x1="-43" y2="42" x2="44"/>
-        <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="-43" y2="38" x2="45"/>
-        <arc width="4" x="-46.5" y="72" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-45.5" y="47" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="43.5" y="72" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="44.5" y="60" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="12" y="98" size="7" rotate="true" text="800L"/>
-        <input x="-53" y="117" size="7" rotate="true" text="Ballon Strati. et Ecs"/>
-        <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="-42" x1="-60" y2="152" x2="-60"/>
-        <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="-60" x1="-38" y2="-46" x2="-41"/>
-        <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="-60" x1="-42" y2="-44" x2="-45"/>
-        <circle x="48" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="48" y="48" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="-43" x1="60" y2="151" x2="60"/>
-        <arc width="120" x="-60" y="-60.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-43" y2="-41" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="-44" y2="-45" x2="46"/>
-        <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="-45" x1="42" y2="-59" x2="42"/>
-        <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="-45" x1="38" y2="-59" x2="38"/>
-        <arc width="4" x="-45.5" y="-45" antialias="true" height="4" 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="51" x1="-6" y2="51" x2="7"/>
-        <rect width="13" x="-6" y="-60" antialias="false" height="229" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-2" y="70" antialias="false" height="99" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="4" x="-2" y="-60" antialias="false" height="108" 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="10" x1="42" y2="15" x2="42"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="42" y2="4" x2="42"/>
-        <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="42" y2="-6" x2="42"/>
-        <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="42" y2="-16" x2="42"/>
-        <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="-30" x1="42" y2="-26" x2="42"/>
-        <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" x1="42" y2="-36" x2="42"/>
-        <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="38" y2="15" x2="38"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="38" y2="4" x2="38"/>
-        <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="38" y2="-5" x2="38"/>
-        <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="38" y2="-16" x2="38"/>
-        <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="-30" x1="38" y2="-26" x2="38"/>
-        <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" x1="38" y2="-35" x2="38"/>
-        <arc width="120" x="-60" y="133.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="-33.75" y="156.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="38" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-3.75" y="165.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="-43" y2="-45" x2="45"/>
-        <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="-41" x1="-43" y2="-41" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="-7" y2="-35" x2="45"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-7" y2="-25" x2="45"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-6" y2="-15" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-6" y2="-5" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="5" x2="45"/>
-        <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" x1="-6" y2="15" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-44" y2="15" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="-43" y2="19" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-43" y2="-31" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" x1="-43" y2="-21" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-43" y2="-11" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-43" y2="-1" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-44" y2="9" 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="19" x1="-43" y2="19" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-44" y2="-25" x2="46"/>
-        <arc width="4" x="-45.5" y="25" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-45.5" y="15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" x1="-43" y2="-31" x2="46"/>
-        <arc width="4" x="-45.5" y="5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-45.5" y="-5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-44" y2="-35" x2="46"/>
-        <arc width="4" x="-45.5" y="-15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-45.5" y="-25" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4" x="-45.5" y="-35" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-44" y2="-15" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-44" y2="-5" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-44" y2="5" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-43" y2="-21" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-43" y2="-11" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-43" y2="-1" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19" x1="-43" y2="9" x2="46"/>
-        <arc width="4" x="44.5" y="-45" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="44.5" y="-35" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="44.5" y="-25" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="44.5" y="-15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="44.5" y="-5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="44.5" y="5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="44.5" y="15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4" x="43.5" y="38" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <circle x="-42" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <polygon x4="40" y5="164" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="55" y2="174" x2="55" y3="174" x3="40" y4="164"/>
-        <polygon x4="-40" y5="164" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="-55" y2="174" x2="-55" y3="174" x3="-40" y4="164"/>
-        <circle x="-3.75" y="-63.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="48" y="148" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <terminal x="50" y="150" orientation="e"/>
-        <terminal x="-40" y="-60" orientation="n"/>
-        <terminal x="0" y="170" orientation="s"/>
-        <terminal x="50" y="50" orientation="e"/>
-        <terminal x="50" y="-50" orientation="e"/>
-        <terminal x="-30" y="160" orientation="w"/>
-        <terminal x="0" y="-60" orientation="n"/>
-        <terminal x="40" y="-60" orientation="n"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="155" antialias="false" y1="155" x1="-59" closed="false" x3="-20" y3="168" x2="-20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="72" x1="46" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="71" antialias="false" length2="1.5" end1="none" length1="1.5" y1="66" x1="38" x2="41"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="43" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="44" x1="38" x2="38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="37" antialias="false" length2="1.5" end1="none" length1="1.5" y1="20" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="38" antialias="false" length2="1.5" end1="none" length1="1.5" y1="21" x1="38" x2="38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="72" x1="-13" x2="45"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="76" antialias="false" length2="1.5" end1="none" length1="1.5" y1="76" x1="-43" x2="45"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="50" x1="-29" x2="41"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="62" antialias="false" length2="1.5" end1="none" length1="1.5" y1="51" x1="-44" x2="31"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="64" antialias="false" length2="1.5" end1="none" length1="1.5" y1="76" x1="-44" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="72" x1="-45" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27" antialias="false" length2="1.5" end1="none" length1="1.5" y1="38" x1="45" x2="-28"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="29" antialias="false" length2="1.5" end1="none" length1="1.5" y1="39" x1="32" x2="-43"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="42" antialias="false" length2="1.5" end1="none" length1="1.5" y1="51" x1="-43" x2="44"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="38" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="-43" x2="45"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="72" x="-46.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="47" x="-45.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="72" x="43.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="60" x="44.5" height="4"/>
+        <input tagg="none" rotate="true" size="7" y="98" x="12" text="800L"/>
+        <input tagg="label" rotate="true" size="7" y="117" x="-53" text="Ballon Strati. et Ecs"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="152" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-42" x1="-60" x2="-60"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-46" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-60" x1="-38" x2="-41"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-44" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-60" x1="-42" x2="-45"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-52" x="48"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="48" x="48"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="151" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-43" x1="60" x2="60"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-60.5" x="-60" height="36"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-41" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-31" x1="-43" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-45" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-35" x1="-44" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-59" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-45" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-59" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-45" x1="38" x2="38"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-45" x="-45.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="51" antialias="false" length2="1.5" end1="none" length1="1.5" y1="51" x1="-6" x2="7"/>
+        <rect width="13" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-60" x="-6" height="229"/>
+        <rect width="4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="70" x="-2" height="99"/>
+        <rect width="4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="-60" x="-2" height="108"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-26" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-36" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="42" x2="42"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="38" x2="38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="38" x2="38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="38" x2="38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="38" x2="38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-26" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="38" x2="38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-35" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="38" x2="38"/>
+        <arc width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="133.5" x="-60" height="36"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="156.25" x="-33.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-62" x="38"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="165.25" x="-3.75"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-45" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-45" x1="-43" x2="45"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-41" x1="-43" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-35" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-35" x1="-7" x2="45"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-25" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-25" x1="-7" x2="45"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-15" x1="-6" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-5" x1="-6" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="true" length2="1.5" end1="none" length1="1.5" y1="5" x1="-7" x2="45"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="15" x1="-6" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="true" length2="1.5" end1="none" length1="1.5" y1="25" x1="-44" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19" antialias="true" length2="1.5" end1="none" length1="1.5" y1="29" x1="-43" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-31" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-31" x1="-43" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-21" x1="-43" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-11" x1="-43" x2="9"/>
+        <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="-43" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9" antialias="false" length2="1.5" end1="none" length1="1.5" y1="9" x1="-44" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19" antialias="false" length2="1.5" end1="none" length1="1.5" y1="19" x1="-43" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-25" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-15" x1="-44" x2="46"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="25" x="-45.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="15" x="-45.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-31" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-21" x1="-43" x2="46"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="5" x="-45.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-5" x="-45.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-35" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-25" x1="-44" x2="46"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-15" x="-45.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-25" x="-45.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-35" x="-45.5" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-5" x1="-44" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" antialias="true" length2="1.5" end1="none" length1="1.5" y1="5" x1="-44" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="true" length2="1.5" end1="none" length1="1.5" y1="15" x1="-44" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-11" x1="-43" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-11" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-1" x1="-43" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-1" antialias="true" length2="1.5" end1="none" length1="1.5" y1="9" x1="-43" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9" antialias="true" length2="1.5" end1="none" length1="1.5" y1="19" x1="-43" x2="46"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-45" x="44.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-35" x="44.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-25" x="44.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-15" x="44.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-5" x="44.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="5" x="44.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="15" x="44.5" height="4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="38" x="43.5" height="4"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-62" x="-42"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="174" x4="40" antialias="true" y5="164" y1="159" x1="55" x3="40" y3="174" y4="164" x2="55" x5="40"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="174" x4="-40" antialias="true" y5="164" y1="159" x1="-55" x3="-40" y3="174" y4="164" x2="-55" x5="-40"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.5" y="-63.75" x="-3.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="148" x="48"/>
+        <terminal y="150" x="50" orientation="e"/>
+        <terminal y="-60" x="-40" orientation="n"/>
+        <terminal y="170" x="0" orientation="s"/>
+        <terminal y="50" x="50" orientation="e"/>
+        <terminal y="-50" x="50" orientation="e"/>
+        <terminal y="160" x="-30" orientation="w"/>
+        <terminal y="-60" x="0" orientation="n"/>
+        <terminal y="-60" x="40" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/echangeur_plaque.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/echangeur_plaque.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/echangeur_plaque.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,32 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="70" height="120" type="element" orientation="ndny">
-<uuid uuid="{28E47328-C8A1-4181-BA81-679EFBCA822A}"/><names>
-        <name lang="ar">لوحة مبادل حراري</name>
-        <name lang="en">Plate heat exchanger</name>
-        <name lang="fr">Echangeur à Plaques</name>
+<definition width="50" hotspot_x="24" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="40">
+    <uuid uuid="{f3a8b1fa-94d9-494a-a8fe-cee107878c95}"/>
+    <names>
+        <name lang="cs">Deskový výměník tepla</name>
         <name lang="pl">Płytowy wymiennik ciepła</name>
-        <name lang="cs">Deskový výměník tepla</name>
         <name lang="it">Scambiatore a piastre</name>
+        <name lang="en">Plate heat exchanger</name>
         <name lang="nl">plaat warmtewisselaar</name>
+        <name lang="ar">لوحة مبادل حراري</name>
+        <name lang="fr">Echangeur à Plaques</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="26" x="-13" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="10" x3="-5" x4="10" antialias="true" x5="-5" x6="10" x7="-5" x8="10" x9="12" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="10" y6="10" y7="20" y8="30" y9="30"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-12" x2="5" x3="-10" x4="5" antialias="true" x5="-10" x6="5" x7="-10" x8="5" x9="-12" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="-12" y6="10" y7="20" y8="30" y9="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="10" y2="4" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8" x1="-10" y2="12" x2="-10"/>
-        <input x="-23" y="-51" size="7" rotate="true" text="Plaques"/>
-        <text x="20" y="13" size="4" rotation="-90" text="Secondaire"/>
-        <text x="-15" y="9" size="4" rotation="-90" text="Primaire"/>
-        <circle x="11.75" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="-15.25" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="11.75" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="-14.25" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <terminal x="-13" y="-30" orientation="w"/>
-        <terminal x="-14" y="30" orientation="w"/>
-        <terminal x="13" y="-30" orientation="e"/>
-        <terminal x="13" y="30" orientation="e"/>
+        <rect width="26" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="-35" x="-13" height="70"/>
+        <polygon y3="-20" x7="-5" y9="30" closed="false" y8="30" x8="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="10" x9="12" y4="-10" x1="12" x4="10" y10="30" y6="10" x5="-5" y5="0" y2="-30" x2="10" x3="-5" y7="20" y1="-30" x10="10"/>
+        <polygon y3="-20" x7="-10" y9="30" closed="false" y8="30" x8="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="5" x9="-12" y4="-10" x1="-12" x4="5" y10="30" y6="10" x5="-10" y5="0" y2="-30" x2="5" x3="-10" y7="20" y1="-30" x10="-12"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="simple" length1="1.5" y1="-16" x1="10" x2="10"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8" x1="-10" x2="-10"/>
+        <input tagg="label" rotate="true" size="7" y="-51" x="-23" text="Plaques"/>
+        <text rotation="-90" size="4" y="13" x="20" text="Secondaire"/>
+        <text rotation="-90" size="4" y="9" x="-15" text="Primaire"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="28.75" x="11.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="28.75" x="-15.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="-31.25" x="11.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="-31.25" x="-14.25"/>
+        <terminal y="-30" x="-13" orientation="w"/>
+        <terminal y="30" x="-14" orientation="w"/>
+        <terminal y="-30" x="13" orientation="e"/>
+        <terminal y="30" x="13" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_chauffant_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_chauffant_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_chauffant_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,37 +1,38 @@
-<definition width="120" version="0.3" hotspot_x="60" hotspot_y="50" height="100" type="element" orientation="dyyy">
-<uuid uuid="{04C0362C-CE3C-460B-8168-F081DF6EBDA7}"/><names>
-        <name lang="ar">جدار سخّان</name>
-        <name lang="en">Wall Heater</name>
-        <name lang="fr">Mur Chauffant</name>
+<definition width="120" hotspot_x="58" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="44">
+    <uuid uuid="{e2d9759e-062f-4753-9688-cbd32b3d417e}"/>
+    <names>
+        <name lang="cs">Stěnový ohřev</name>
         <name lang="pl">Ogrzewanie ścienne</name>
-        <name lang="cs">Stěnový ohřev</name>
         <name lang="it">Riscaldatore a parete</name>
+        <name lang="en">Wall Heater</name>
         <name lang="nl">Muur verwarming</name>
+        <name lang="ar">جدار سخّان</name>
+        <name lang="fr">Mur Chauffant</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-34" y="37" size="6" rotate="true" text="mur chauffant N°"/>
-        <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" x1="-40" y2="33" x2="-40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-37" x1="-50" y2="40" x2="-50"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="50" y2="30" x2="-36"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="50" y2="20" x2="-39"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="50" y2="10" x2="-40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="50" y2="0" x2="-39"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="50" y2="-10" x2="-40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="50" y2="-20" x2="-40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="50" y2="-30" x2="-40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="50" y2="-40" x2="-47"/>
-        <arc width="6" x="-50" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="10" x="45" y="-40" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="6" x="-40" y="30" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="10" x="-45" y="10" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="10" x="-45" y="-10" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="10" x="45" y="20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="10" x="45" y="0" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="10" x="45" y="-20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="10" x="-45" y="-30" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <terminal x="-50" y="40" orientation="s"/>
-        <terminal x="-40" y="40" orientation="s"/>
+        <input tagg="label" rotate="true" size="6" y="37" x="-34" text="mur chauffant N°"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="33" antialias="false" length2="1.5" end1="none" length1="1.5" y1="40" x1="-40" x2="-40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-37" x1="-50" x2="-50"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="30" antialias="true" length2="1.5" end1="none" length1="1.5" y1="30" x1="50" x2="-36"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="true" length2="1.5" end1="none" length1="1.5" y1="20" x1="50" x2="-39"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="true" length2="1.5" end1="none" length1="1.5" y1="10" x1="50" x2="-40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="true" length2="1.5" end1="none" length1="1.5" y1="0" x1="50" x2="-39"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-10" x1="50" x2="-40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-20" x1="50" x2="-40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-30" x1="50" x2="-40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-40" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-40" x1="50" x2="-47"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="-40" x="-50" height="6"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-40" x="45" height="10"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="30" x="-40" height="6"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="10" x="-45" height="10"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-10" x="-45" height="10"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="20" x="45" height="10"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="0" x="45" height="10"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-20" x="45" height="10"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-180" y="-30" x="-45" height="10"/>
+        <terminal y="40" x="-50" orientation="s"/>
+        <terminal y="40" x="-40" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_radian.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_radian.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/mur_radian.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,32 +1,34 @@
-<definition width="60" version="0.3" hotspot_x="25" hotspot_y="60" height="110" type="element" orientation="dyyy">
-<uuid uuid="{4D11E7C3-94CD-4D07-B7B8-8EEE43EE84D0}"/><names>
-        <name lang="ar">جدار تدفئة</name>
-        <name lang="en">Wall heating</name>
-        <name lang="fr">Mur chauffant</name>
+<definition width="50" hotspot_x="22" type="element" link_type="simple" orientation="dyyy" version="0.5" height="100" hotspot_y="57">
+    <uuid uuid="{5ac1f3a6-518b-4097-a2bb-074f7ca9a4b8}"/>
+    <names>
+        <name lang="cs">Nástěnné topné těleso</name>
         <name lang="pl">Grzejnik ścienny</name>
-        <name lang="cs">Nástěnné topné těleso</name>
         <name lang="it">Parete radiante</name>
+        <name lang="en">Wall heating</name>
         <name lang="nl">Muur verwarming</name>
+        <name lang="ar">جدار تدفئة</name>
+        <name lang="fr">Mur chauffant</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:dotted;line-weight:thin;filling:none;color:black" y1="-32" x1="2" y2="22" x2="2"/>
-        <circle x="-11.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <polygon x4="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="-1" y2="17" x2="22" y3="-52" x3="22" y4="-52"/>
-        <polygon x4="-2" y5="-35" x5="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="-17" y2="-53" x2="11" y3="-53" x3="22" y4="-35"/>
-        <rect width="15" x="-17" y="-35" antialias="false" height="74" 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:dotted;line-weight:thin;filling:none;color:black" y1="-38" x1="10" y2="16" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-42" x1="14" y2="12" x2="14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-46" x1="18" y2="8" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-35" x1="6" y2="19" x2="6"/>
-        <circle x="-11.5" y="28.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-11.5" y="18.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-11.5" y="8.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-11.5" y="-1.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-11.5" y="-22.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-11.5" y="-31.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <terminal x="-10" y="30" orientation="e"/>
-        <terminal x="-10" y="-30" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="-29.45" x="23" text="_"/>
+        <line end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y2="22" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-32" x1="2" x2="2"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="3" y="-12.5" x="-11.5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17" x4="22" antialias="true" y1="39" x1="-1" closed="false" x3="22" y3="-52" y4="-52" x2="22"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-53" x4="-2" antialias="true" y5="-35" y1="-35" x1="-17" x3="22" y3="-53" y4="-35" x2="11" x5="-2"/>
+        <rect width="15" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-35" x="-17" height="74"/>
+        <line end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y2="16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-38" x1="10" x2="10"/>
+        <line end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-42" x1="14" x2="14"/>
+        <line end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y2="8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-46" x1="18" x2="18"/>
+        <line end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y2="19" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-35" x1="6" x2="6"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="3" y="28.5" x="-11.5"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="3" y="18.5" x="-11.5"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="3" y="8.5" x="-11.5"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="3" y="-1.5" x="-11.5"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="3" y="-22.5" x="-11.5"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="3" y="-31.5" x="-11.5"/>
+        <terminal y="-30" x="-10" orientation="e"/>
+        <terminal y="30" x="-10" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/plancher_chauffant_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/plancher_chauffant_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/plancher_chauffant_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,55 +1,56 @@
-<definition width="120" version="0.3" hotspot_x="60" hotspot_y="50" height="100" type="element" orientation="dyyy">
-<uuid uuid="{8C0241E5-2914-4F2D-918E-7C0701F59E40}"/><names>
-        <name lang="ar">سخّان تحت أرضي</name>
-        <name lang="en">Underfloor Heating</name>
-        <name lang="fr">Plancher Chauffant</name>
+<definition width="110" hotspot_x="56" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="44">
+    <uuid uuid="{a0e7757b-6b85-4851-91ce-86e8b658d199}"/>
+    <names>
+        <name lang="cs">Podlahové topné těleso</name>
         <name lang="pl">Ogrzewanie podłogowe</name>
-        <name lang="cs">Podlahové topné těleso</name>
         <name lang="it">Pavimento radiante</name>
+        <name lang="en">Underfloor Heating</name>
         <name lang="nl">Vloer verwarming</name>
+        <name lang="ar">سخّان تحت أرضي</name>
+        <name lang="fr">Plancher Chauffant</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-16" y="36" size="6" text="Plancher  N°"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="6" y2="6" 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="10" x1="9" y2="10" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="0" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17" x1="-10" y2="3" x2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="20" y2="6" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="27" y2="20" x2="-6"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="30" y2="17" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-20" y2="27" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="36" y2="30" x2="-16"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-16" y2="-10" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-27" y2="-20" x2="26"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-30" y2="-16" x2="-30"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="47" y2="40" x2="-26"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27" x1="40" y2="27" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="50" y2="-36" x2="50"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="36" y2="-30" x2="-37"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-40" y2="-26" x2="-40"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-47" y2="-40" x2="46"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-50" y2="-37" x2="-50"/>
-        <arc width="6" x="0" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="6" x="6" y="4" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="6" x="-10" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="6" x="-10" y="14" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="6" x="14" y="4" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="6" x="24" y="14" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="6" x="24" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="6" x="14" y="-10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="6" x="-20" y="-10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="6" x="-30" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="6" x="-20" y="24" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="6" x="-30" y="34" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="6" x="34" y="24" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="6" x="44" y="34" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="6" x="34" y="-30" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="6" x="44" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="6" x="-50" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="6" x="-40" y="-30" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <terminal x="-50" y="40" orientation="s"/>
-        <terminal x="-40" y="40" orientation="s"/>
+        <input tagg="label" size="6" y="36" x="-16" text="Plancher  N°"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" antialias="true" length2="1.5" end1="none" length1="1.5" y1="3" x1="6" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="9" x2="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="true" length2="1.5" end1="none" length1="1.5" y1="0" x1="-7" x2="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" antialias="true" length2="1.5" end1="none" length1="1.5" y1="17" x1="-10" x2="-10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-7" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="true" length2="1.5" end1="none" length1="1.5" y1="20" x1="27" x2="-6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-17" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-6" x1="-20" x2="-20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="30" antialias="true" length2="1.5" end1="none" length1="1.5" y1="30" x1="36" x2="-16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-10" x1="-16" x2="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-20" x1="-27" x2="26"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="true" length2="1.5" end1="none" length1="1.5" y1="37" x1="-30" x2="-30"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" antialias="true" length2="1.5" end1="none" length1="1.5" y1="40" x1="47" x2="-26"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-27" x1="40" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-36" antialias="true" length2="1.5" end1="none" length1="1.5" y1="37" x1="50" x2="50"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-30" x1="36" x2="-37"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-26" antialias="true" length2="1.5" end1="none" length1="1.5" y1="40" x1="-40" x2="-40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-40" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-40" x1="-47" x2="46"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-37" antialias="true" length2="1.5" end1="none" length1="1.5" y1="40" x1="-50" x2="-50"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="0" x="0" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="4" x="6" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="0" x="-10" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="14" x="-10" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="4" x="14" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="14" x="24" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="-20" x="24" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="-10" x="14" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="-10" x="-20" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="-20" x="-30" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="24" x="-20" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="34" x="-30" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="24" x="34" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="34" x="44" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="-30" x="34" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="-40" x="44" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="-40" x="-50" height="6"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="-30" x="-40" height="6"/>
+        <terminal y="40" x="-50" orientation="s"/>
+        <terminal y="40" x="-40" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/radiateur_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/radiateur_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/radiateur_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,70 +1,72 @@
-<definition width="140" version="0.3" hotspot_x="40" hotspot_y="20" height="100" type="element" orientation="dyyy">
-<uuid uuid="{6D046C7E-92F2-4FE4-A896-9B0924C8E320}"/><names>
-        <name lang="ar">مشعاع</name>
-        <name lang="en">Steel radiator</name>
-        <name lang="fr">Radiateur Acier</name>
+<definition width="120" hotspot_x="26" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="9">
+    <uuid uuid="{2456e748-44c7-4ba9-85d9-28c83515eac4}"/>
+    <names>
+        <name lang="cs">Deskové topné těleso</name>
         <name lang="pl">Grzejnik płytowy</name>
-        <name lang="cs">Deskové topné těleso</name>
         <name lang="it">Radiatore</name>
+        <name lang="en">Steel radiator</name>
         <name lang="nl">Radiator staal</name>
+        <name lang="ar">مشعاع</name>
+        <name lang="fr">Radiateur Acier</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="2" x1="-19" y2="2" x2="-17"/>
-        <arc width="4" x="48" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="85" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="83" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <arc width="4" x="74" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="19" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <arc width="4" x="-4" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="-7" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <arc width="4" x="-18" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <polygon x4="-7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-13" y2="3" x2="-10" y3="2" x3="-7" y4="2"/>
-        <polygon x4="83" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="77" y2="3" x2="80" y3="2" x3="83" y4="2"/>
-        <polygon x4="71" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="65" y2="3" x2="68" y3="2" x3="71" y4="2"/>
-        <polygon x4="58" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="52" y2="3" x2="55" y3="2" x3="58" y4="2"/>
-        <polygon x4="45" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="39" y2="3" x2="42" y3="2" x3="45" y4="2"/>
-        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="26" y2="3" x2="29" y3="2" x3="32" y4="2"/>
-        <polygon x4="19" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="13" y2="3" x2="16" y3="2" x3="19" y4="2"/>
-        <polygon x4="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="0" y2="3" x2="3" y3="2" x3="6" y4="2"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="65" y2="67" x2="68" y3="68" x3="71"/>
-        <arc width="4" x="71" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="-13" y2="67" x2="-10" y3="68" x3="-7"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="77" y2="67" x2="80" y3="68" x3="83"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="52" y2="67" x2="55" y3="68" x3="58"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="39" y2="67" x2="42" y3="68" x3="45"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="26" y2="67" x2="29" y3="68" x3="32"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="13" y2="67" x2="16" y3="68" x3="19"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="0" y2="67" x2="3" y3="68" x3="6"/>
-        <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="-14" y2="0" x2="86"/>
-        <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="70" x1="-18" y2="70" x2="83"/>
-        <rect width="2" x="89" y="69" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-21" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-21.4142" y="-1.41421" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.82843"/>
-        <circle x="-22.8284" y="-2.82843" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="5.65685"/>
-        <circle x="-23.6056" y="-3.60555" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7.2111"/>
-        <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="12" x1="-16" y2="58" x2="-16"/>
-        <polygon x4="91" y5="68" x5="91" y6="68" x6="90" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="-17" y2="68" x2="-19" y3="72" x3="-19" y4="72"/>
-        <polygon x4="90" y5="2" x5="90" y6="2" x6="89" y7="2" x7="89" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-19" y2="2" x2="-20" y3="-2" x3="-20" y4="-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="12" x1="73" y2="58" x2="73"/>
-        <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="12" x1="85" y2="58" x2="85"/>
-        <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="13" x1="61" y2="59" x2="61"/>
-        <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="12" x1="35.5" y2="58" x2="35.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="14" x1="48" y2="60" x2="48"/>
-        <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="12" x1="21.5" y2="58" x2="21.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="13" x1="9" y2="59" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12" x1="-4" y2="58" x2="-4"/>
-        <arc width="4" x="-16" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="61" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="35" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="22" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="9" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
-        <arc width="4" x="58" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <arc width="4" x="45" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <arc width="4" x="32" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <arc width="4" x="6" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="90" y="70" orientation="e"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2" x1="-19" x2="-17"/>
+        <input tagg="label" rotate="true" size="9" y="5.55" x="93" text="_"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="48" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="85" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="83" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="74" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="19" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="-4" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="-7" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="-18" height="84"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="-7" antialias="false" y1="2" x1="-13" closed="false" x3="-7" y3="2" y4="2" x2="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="83" antialias="false" y1="2" x1="77" closed="false" x3="83" y3="2" y4="2" x2="80"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="71" antialias="false" y1="2" x1="65" closed="false" x3="71" y3="2" y4="2" x2="68"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="58" antialias="false" y1="2" x1="52" closed="false" x3="58" y3="2" y4="2" x2="55"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="45" antialias="false" y1="2" x1="39" closed="false" x3="45" y3="2" y4="2" x2="42"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="32" antialias="false" y1="2" x1="26" closed="false" x3="32" y3="2" y4="2" x2="29"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="19" antialias="false" y1="2" x1="13" closed="false" x3="19" y3="2" y4="2" x2="16"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="6" antialias="false" y1="2" x1="0" closed="false" x3="6" y3="2" y4="2" x2="3"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="65" closed="false" x3="71" y3="68" x2="68"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="71" height="84"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="-13" closed="false" x3="-7" y3="68" x2="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="77" closed="false" x3="83" y3="68" x2="80"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="52" closed="false" x3="58" y3="68" x2="55"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="39" closed="false" x3="45" y3="68" x2="42"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="26" closed="false" x3="32" y3="68" x2="29"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="13" closed="false" x3="19" y3="68" x2="16"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="67" antialias="false" y1="68" x1="0" closed="false" x3="6" y3="68" x2="3"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-14" x2="86"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="70" antialias="false" length2="1.5" end1="none" length1="1.5" y1="70" x1="-18" x2="83"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="69" x="89" height="2"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-1" x="-21"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.82843" y="-1.41421" x="-21.4142"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="5.65685" y="-2.82843" x="-22.8284"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="7.2111" y="-3.60555" x="-23.6056"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="58" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="-16" x2="-16"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="68" x4="91" x6="90" antialias="false" y6="68" y5="68" y1="68" x1="-17" closed="false" x3="-19" y3="72" y4="72" x2="-19" x5="91"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2" x4="90" x6="89" antialias="false" y7="2" y6="2" y5="2" y1="2" x1="-19" closed="false" x3="-20" y3="-2" y4="-2" x2="-20" x5="90" x7="89"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="58" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="73" x2="73"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="58" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="85" x2="85"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="59" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13" x1="61" x2="61"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="58" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="35.5" x2="35.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="14" x1="48" x2="48"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="58" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="21.5" x2="21.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="59" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13" x1="9" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="58" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="-4" x2="-4"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="-16" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="61" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="35" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="22" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" antialias="true" angle="-103" y="-7.5" x="9" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="58" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="45" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="32" height="84"/>
+        <arc width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-101" y="-6.5" x="6" height="84"/>
+        <terminal y="0" x="-20" orientation="w"/>
+        <terminal y="70" x="90" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/sksw-0.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/sksw-0.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/ballon_echangeur/sksw-0.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,44 +1,45 @@
-<definition width="120" version="0.3" hotspot_x="60" hotspot_y="100" height="200" type="element" orientation="dyyy">
-<uuid uuid="{82C223EA-4103-43A4-81D1-273E9FCB673B}"/><names>
-        <name lang="ar">بالون جامع sksw ecs</name>
-        <name lang="en">tank cobinned sksw ecs</name>
-        <name lang="fr">ballon combinée sksw ecs</name>
+<definition width="100" hotspot_x="50" type="element" link_type="simple" orientation="dyyy" version="0.5" height="200" hotspot_y="99">
+    <uuid uuid="{eb8281db-1f9c-4e62-99d3-0c736d3e2203}"/>
+    <names>
+        <name lang="cs">Kombinovaný zásobník SKSW ECS</name>
         <name lang="pl">Zasobnik kombinowany CWU</name>
-        <name lang="cs">Kombinovaný zásobník SKSW ECS</name>
         <name lang="it">Serbatoio combinato di acqua calda</name>
+        <name lang="en">tank cobinned sksw ecs</name>
         <name lang="nl">tank met wisselaar</name>
+        <name lang="ar">بالون جامع sksw ecs</name>
+        <name lang="fr">ballon combinée sksw ecs</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-25" y="94" size="7" text="Ballon SKS"/>
-        <polygon x4="40" y5="72" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="72" x1="-40" y2="83" x2="-40" y3="83" x3="40" y4="72"/>
-        <polygon y29="-56" x23="-25" x24="24" x25="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" x26="24" x27="-25" x1="20" x28="24" x2="20" x29="-25" x3="-26" y30="-57" x4="25" y31="-59" x5="-26" y32="-60" x6="25" y33="-62" x7="-26" x8="24" y34="-63" x9="-26" y35="-65" x30="24" y36="-66" x31="-25" y37="-68" x32="23" y38="-70" x33="-25" y39="-72" x34="24" x35="-25" x36="24" y1="-95" x37="-25" y2="50" x38="24" y3="50" x39="-25" y4="40" y40="-73" y5="30" y41="-75" y6="20" y42="-76" y7="10" y43="-78" y8="0" y44="-79" y9="-10" y45="-81" x40="23" y46="-82" x41="-25" y47="-84" x42="23" y48="-95" x43="-25" y49="-95" x44="23" antialias="true" x45="-25" x46="23" x47="-20" x48="-20" x49="-20" closed="false" y10="-20" y11="-24" y12="-28" y13="-30" y14="-32" y15="-34" y16="-36" x10="24" y17="-38" x11="-25" y18="-39" x12="24" y19="-41" x13="-25" x14="24" x15="-25" x16="24" x17="-25" x18="24" x19="-25" y20="-42" y21="-44" y22="-45" y23="-47" y24="-48" y25="-50" y26="-51" x20="24" y27="-53" 
-x21="-25" y28="-54" x22="24"/>
-        <rect width="4" x="18" y="-96" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-22" y="-96" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10" x="-42" y="-15" antialias="false" height="79" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
-        <circle x="-39.5" y="-62.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-26" x2="-26" x3="-30" x4="-30" antialias="false" x5="30" x6="30" x7="26" x8="26" x9="26" closed="false" y1="-83" y2="-90" y3="-90" y4="-92" y5="-92" y6="-90" y7="-90" y8="-83" y9="-83"/>
-        <rect width="90" x="-45" y="-69" antialias="true" height="133" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="90" x="-45" y="48" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="90" x="-45" y="-86" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="34.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="34.5" y="22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="34.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="34.5" y="-62.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-39.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-39.5" y="22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-39.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="-37" y="-60" orientation="w"/>
-        <terminal x="-37" y="-10" orientation="w"/>
-        <terminal x="-37" y="25" orientation="w"/>
-        <terminal x="-37" y="60" orientation="w"/>
-        <terminal x="-20" y="-94" orientation="n"/>
-        <terminal x="20" y="-94" orientation="n"/>
-        <terminal x="37" y="-60" orientation="e"/>
-        <terminal x="37" y="-10" orientation="e"/>
-        <terminal x="37" y="25" orientation="e"/>
-        <terminal x="37" y="60" orientation="e"/>
+        <text size="7" y="94" x="-25" text="Ballon SKS"/>
+        <input tagg="label" rotate="true" size="9" y="110.55" x="-7" text="_"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="83" x4="40" antialias="false" y5="72" y1="72" x1="-40" closed="false" x3="40" y3="83" y4="72" x2="-40" x5="40"/>
+        <polygon y40="-73" y21="-44" x4="25" x31="-25" x45="-25" y7="10" y15="-34" y49="-95" x5="-26" x7="-26" y29="-56" y37="-68" x35="-25" x44="23" y27="-53" x18="24" x17="-25" y19="-41" x16="24" y47="-84" y16="-36" x27="-25" y8="0" y12="-28" y39="-72" x36="24" x25="-25" y11="-24" x22="24" y6="20" x37="-25" y20="-42" y28="-54" y5="30" x11="-25" y45="-81" y43="-78" y33="-62" x8="24" x41="-25" y30="-57" x26="24" x23="-25" x42="23" x24="24" x43="-25" x48="-20" y22="-45" x34="24" y26="-51" x29="-25" x13="-25" y1="-95" x49="-20" x10="24" x1="20" y48="-95" y3="50" y13="-30" y18="-39" x15="-25" x46="23" x6="25" x28="24" x38="24" x12="24" y4="40" y25="-50" x47="-20" closed="false" y36="-66" y41="-75" x19="-25" y46="-82" y34="-63" y42="-76" y2="50" x30="24" y10="-20" x39="-25" y23="-47" x32="23" x9="-26" x21="-25" x40="23" y17="-38" y14="-32" x14="24" y31="-59" x2="20" y32="-60" y35="-65" y38="-70" x33="-25" antialias="true" y24="-48" y44="-79" style="line-style:normal;line-weight:normal;filling:none;color:black" y9="-10" x3="-26" x20="24"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-96" x="18" height="4"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-96" x="-22" height="4"/>
+        <rect width="10" style="line-style:dotted;line-weight:normal;filling:none;color:black" antialias="false" y="-15" x="-42" height="79"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-62.5" x="-39.5"/>
+        <polygon y3="-90" x7="26" y9="-83" closed="false" y8="-83" x8="26" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="30" x9="26" y4="-92" x1="-26" x4="-30" y6="-90" x5="30" y5="-92" y2="-90" x2="-26" x3="-30" y7="-90" y1="-83"/>
+        <rect width="90" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-69" x="-45" height="133"/>
+        <arc width="90" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="48" x="-45" height="33"/>
+        <arc width="90" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-86" x="-45" height="33"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-12.5" x="34.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="22.5" x="34.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="57.5" x="34.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-62.5" x="34.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-12.5" x="-39.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="22.5" x="-39.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="57.5" x="-39.5"/>
+        <terminal y="-10" x="-37" orientation="w"/>
+        <terminal y="-60" x="-37" orientation="w"/>
+        <terminal y="-94" x="-20" orientation="n"/>
+        <terminal y="25" x="-37" orientation="w"/>
+        <terminal y="-60" x="37" orientation="e"/>
+        <terminal y="-94" x="20" orientation="n"/>
+        <terminal y="-10" x="37" orientation="e"/>
+        <terminal y="60" x="37" orientation="e"/>
+        <terminal y="25" x="37" orientation="e"/>
+        <terminal y="60" x="-37" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_chicane-plus.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_chicane-plus.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_chicane-plus.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,34 +1,36 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{CD954A8E-9A34-4E45-8AD1-058DB0024E2E}"/><names>
-        <name lang="ar">بالون ومقصورة تبادل D</name>
-        <name lang="en">D ball and compartment</name>
-        <name lang="fr">D ballon et compartiment</name>
+<definition width="110" hotspot_x="49" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="41">
+    <uuid uuid="{39c0656b-76cb-45a8-8f6e-9c379d4f2f03}"/>
+    <names>
+        <name lang="cs">D dělený zásobník</name>
         <name lang="pl">D" wymiennik dzielony</name>
-        <name lang="cs">D dělený zásobník</name>
         <name lang="it">D" Scambiatore</name>
+        <name lang="en">D ball and compartment</name>
         <name lang="nl">type D tank met compartiment</name>
+        <name lang="ar">بالون ومقصورة تبادل D</name>
+        <name lang="fr">D ballon et compartiment</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-45" y="-23" size="9" text="D&quot;"/>
-        <rect width="29" x="-15" y="-20.7" antialias="false" height="52" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-13" y="-1" size="4" text="stockage"/>
-        <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="13" y2="-10" x2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-14" y2="-17" x2="14"/>
-        <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" x1="-14" y2="26" x2="6"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="13" y2="5" x2="6" y3="31" x3="6"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="32" x3="22" x4="32" antialias="true" x5="22" x6="32" x7="12" x8="12" closed="false" y1="-11.2" y2="-11.2" y3="-6.2" y4="-1.2" y5="3.8" y6="8.8" y7="8.8" y8="8.8"/>
-        <polygon x4="41" y5="9" x5="46" y6="9" x6="46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25" x1="12" y2="25" x2="44" y3="15" x3="44" y4="12"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="45" x3="45" x4="41" antialias="false" x5="47" x6="41" x7="46" x8="41" x9="46" closed="false" y1="-15" y2="-15" y3="-6" y4="-3" y5="-1" y6="2" y7="4" y8="7" y9="9"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" x2="-34" x3="-34" x4="-40" antialias="false" x5="-31" x6="-40" x7="-31" x8="-40" x9="-35" closed="false" y1="-19" y2="-19" y10="30" y3="-10" y11="30" y4="-6" y5="-1" x10="-35" y6="4" x11="-11" y7="8" y8="14" y9="19"/>
-        <polygon x4="35" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.8" x1="35" y2="21.8" x2="38" y3="27.8" x3="38" y4="24.8"/>
-        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30.1" x1="-28" y2="27.1" x2="-25" y3="33.1" x3="-25" y4="30.1"/>
-        <circle x="33" y="20.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-30" y="26.1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <text x="-37" y="6.1" size="4" text="solaire"/>
-        <text x="39" y="14" size="4" text="chauff."/>
-        <text x="15" y="0" size="4" text="ECS"/>
-        <text x="-12" y="-23" size="4" text="ballon"/>
+        <text size="9" y="-23" x="-45" text="D&quot;"/>
+        <input tagg="label" rotate="true" size="9" y="-39.45" x="-17" text="_"/>
+        <rect width="29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20.7" x="-15" height="52"/>
+        <text size="4" y="-1" x="-13" text="stockage"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="13" x2="-15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-17" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-14" x2="14"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="26" antialias="false" length2="1.5" end1="none" length1="1.5" y1="26" x1="-14" x2="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" y1="5" x1="13" closed="false" x3="6" y3="31" x2="6"/>
+        <polygon y3="-6.2" x7="12" closed="false" y8="8.8" x8="12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="32" y4="-1.2" x1="12" x4="32" y6="8.8" x5="22" y5="3.8" y2="-11.2" x2="32" x3="22" y7="8.8" y1="-11.2"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="25" x4="41" x6="46" antialias="false" y6="9" y5="9" y1="25" x1="12" closed="false" x3="44" y3="15" y4="12" x2="44" x5="46"/>
+        <polygon y3="-6" x7="46" y9="9" closed="false" y8="7" x8="41" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="41" x9="46" y4="-3" x1="12" x4="41" y6="2" x5="47" y5="-1" y2="-15" x2="45" x3="45" y7="4" y1="-15"/>
+        <polygon y3="-10" x7="-31" y9="19" closed="false" y8="14" x8="-40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-40" x9="-35" y4="-6" x1="-10" x4="-40" y10="30" y6="4" x5="-31" y5="-1" y2="-19" x2="-34" x3="-34" x11="-11" y11="30" y7="8" y1="-19" x10="-35"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21.8" x4="35" antialias="true" y1="24.8" x1="35" x3="38" y3="27.8" y4="24.8" x2="38"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27.1" x4="-28" antialias="true" y1="30.1" x1="-28" x3="-25" y3="33.1" y4="30.1" x2="-25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="20.8" x="33"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="26.1" x="-30"/>
+        <text size="4" y="6.1" x="-37" text="solaire"/>
+        <text size="4" y="14" x="39" text="chauff."/>
+        <text size="4" y="0" x="15" text="ECS"/>
+        <text size="4" y="-23" x="-12" text="ballon"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_combiner_ecs.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_combiner_ecs.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_combiner_ecs.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,32 +1,34 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{D46B6793-76AF-4F9D-9CE2-35440AB6029C}"/><names>
-        <name lang="ar">ECS بالون خزّان مُجمع B1  </name>
-        <name lang="en">1B ball and combined ECS</name>
-        <name lang="fr">1B ballon et combiner ECS</name>
+<definition width="100" hotspot_x="50" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="43">
+    <uuid uuid="{4ebab3d6-d29a-4356-a420-583d935a5168}"/>
+    <names>
+        <name lang="cs">1B zásobník kombinovaný ECS</name>
         <name lang="pl">1B zasobnik kombinowany CWU</name>
-        <name lang="cs">1B zásobník kombinovaný ECS</name>
         <name lang="it">1B Scambiatore ACS</name>
+        <name lang="en">1B ball and combined ECS</name>
         <name lang="nl">type 1B tank met dubbele wisselaar</name>
+        <name lang="ar">ECS بالون خزّان مُجمع B1  </name>
+        <name lang="fr">1B ballon et combiner ECS</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <ellipse width="22" x="-11" y="-26" antialias="true" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-43" y="-18.7" size="9" text="1B"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.7" x1="29" y2="-5.7" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21.7" x1="29" y2="-21.7" x2="6"/>
-        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26.3" x1="24" y2="23.3" x2="27" y3="29.3" x3="27" y4="26.3"/>
-        <polygon x4="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="-29" y2="23" x2="-26" y3="29" x3="-26" y4="26"/>
-        <circle x="22" y="22.3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-31" y="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <rect width="32" x="-16" y="-27.7" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="23" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="23" closed="false" y1="6.3" y2="6.3" y3="11.3" y4="16.3" y5="21.3" y6="26.3" y7="26.3" y8="26.3"/>
-        <text x="-36" y="17" size="4" text="solaire"/>
-        <text x="18" y="18.3" size="4" text="chauff."/>
-        <text x="25" y="-11.7" size="4" text="ECS"/>
-        <text x="-13" y="-31" size="4" text="ballon"/>
-        <polygon x4="-43" y5="21" x5="-33" y6="26" x6="-43" y7="26" x7="-23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-23" y2="6" x2="-43" y3="11" x3="-33" y4="16"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-23" x2="-3" x3="-13" x4="-3" antialias="true" x5="-13" x6="-3" x7="-23" x8="-23" closed="false" y1="6" y2="6" y3="11" y4="16" y5="21" y6="26" y7="26" y8="26"/>
-        <polygon x4="3" y5="21.3" x5="13" y6="26.3" x6="3" y7="26.3" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6.3" x1="23" y2="6.3" x2="3" y3="11.3" x3="13" y4="16.3"/>
+        <input tagg="label" rotate="true" size="9" y="-44.45" x="-7" text="_"/>
+        <ellipse width="22" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-26" x="-11" height="30"/>
+        <text size="9" y="-18.7" x="-43" text="1B"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5.7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5.7" x1="29" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21.7" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="-21.7" x1="29" x2="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="23.3" x4="24" antialias="true" y1="26.3" x1="24" x3="27" y3="29.3" y4="26.3" x2="27"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="23" x4="-29" antialias="true" y1="26" x1="-29" x3="-26" y3="29" y4="26" x2="-26"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="22.3" x="22"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="22" x="-31"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-27.7" x="-16" height="59"/>
+        <polygon y3="11.3" x7="23" closed="false" y8="26.3" x8="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="43" y4="16.3" x1="23" x4="43" y6="26.3" x5="33" y5="21.3" y2="6.3" x2="43" x3="33" y7="26.3" y1="6.3"/>
+        <text size="4" y="17" x="-36" text="solaire"/>
+        <text size="4" y="18.3" x="18" text="chauff."/>
+        <text size="4" y="-11.7" x="25" text="ECS"/>
+        <text size="4" y="-31" x="-13" text="ballon"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" x4="-43" x6="-43" antialias="true" y7="26" y6="26" y5="21" y1="6" x1="-23" closed="false" x3="-33" y3="11" y4="16" x2="-43" x5="-33" x7="-23"/>
+        <polygon y3="11" x7="-23" closed="false" y8="26" x8="-23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-3" y4="16" x1="-23" x4="-3" y6="26" x5="-13" y5="21" y2="6" x2="-3" x3="-13" y7="26" y1="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6.3" x4="3" x6="3" antialias="true" y7="26.3" y6="26.3" y5="21.3" y1="6.3" x1="23" closed="false" x3="13" y3="11.3" y4="16.3" x2="3" x5="13" x7="23"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_double_enveloppe.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_double_enveloppe.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/ballon_double_enveloppe.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,29 +1,31 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{C4D6FC91-1312-401B-83E4-FA883BFE56DF}"/><names>
-        <name lang="ar">بالون بغلاف مُضاعف C</name>
-        <name lang="en">C jacketed flask</name>
-        <name lang="fr">C ballon double enveloppe</name>
+<definition width="110" hotspot_x="55" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="35">
+    <uuid uuid="{1886123d-7722-4441-870f-10ca460d9a5a}"/>
+    <names>
+        <name lang="cs">C zásobník s dvojitým pláštěm</name>
         <name lang="pl">C zasobnik z podwójnym płaszczem</name>
-        <name lang="cs">C zásobník s dvojitým pláštěm</name>
         <name lang="it">C Scambiatore</name>
+        <name lang="en">C jacketed flask</name>
         <name lang="nl">type C tank met uitwendig wisselaar</name>
+        <name lang="ar">بالون بغلاف مُضاعف C</name>
+        <name lang="fr">C ballon double enveloppe</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-39" y="-18" size="9" text="C"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" x2="42" x3="42" x4="38" antialias="false" x5="45" x6="39" x7="44" x8="38" x9="42" closed="false" y1="-22" y2="-22" y10="24" y3="-10" y11="24" y4="-6" y5="-2" x10="42" y6="3" x11="2" y7="6" y8="10" y9="13"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="30" x3="30" x4="24" antialias="false" x5="34" x6="25" x7="30" x8="30" x9="7" closed="false" y1="-15" y2="-15" y10="20" y3="-5" y4="0" y5="5" x10="7" y6="10" y7="15" y8="20" y9="20"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-14" x2="-19" x3="-19" x4="19" antialias="false" x5="19" x6="19" x7="14" x8="14" closed="false" y1="-10" y2="-10" y3="31" y4="31" y5="-10" y6="-10" y7="-10" y8="-10"/>
-        <ellipse width="28" x="-14" y="-29.5" antialias="true" height="58" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="33" y2="21" x2="36" y3="27" x3="36" y4="24"/>
-        <polygon x4="-26" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-26" y2="17" x2="-23" y3="23" x3="-23" y4="20"/>
-        <circle x="31" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-28" y="16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <text x="-49" y="6" size="4" text="solaire"/>
-        <text x="31" y="17" size="4" text="chauff."/>
-        <text x="25" y="-6" size="4" text="ECS"/>
-        <text x="-7" y="-7" size="4" text="ballon"/>
-        <polygon x4="-37" y5="15" x5="-27" y6="20" x6="-37" y7="20" x7="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-17" y2="0" x2="-37" y3="5" x3="-27" y4="10"/>
+        <text size="9" y="-18" x="-39" text="C"/>
+        <input tagg="label" rotate="true" size="9" y="-44.45" x="-12" text="_"/>
+        <polygon y3="-10" x7="44" y9="13" closed="false" y8="10" x8="38" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="39" x9="42" y4="-6" x1="5" x4="38" y10="24" y6="3" x5="45" y5="-2" y2="-22" x2="42" x3="42" x11="2" y11="24" y7="6" y1="-22" x10="42"/>
+        <polygon y3="-5" x7="30" y9="20" closed="false" y8="20" x8="30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="25" x9="7" y4="0" x1="7" x4="24" y10="20" y6="10" x5="34" y5="5" y2="-15" x2="30" x3="30" y7="15" y1="-15" x10="7"/>
+        <polygon y3="31" x7="14" closed="false" y8="-10" x8="14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="19" y4="31" x1="-14" x4="19" y6="-10" x5="19" y5="-10" y2="-10" x2="-19" x3="-19" y7="-10" y1="-10"/>
+        <ellipse width="28" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-29.5" x="-14" height="58"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" x4="33" antialias="true" y1="24" x1="33" x3="36" y3="27" y4="24" x2="36"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17" x4="-26" antialias="true" y1="20" x1="-26" x3="-23" y3="23" y4="20" x2="-23"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="20" x="31"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="16" x="-28"/>
+        <text size="4" y="6" x="-49" text="solaire"/>
+        <text size="4" y="17" x="31" text="chauff."/>
+        <text size="4" y="-6" x="25" text="ECS"/>
+        <text size="4" y="-7" x="-7" text="ballon"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" x4="-37" x6="-37" antialias="true" y7="20" y6="20" y5="15" y1="0" x1="-17" closed="false" x3="-27" y3="5" y4="10" x2="-37" x5="-27" x7="-17"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_echang_plaque.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_echang_plaque.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_echang_plaque.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,40 +1,42 @@
-<definition width="120" version="0.3" hotspot_x="55" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{4F472EAB-1CC7-4A64-8C33-33E8723DC43D}"/><names>
-        <name lang="ar">مُبادل بألواح 1F</name>
-        <name lang="en">Plate heat exchanger 1F</name>
-        <name lang="fr">1F echangeur à plaques</name>
+<definition width="130" hotspot_x="54" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="41">
+    <uuid uuid="{d4bce39b-7db5-4076-b1e3-848350cdc774}"/>
+    <names>
+        <name lang="cs">1F deskový výměník</name>
         <name lang="pl">1F wymiennik płytowy</name>
-        <name lang="cs">1F deskový výměník</name>
         <name lang="it">1F Scambiatore</name>
+        <name lang="en">Plate heat exchanger 1F</name>
         <name lang="nl">type 1F plaat warmtewisselaar</name>
+        <name lang="ar">مُبادل بألواح 1F</name>
+        <name lang="fr">1F echangeur à plaques</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-39" x2="-45" x3="-45" x4="-50" antialias="false" x5="-40" x6="-50" x7="-44" x8="-44" x9="-30" closed="false" y1="14" y2="14" y10="-11" y3="10" y4="5" y5="0" x10="-30" y6="-5" y7="-8" y8="-11" y9="-11"/>
-        <rect width="12" x="-23" y="-9" antialias="false" height="21" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon x4="-14" y5="-8" x5="-20" y6="-11" x6="-20" y7="-11" x7="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="14" x1="-30" y2="14" x2="-20" y3="10" x3="-20" y4="2"/>
-        <polygon x4="-20" y5="-8" x5="-14" y6="-11" x6="-14" y7="-11" x7="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="15" x1="0" y2="15" x2="-14" y3="10" x3="-14" y4="1"/>
-        <text x="-31" y="23" size="4" text="échang.&#xa;plaques"/>
-        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-9" y2="12" x2="-6" y3="18" x3="-6" y4="15"/>
-        <circle x="-11" y="11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <text x="-42" y="-21" size="9" text="1F"/>
-        <text x="37" y="-22.8" size="4" text="stock"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31.2" x1="54" y2="31.2" x2="47"/>
-        <polygon x4="46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="18.2" x1="15" y2="31.2" x2="15" y3="31.2" x3="46" y4="31.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28.8" x1="47" y2="-28.8" x2="55"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-16.8" x1="16" y2="-28.8" x2="16" y3="-28.8" x3="47"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="28" x2="57" x3="57" x4="61" antialias="false" x5="54" x6="60" x7="54" x8="59" x9="54" closed="false" y1="-15.8" y2="-15.8" y10="10.2" y3="-8.8" y11="19.2" y4="-5.8" y12="19.2" y5="-3.8" x10="57" y13="19.2" y6="-0.8" x11="57" y7="1.2" x12="28" y8="4.2" x13="29" y9="7.2"/>
-        <rect width="32" x="-2" y="-18.8" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.2" x1="40" y2="16.2" x2="43" y3="22.2" x3="43" y4="19.2"/>
-        <polygon x4="-37" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="-37" y2="11" x2="-34" y3="17" x3="-34" y4="14"/>
-        <circle x="38" y="15.2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-39" y="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <rect width="32" x="-2" y="9.2" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-43" y="-3" size="4" text="solaire"/>
-        <text x="53" y="10.2" size="4" text="chauff."/>
-        <text x="27" y="3.2" size="4" text="ECS"/>
-        <text x="-6" y="-22.8" size="4" text="bouteille"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="28" x2="48" x3="38" x4="48" antialias="true" x5="38" x6="48" x7="28" x8="28" closed="false" y1="-8.8" y2="-8.8" y3="-3.8" y4="1.2" y5="6.2" y6="11.2" y7="11.2" y8="11.2"/>
+        <polygon y3="10" x7="-44" y9="-11" closed="false" y8="-11" x8="-44" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-50" x9="-30" y4="5" x1="-39" x4="-50" y10="-11" y6="-5" x5="-40" y5="0" y2="14" x2="-45" x3="-45" y7="-8" y1="14" x10="-30"/>
+        <input tagg="label" rotate="true" size="9" y="-49.45" x="-7" text="_"/>
+        <rect width="12" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="-9" x="-23" height="21"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" x4="-14" x6="-20" antialias="false" y7="-11" y6="-11" y5="-8" y1="14" x1="-30" closed="false" x3="-20" y3="10" y4="2" x2="-20" x5="-20" x7="-30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" x4="-20" x6="-14" antialias="false" y7="-11" y6="-11" y5="-8" y1="15" x1="0" closed="false" x3="-14" y3="10" y4="1" x2="-14" x5="-14" x7="0"/>
+        <text size="4" y="23" x="-31" text="échang.&#xa;plaques"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" x4="-9" antialias="true" y1="15" x1="-9" x3="-6" y3="18" y4="15" x2="-6"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="11" x="-11"/>
+        <text size="9" y="-21" x="-42" text="1F"/>
+        <text size="4" y="-22.8" x="37" text="stock"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="31.2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="31.2" x1="54" x2="47"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="31.2" x4="46" antialias="false" y1="18.2" x1="15" closed="false" x3="46" y3="31.2" y4="31.2" x2="15"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-28.8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-28.8" x1="47" x2="55"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-28.8" antialias="false" y1="-16.8" x1="16" closed="false" x3="47" y3="-28.8" x2="16"/>
+        <polygon y3="-8.8" x7="54" y9="7.2" closed="false" y8="4.2" x8="59" x13="29" x12="28" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="19.2" x6="60" x9="54" y13="19.2" y4="-5.8" x1="28" x4="61" y6="-0.8" y10="10.2" x5="54" y5="-3.8" y2="-15.8" x2="57" x3="57" x11="57" y11="19.2" y7="1.2" y1="-15.8" x10="57"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-18.8" x="-2" height="12"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="16.2" x4="40" antialias="true" y1="19.2" x1="40" x3="43" y3="22.2" y4="19.2" x2="43"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="11" x4="-37" antialias="true" y1="14" x1="-37" x3="-34" y3="17" y4="14" x2="-34"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="15.2" x="38"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="10" x="-39"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="9.2" x="-2" height="12"/>
+        <text size="4" y="-3" x="-43" text="solaire"/>
+        <text size="4" y="10.2" x="53" text="chauff."/>
+        <text size="4" y="3.2" x="27" text="ECS"/>
+        <text size="4" y="-22.8" x="-6" text="bouteille"/>
+        <polygon y3="-3.8" x7="28" closed="false" y8="11.2" x8="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="48" y4="1.2" x1="28" x4="48" y6="11.2" x5="38" y5="6.2" y2="-8.8" x2="48" x3="38" y7="11.2" y1="-8.8"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_vanne.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_vanne.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/bouteille_vanne.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,39 +1,41 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{B5BD2EE4-31C5-4FDD-9C56-740B851AAA68}"/><names>
-        <name lang="ar">اسطوانة و صمّام E</name>
-        <name lang="en">E cylinder and valve</name>
-        <name lang="fr">E bouteille et vanne</name>
+<definition width="110" hotspot_x="49" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="42">
+    <uuid uuid="{5af3bd16-3b44-4921-8645-4767461f2899}"/>
+    <names>
+        <name lang="cs">E zásobníky s uzávěrem</name>
         <name lang="pl">E zasobniki z zaworem</name>
-        <name lang="cs">E zásobníky s uzávěrem</name>
         <name lang="it">E cilindro e valvola</name>
+        <name lang="en">E cylinder and valve</name>
         <name lang="nl">type E pijp en kleppen wisselaar</name>
+        <name lang="ar">اسطوانة و صمّام E</name>
+        <name lang="fr">E bouteille et vanne</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-43" y="-22" size="9" text="E"/>
-        <text x="25" y="-22" size="4" text="stock"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="33" y2="31" x2="40"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="2" y2="31" x2="2" y3="31" x3="33"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27" x1="42" y2="-27" x2="37"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-14" x1="2" y2="-27" x2="2" y3="-27" x3="37"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="-7" y2="5" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-1" y2="3" x2="-7"/>
-        <rect width="3" x="-2" y="6" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-2" y="-4" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="4" y5="0" x5="-5" y6="0" x6="-5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="4" y3="6" x3="-5" y4="6"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="41" x3="41" x4="45" antialias="false" x5="38" x6="44" x7="38" x8="43" x9="38" closed="false" y1="-13.2" y2="-13.2" y10="12.8" y3="-6.2" y11="21.8" y4="-3.2" y12="21.8" y5="-1.2" x10="41" y13="21.8" y6="1.8" x11="41" y7="3.8" x12="12" y8="6.8" x13="13" y9="9.8"/>
-        <rect width="32" x="-18" y="-16.2" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21.8" x1="24" y2="18.8" x2="27" y3="24.8" x3="27" y4="21.8"/>
-        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13.8" x1="-30" y2="10.8" x2="-27" y3="16.8" x3="-27" y4="13.8"/>
-        <circle x="22" y="17.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-32" y="9.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <rect width="32" x="-18" y="11.8" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-37" y="5.8" size="4" text="solaire"/>
-        <text x="37" y="12.8" size="4" text="chauff."/>
-        <text x="11" y="5.8" size="4" text="ECS"/>
-        <text x="-22" y="-20" size="4" text="bouteille"/>
-        <polygon x4="-45" y5="8.8" x5="-35" y6="13.8" x6="-45" y7="13.8" x7="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6.2" x1="-12" y2="-6.2" x2="-45" y3="-1.2" x3="-35" y4="3.8"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="32" x3="22" x4="32" antialias="true" x5="22" x6="32" x7="12" x8="12" closed="false" y1="-6.2" y2="-6.2" y3="-1.2" y4="3.8" y5="8.8" y6="13.8" y7="13.8" y8="13.8"/>
+        <input tagg="label" rotate="true" size="9" y="-39.45" x="-22" text="_"/>
+        <text size="9" y="-22" x="-43" text="E"/>
+        <text size="4" y="-22" x="25" text="stock"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="31" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="31" x1="33" x2="40"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="31" antialias="false" y1="21" x1="2" closed="false" x3="33" y3="31" x2="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-27" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="-27" x1="42" x2="37"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-27" antialias="false" y1="-14" x1="2" closed="false" x3="37" y3="-27" x2="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="1" x1="-7" x2="-7"/>
+        <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="-7"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="6" x="-2" height="6"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4" x="-2" height="4"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" x4="4" x6="-5" antialias="true" y6="0" y5="0" y1="0" x1="-5" closed="false" x3="-5" y3="6" y4="6" x2="4" x5="-5"/>
+        <polygon y3="-6.2" x7="38" y9="9.8" closed="false" y8="6.8" x8="43" x13="13" x12="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="21.8" x6="44" x9="38" y13="21.8" y4="-3.2" x1="12" x4="45" y6="1.8" y10="12.8" x5="38" y5="-1.2" y2="-13.2" x2="41" x3="41" x11="41" y11="21.8" y7="3.8" y1="-13.2" x10="41"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-16.2" x="-18" height="12"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="18.8" x4="24" antialias="true" y1="21.8" x1="24" x3="27" y3="24.8" y4="21.8" x2="27"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10.8" x4="-30" antialias="true" y1="13.8" x1="-30" x3="-27" y3="16.8" y4="13.8" x2="-27"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="17.8" x="22"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="9.8" x="-32"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="11.8" x="-18" height="12"/>
+        <text size="4" y="5.8" x="-37" text="solaire"/>
+        <text size="4" y="12.8" x="37" text="chauff."/>
+        <text size="4" y="5.8" x="11" text="ECS"/>
+        <text size="4" y="-20" x="-22" text="bouteille"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.2" x4="-45" x6="-45" antialias="true" y7="13.8" y6="13.8" y5="8.8" y1="-6.2" x1="-12" closed="false" x3="-35" y3="-1.2" y4="3.8" x2="-45" x5="-35" x7="-12"/>
+        <polygon y3="-1.2" x7="12" closed="false" y8="13.8" x8="12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="32" y4="3.8" x1="12" x4="32" y6="13.8" x5="22" y5="8.8" y2="-6.2" x2="32" x3="22" y7="13.8" y1="-6.2"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/chicane.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/chicane.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/chicane.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{35AEE90B-3C7F-4554-98D2-1D57A895C55D}"/><names>
-        <name lang="ar">بالون و عوارض D</name>
-        <name lang="en">D ball and baffles</name>
-        <name lang="fr">D ballon et chicanes</name>
+<definition width="110" hotspot_x="50" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="44">
+    <uuid uuid="{570ed40b-64c6-466f-8ac4-2b791bde175d}"/>
+    <names>
+        <name lang="cs">D zásobník s přehradami</name>
         <name lang="pl">D zasobnik z przegrodami</name>
-        <name lang="cs">D zásobník s přehradami</name>
         <name lang="it">D Scambiatore</name>
+        <name lang="en">D ball and baffles</name>
         <name lang="nl">type D tank met wisselaar</name>
+        <name lang="ar">بالون و عوارض D</name>
+        <name lang="fr">D ballon et chicanes</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-45" y="-24" size="9" text="D"/>
-        <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="-14" y2="6" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-12" y2="3" x2="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-13" y2="-1" x2="11"/>
-        <rect width="29" x="-15" y="-22" antialias="false" height="52" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="41" x3="41" x4="45" antialias="false" x5="38" x6="44" x7="38" x8="43" x9="38" closed="false" y1="-14.2" y2="-14.2" y10="11.8" y3="-7.2" y11="20.8" y4="-4.2" y12="20.8" y5="-2.2" x10="41" y13="20.8" y6="0.8" x11="41" y7="2.8" x12="12" y8="5.8" x13="13" y9="8.8"/>
-        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20.8" x1="24" y2="17.8" x2="27" y3="23.8" x3="27" y4="20.8"/>
-        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.8" x1="-30" y2="9.8" x2="-27" y3="15.8" x3="-27" y4="12.8"/>
-        <circle x="22" y="16.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-32" y="8.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <text x="-37" y="4.8" size="4" text="solaire"/>
-        <text x="37" y="11.8" size="4" text="chauff."/>
-        <text x="15" y="5" size="4" text="ECS"/>
-        <text x="-10" y="-27" size="4" text="bouteille"/>
-        <polygon x4="-45" y5="7.8" x5="-35" y6="12.8" x6="-45" y7="12.8" x7="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7.2" x1="-12" y2="-7.2" x2="-45" y3="-2.2" x3="-35" y4="2.8"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="32" x3="22" x4="32" antialias="true" x5="22" x6="32" x7="12" x8="12" closed="false" y1="-7.2" y2="-7.2" y3="-2.2" y4="2.8" y5="7.8" y6="12.8" y7="12.8" y8="12.8"/>
+        <input tagg="label" rotate="true" size="9" y="-43.5" x="-9" text="_"/>
+        <text size="9" y="-24" x="-45" text="D"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6" x1="-14" x2="12"/>
+        <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="-12" x2="11"/>
+        <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="-13" x2="11"/>
+        <rect width="29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-22" x="-15" height="52"/>
+        <polygon y3="-7.2" x7="38" y9="8.8" closed="false" y8="5.8" x8="43" x13="13" x12="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="20.8" x6="44" x9="38" y13="20.8" y4="-4.2" x1="12" x4="45" y6="0.8" y10="11.8" x5="38" y5="-2.2" y2="-14.2" x2="41" x3="41" x11="41" y11="20.8" y7="2.8" y1="-14.2" x10="41"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17.8" x4="24" antialias="true" y1="20.8" x1="24" x3="27" y3="23.8" y4="20.8" x2="27"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9.8" x4="-30" antialias="true" y1="12.8" x1="-30" x3="-27" y3="15.8" y4="12.8" x2="-27"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="16.8" x="22"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="8.8" x="-32"/>
+        <text size="4" y="4.8" x="-37" text="solaire"/>
+        <text size="4" y="11.8" x="37" text="chauff."/>
+        <text size="4" y="5" x="15" text="ECS"/>
+        <text size="4" y="-27" x="-10" text="bouteille"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7.2" x4="-45" x6="-45" antialias="true" y7="12.8" y6="12.8" y5="7.8" y1="-7.2" x1="-12" closed="false" x3="-35" y3="-2.2" y4="2.8" x2="-45" x5="-35" x7="-12"/>
+        <polygon y3="-2.2" x7="12" closed="false" y8="12.8" x8="12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="32" y4="2.8" x1="12" x4="32" y6="12.8" x5="22" y5="7.8" y2="-7.2" x2="32" x3="22" y7="12.8" y1="-7.2"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/direct.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/direct.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/direct.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,30 +1,32 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{47A4335D-E4A3-42B6-A64B-891499FC79D5}"/><names>
-        <name lang="ar">تبادل غير مباشر</name>
-        <name lang="en">A indirect exchange</name>
-        <name lang="fr">A échange indirecte</name>
+<definition width="90" hotspot_x="45" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="39">
+    <uuid uuid="{d5225de9-1d96-48ba-85c6-aa465047fde5}"/>
+    <names>
+        <name lang="cs">A nepřímý výměník A</name>
         <name lang="pl">A wymiennik pośredni</name>
-        <name lang="cs">A nepřímý výměník A</name>
         <name lang="it">A Scambio indiretto</name>
+        <name lang="en">A indirect exchange</name>
         <name lang="nl">type A wisselaar indirect</name>
+        <name lang="ar">تبادل غير مباشر</name>
+        <name lang="fr">A échange indirecte</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-42" y="-23" size="9" text="A"/>
-        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="24" y2="21" x2="27" y3="27" x3="27" y4="24"/>
-        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
-        <circle x="22" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <rect width="32" x="-16" y="-30" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="23" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="23" closed="false" y1="4" y2="4" y3="9" y4="14" y5="19" y6="24" y7="24" y8="24"/>
-        <text x="-35" y="2" size="4" text="solaire"/>
-        <text x="18" y="16" size="4" text="chauff."/>
-        <text x="21" y="-11" size="4" text="ECS"/>
-        <text x="-14" y="-21" size="4" text="ballon"/>
-        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-23" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" x2="-2" x3="-12" x4="-2" antialias="true" x5="-12" x6="-2" x7="-22" x8="-22" closed="false" y1="-10" y2="-10" y3="-5" y4="0" y5="5" y6="10" y7="10" y8="10"/>
-        <polygon x4="3" y5="19" x5="13" y6="24" x6="3" y7="24" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="4" x1="23" y2="4" x2="3" y3="9" x3="13" y4="14"/>
-        <polygon x4="3" y5="-9" x5="13" y6="-4" x6="3" y7="-4" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-24" x1="23" y2="-24" x2="3" y3="-19" x3="13" y4="-14"/>
+        <input tagg="label" rotate="true" size="9" y="-39.45" x="-7" text="_"/>
+        <text size="9" y="-23" x="-42" text="A"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" x4="24" antialias="true" y1="24" x1="24" x3="27" y3="27" y4="24" x2="27"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="-28" antialias="true" y1="10" x1="-28" x3="-25" y3="13" y4="10" x2="-25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="20" x="22"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="6" x="-30"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-30" x="-16" height="59"/>
+        <polygon y3="9" x7="23" closed="false" y8="24" x8="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="43" y4="14" x1="23" x4="43" y6="24" x5="33" y5="19" y2="4" x2="43" x3="33" y7="24" y1="4"/>
+        <text size="4" y="2" x="-35" text="solaire"/>
+        <text size="4" y="16" x="18" text="chauff."/>
+        <text size="4" y="-11" x="21" text="ECS"/>
+        <text size="4" y="-21" x="-14" text="ballon"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" x4="-43" x6="-43" antialias="true" y7="10" y6="10" y5="5" y1="-10" x1="-23" closed="false" x3="-33" y3="-5" y4="0" x2="-43" x5="-33" x7="-23"/>
+        <polygon y3="-5" x7="-22" closed="false" y8="10" x8="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-2" y4="0" x1="-22" x4="-2" y6="10" x5="-12" y5="5" y2="-10" x2="-2" x3="-12" y7="10" y1="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="3" x6="3" antialias="true" y7="24" y6="24" y5="19" y1="4" x1="23" closed="false" x3="13" y3="9" y4="14" x2="3" x5="13" x7="23"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-24" x4="3" x6="3" antialias="true" y7="-4" y6="-4" y5="-9" y1="-24" x1="23" closed="false" x3="13" y3="-19" y4="-14" x2="3" x5="13" x7="23"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_chauffage.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_chauffage.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_chauffage.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,30 +1,32 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{6F9F778B-62C7-429E-8345-4973C2F537C8}"/><names>
-        <name lang="ar">تبادل مباشر C</name>
-        <name lang="en">C direct exchange</name>
-        <name lang="fr">C échange direct</name>
+<definition width="90" hotspot_x="45" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="38">
+    <uuid uuid="{f46a4b89-75dc-4630-8fda-1f20f3ab89a7}"/>
+    <names>
+        <name lang="cs">C přímý výměník</name>
         <name lang="pl">C Wymiennik pośredni</name>
-        <name lang="cs">C přímý výměník</name>
         <name lang="it">C Scambio diretto</name>
+        <name lang="en">C direct exchange</name>
         <name lang="nl">type C tank wisselaar direct</name>
+        <name lang="ar">تبادل مباشر C</name>
+        <name lang="fr">C échange direct</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-40" y="-22" size="9" text="C"/>
-        <circle x="21" y="-8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="21" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <polygon x4="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="23" y2="-7" x2="26" y3="-1" x3="26" y4="-4"/>
-        <polygon x4="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="23" y2="21" x2="26" y3="27" x3="26" y4="24"/>
-        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
-        <rect width="32" x="-16" y="-29.5" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="10" closed="false" y1="4.5" y2="4.5" y3="9.5" y4="14.5" y5="19.5" y6="24.5" y7="24.5" y8="24.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" x2="42" x3="32" x4="42" antialias="true" x5="32" x6="42" x7="22" x8="10" closed="false" y1="-23.5" y2="-23.5" y3="-18.5" y4="-13.5" y5="-8.5" y6="-3.5" y7="-3.5" y8="-3.5"/>
-        <text x="-35" y="2.5" size="4" text="solaire"/>
-        <text x="18" y="16.5" size="4" text="chauff."/>
-        <text x="21" y="-10.5" size="4" text="ECS"/>
-        <text x="-14" y="-20.5" size="4" text="ballon"/>
-        <polygon x4="-43" y5="5.5" x5="-33" y6="10.5" x6="-43" y7="10.5" x7="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9.5" x1="-10" y2="-9.5" x2="-43" y3="-4.5" x3="-33" y4="0.5"/>
+        <text size="9" y="-22" x="-40" text="C"/>
+        <input tagg="label" rotate="true" size="9" y="-44.45" x="-12" text="_"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="-8" x="21"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="20" x="21"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="6" x="-30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" x4="23" antialias="true" y1="-4" x1="23" x3="26" y3="-1" y4="-4" x2="26"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" x4="23" antialias="true" y1="24" x1="23" x3="26" y3="27" y4="24" x2="26"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="-28" antialias="true" y1="10" x1="-28" x3="-25" y3="13" y4="10" x2="-25"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-29.5" x="-16" height="59"/>
+        <polygon y3="9.5" x7="23" closed="false" y8="24.5" x8="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="43" y4="14.5" x1="10" x4="43" y6="24.5" x5="33" y5="19.5" y2="4.5" x2="43" x3="33" y7="24.5" y1="4.5"/>
+        <polygon y3="-18.5" x7="22" closed="false" y8="-3.5" x8="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="42" y4="-13.5" x1="10" x4="42" y6="-3.5" x5="32" y5="-8.5" y2="-23.5" x2="42" x3="32" y7="-3.5" y1="-23.5"/>
+        <text size="4" y="2.5" x="-35" text="solaire"/>
+        <text size="4" y="16.5" x="18" text="chauff."/>
+        <text size="4" y="-10.5" x="21" text="ECS"/>
+        <text size="4" y="-20.5" x="-14" text="ballon"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9.5" x4="-43" x6="-43" antialias="true" y7="10.5" y6="10.5" y5="5.5" y1="-9.5" x1="-10" closed="false" x3="-33" y3="-4.5" y4="0.5" x2="-43" x5="-33" x7="-10"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_ecs.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_ecs.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/direct_ecs.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{C7E41E71-7B1D-4593-A2B8-EE9E7BAC9A6F}"/><names>
-        <name lang="ar">A تبادل غير مباشر / بالون ECS</name>
-        <name lang="en">A indirect exchange / DHW tank</name>
-        <name lang="fr">A échange indirect / ballon ecs</name>
+<definition width="100" hotspot_x="50" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="38">
+    <uuid uuid="{75688444-eac1-4e8e-b41a-1f6b83be0a80}"/>
+    <names>
+        <name lang="cs">A nepřímý výměník/zásobník ECS</name>
         <name lang="pl">A wymiennik posredni / zasobnik CWU</name>
-        <name lang="cs">A nepřímý výměník/zásobník ECS</name>
         <name lang="it">A Scambio indiretto / serbatoio ACS</name>
+        <name lang="en">A indirect exchange / DHW tank</name>
         <name lang="nl">type A wisselaar indirect + heetwatertank</name>
+        <name lang="ar">A تبادل غير مباشر / بالون ECS</name>
+        <name lang="fr">A échange indirect / ballon ecs</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-43" y="-21" size="9" text="A&quot;"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="29" y2="-8" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="29" y2="-24" x2="6"/>
-        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="24" y2="21" x2="27" y3="27" x3="27" y4="24"/>
-        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
-        <circle x="22" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <rect width="32" x="-16" y="-30" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="23" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="23" closed="false" y1="4" y2="4" y3="9" y4="14" y5="19" y6="24" y7="24" y8="24"/>
-        <text x="-35" y="2" size="4" text="solaire"/>
-        <text x="18" y="16" size="4" text="chauff."/>
-        <text x="25" y="-14" size="4" text="ECS"/>
-        <text x="-14" y="-21" size="4" text="ballon"/>
-        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-23" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" x2="-2" x3="-12" x4="-2" antialias="true" x5="-12" x6="-2" x7="-22" x8="-22" closed="false" y1="-10" y2="-10" y3="-5" y4="0" y5="5" y6="10" y7="10" y8="10"/>
-        <polygon x4="3" y5="19" x5="13" y6="24" x6="3" y7="24" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="4" x1="23" y2="4" x2="3" y3="9" x3="13" y4="14"/>
+        <text size="9" y="-21" x="-43" text="A&quot;"/>
+        <input tagg="label" rotate="true" size="9" y="-44.45" x="-12" text="_"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8" x1="29" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-24" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="-24" x1="29" x2="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" x4="24" antialias="true" y1="24" x1="24" x3="27" y3="27" y4="24" x2="27"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="-28" antialias="true" y1="10" x1="-28" x3="-25" y3="13" y4="10" x2="-25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="20" x="22"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="6" x="-30"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-30" x="-16" height="59"/>
+        <polygon y3="9" x7="23" closed="false" y8="24" x8="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="43" y4="14" x1="23" x4="43" y6="24" x5="33" y5="19" y2="4" x2="43" x3="33" y7="24" y1="4"/>
+        <text size="4" y="2" x="-35" text="solaire"/>
+        <text size="4" y="16" x="18" text="chauff."/>
+        <text size="4" y="-14" x="25" text="ECS"/>
+        <text size="4" y="-21" x="-14" text="ballon"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" x4="-43" x6="-43" antialias="true" y7="10" y6="10" y5="5" y1="-10" x1="-23" closed="false" x3="-33" y3="-5" y4="0" x2="-43" x5="-33" x7="-23"/>
+        <polygon y3="-5" x7="-22" closed="false" y8="10" x8="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-2" y4="0" x1="-22" x4="-2" y6="10" x5="-12" y5="5" y2="-10" x2="-2" x3="-12" y7="10" y1="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="3" x6="3" antialias="true" y7="24" y6="24" y5="19" y1="4" x1="23" closed="false" x3="13" y3="9" y4="14" x2="3" x5="13" x7="23"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/echangeur.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/echangeur.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/echangeur.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,34 +1,36 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{21080FD8-DD94-49B9-9A74-85E326685AE9}"/><names>
-        <name lang="ar">خزّان F</name>
-        <name lang="en">F bottle</name>
-        <name lang="fr">F bouteille</name>
+<definition width="110" hotspot_x="47" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="37">
+    <uuid uuid="{8205a137-368a-4d61-80af-d625248dd5b2}"/>
+    <names>
+        <name lang="cs">F lahvový výměník</name>
         <name lang="pl">F zbiorniki</name>
-        <name lang="cs">F lahvový výměník</name>
         <name lang="it">F Scambiatore</name>
+        <name lang="en">F bottle</name>
         <name lang="nl">type F Pijp wisselaar</name>
+        <name lang="ar">خزّان F</name>
+        <name lang="fr">F bouteille</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-41" y="-21" size="9" text="F"/>
-        <text x="23" y="-24" size="4" text="stock"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="40" y2="30" x2="33"/>
-        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="17" x1="1" y2="30" x2="1" y3="30" x3="32" y4="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="33" y2="-30" x2="41"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-18" x1="2" y2="-30" x2="2" y3="-30" x3="33"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="43" x3="43" x4="47" antialias="false" x5="40" x6="46" x7="40" x8="45" x9="40" closed="false" y1="-17" y2="-17" y10="9" y3="-10" y11="18" y4="-7" y12="18" y5="-5" x10="43" y13="18" y6="-2" x11="43" y7="0" x12="14" y8="3" x13="15" y9="6"/>
-        <rect width="32" x="-16" y="-20" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="26" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="26" y2="15" x2="29" y3="21" x3="29" y4="18"/>
-        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
-        <circle x="24" y="14" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <rect width="32" x="-16" y="8" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-35" y="2" size="4" text="solaire"/>
-        <text x="39" y="9" size="4" text="chauff."/>
-        <text x="13" y="2" size="4" text="ECS"/>
-        <text x="-20" y="-24" size="4" text="bouteille"/>
-        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="34" x3="24" x4="34" antialias="true" x5="24" x6="34" x7="14" x8="14" closed="false" y1="-10" y2="-10" y3="-5" y4="0" y5="5" y6="10" y7="10" y8="10"/>
+        <text size="9" y="-21" x="-41" text="F"/>
+        <input tagg="label" rotate="true" size="9" y="-44.45" x="-7" text="_"/>
+        <text size="4" y="-24" x="23" text="stock"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="30" antialias="false" length2="1.5" end1="none" length1="1.5" y1="30" x1="40" x2="33"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="30" x4="32" antialias="false" y1="17" x1="1" closed="false" x3="32" y3="30" y4="30" x2="1"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="33" x2="41"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="false" y1="-18" x1="2" closed="false" x3="33" y3="-30" x2="2"/>
+        <polygon y3="-10" x7="40" y9="6" closed="false" y8="3" x8="45" x13="15" x12="14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="18" x6="46" x9="40" y13="18" y4="-7" x1="14" x4="47" y6="-2" y10="9" x5="40" y5="-5" y2="-17" x2="43" x3="43" x11="43" y11="18" y7="0" y1="-17" x10="43"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20" x="-16" height="12"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" x4="26" antialias="true" y1="18" x1="26" x3="29" y3="21" y4="18" x2="29"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="-28" antialias="true" y1="10" x1="-28" x3="-25" y3="13" y4="10" x2="-25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="14" x="24"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="6" x="-30"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="8" x="-16" height="12"/>
+        <text size="4" y="2" x="-35" text="solaire"/>
+        <text size="4" y="9" x="39" text="chauff."/>
+        <text size="4" y="2" x="13" text="ECS"/>
+        <text size="4" y="-24" x="-20" text="bouteille"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" x4="-43" x6="-43" antialias="true" y7="10" y6="10" y5="5" y1="-10" x1="-10" closed="false" x3="-33" y3="-5" y4="0" x2="-43" x5="-33" x7="-10"/>
+        <polygon y3="-5" x7="14" closed="false" y8="10" x8="14" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="34" y4="0" x1="14" x4="34" y6="10" x5="24" y5="5" y2="-10" x2="34" x3="24" y7="10" y1="-10"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/indirecte.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/indirecte.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/indirecte.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{B92EF073-1CD3-49AD-A2AA-C0BE0B35D031}"/><names>
-        <name lang="ar">شبه مباشر B</name>
-        <name lang="en">B semi-direct</name>
-        <name lang="fr">B semi-direct</name>
+<definition width="90" hotspot_x="45" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="38">
+    <uuid uuid="{c0efc47e-c6e2-42f0-b26a-f604f5be790f}"/>
+    <names>
+        <name lang="cs">B polopřímý</name>
         <name lang="pl">B półpośredni</name>
-        <name lang="cs">B polopřímý</name>
         <name lang="it">B Semi-diretto</name>
+        <name lang="en">B semi-direct</name>
         <name lang="nl">type B Sub direct 1</name>
+        <name lang="ar">شبه مباشر B</name>
+        <name lang="fr">B semi-direct</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-41" y="-21" size="9" text="B"/>
-        <circle x="19" y="-8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-31" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="19" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <polygon x4="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="21" y2="21" x2="24" y3="27" x3="24" y4="24"/>
-        <polygon x4="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="21" y2="-7" x2="24" y3="-1" x3="24" y4="-4"/>
-        <polygon x4="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-29" y2="7" x2="-26" y3="13" x3="-26" y4="10"/>
-        <rect width="32" x="-16" y="-30" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="23" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="23" closed="false" y1="4" y2="4" y3="9" y4="14" y5="19" y6="24" y7="24" y8="24"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="8" x2="42" x3="32" x4="42" antialias="true" x5="32" x6="42" x7="22" x8="8" closed="false" y1="-24" y2="-24" y3="-19" y4="-14" y5="-9" y6="-4" y7="-4" y8="-4"/>
-        <text x="-35" y="2" size="4" text="solaire"/>
-        <text x="18" y="16" size="4" text="chauff."/>
-        <text x="21" y="-11" size="4" text="ECS"/>
-        <text x="-14" y="-21" size="4" text="ballon"/>
-        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
-        <polygon x4="3" y5="19" x5="13" y6="24" x6="3" y7="24" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="4" x1="23" y2="4" x2="3" y3="9" x3="13" y4="14"/>
+        <input tagg="label" rotate="true" size="9" y="-49.45" x="-12" text="_"/>
+        <text size="9" y="-21" x="-41" text="B"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="-8" x="19"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="6" x="-31"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="20" x="19"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" x4="21" antialias="true" y1="24" x1="21" x3="24" y3="27" y4="24" x2="24"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" x4="21" antialias="true" y1="-4" x1="21" x3="24" y3="-1" y4="-4" x2="24"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="-29" antialias="true" y1="10" x1="-29" x3="-26" y3="13" y4="10" x2="-26"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-30" x="-16" height="59"/>
+        <polygon y3="9" x7="23" closed="false" y8="24" x8="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="43" y4="14" x1="23" x4="43" y6="24" x5="33" y5="19" y2="4" x2="43" x3="33" y7="24" y1="4"/>
+        <polygon y3="-19" x7="22" closed="false" y8="-4" x8="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="42" y4="-14" x1="8" x4="42" y6="-4" x5="32" y5="-9" y2="-24" x2="42" x3="32" y7="-4" y1="-24"/>
+        <text size="4" y="2" x="-35" text="solaire"/>
+        <text size="4" y="16" x="18" text="chauff."/>
+        <text size="4" y="-11" x="21" text="ECS"/>
+        <text size="4" y="-21" x="-14" text="ballon"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" x4="-43" x6="-43" antialias="true" y7="10" y6="10" y5="5" y1="-10" x1="-10" closed="false" x3="-33" y3="-5" y4="0" x2="-43" x5="-33" x7="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="3" x6="3" antialias="true" y7="24" y6="24" y5="19" y1="4" x1="23" closed="false" x3="13" y3="9" y4="14" x2="3" x5="13" x7="23"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/base_distrib/semi-direct_bis.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/base_distrib/semi-direct_bis.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/base_distrib/semi-direct_bis.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{AB29BB98-C24D-4819-B6FB-58133562BEEB}"/><names>
-        <name lang="ar">شبه مباشر "B</name>
-        <name lang="en">B semi-direct 2</name>
-        <name lang="fr">B" semi directe bis</name>
+<definition width="90" hotspot_x="44" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="38">
+    <uuid uuid="{e950e085-2f0e-42fe-bff4-1ddfa590fc56}"/>
+    <names>
+        <name lang="cs">B polopřímý</name>
         <name lang="pl">B" półpośredni</name>
-        <name lang="cs">B polopřímý</name>
         <name lang="it">B Semi-diretto 2</name>
+        <name lang="en">B semi-direct 2</name>
         <name lang="nl">type B Sub direct 2</name>
+        <name lang="ar">شبه مباشر "B</name>
+        <name lang="fr">B" semi directe bis</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-41" y="-22" size="9" text="B&quot;"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-32" x2="2" x3="-8" x4="2" antialias="true" x5="-8" x6="2" x7="-18" x8="-32" closed="false" y1="-9.5" y2="-9.5" y3="-4.5" y4="0.5" y5="5.5" y6="10.5" y7="10.5" y8="10.5"/>
-        <rect width="32" x="-15" y="-29.5" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="20" y="-7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="-30" y="6.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <circle x="20" y="20.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <polygon x4="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.5" x1="22" y2="21.5" x2="25" y3="27.5" x3="25" y4="24.5"/>
-        <polygon x4="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.5" x1="22" y2="-6.5" x2="25" y3="-0.5" x3="25" y4="-3.5"/>
-        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.5" x1="-28" y2="7.5" x2="-25" y3="13.5" x3="-25" y4="10.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="44" x3="34" x4="44" antialias="true" x5="34" x6="44" x7="24" x8="12" closed="false" y1="4.5" y2="4.5" y3="9.5" y4="14.5" y5="19.5" y6="24.5" y7="24.5" y8="24.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="9" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="9" closed="false" y1="-23.5" y2="-23.5" y3="-18.5" y4="-13.5" y5="-8.5" y6="-3.5" y7="-3.5" y8="-3.5"/>
-        <text x="-34" y="2.5" size="4" text="solaire"/>
-        <text x="19" y="16.5" size="4" text="chauff."/>
-        <text x="22" y="-10.5" size="4" text="ECS"/>
-        <text x="-13" y="-20.5" size="4" text="ballon"/>
-        <polygon x4="-42" y5="5.5" x5="-32" y6="10.5" x6="-42" y7="10.5" x7="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9.5" x1="-9" y2="-9.5" x2="-42" y3="-4.5" x3="-32" y4="0.5"/>
+        <text size="9" y="-22" x="-41" text="B&quot;"/>
+        <input tagg="label" rotate="true" size="9" y="-49.45" x="-7" text="_"/>
+        <polygon y3="-4.5" x7="-18" closed="false" y8="10.5" x8="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="2" y4="0.5" x1="-32" x4="2" y6="10.5" x5="-8" y5="5.5" y2="-9.5" x2="2" x3="-8" y7="10.5" y1="-9.5"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-29.5" x="-15" height="59"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="-7.5" x="20"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="6.5" x="-30"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8" y="20.5" x="20"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21.5" x4="22" antialias="true" y1="24.5" x1="22" x3="25" y3="27.5" y4="24.5" x2="25"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.5" x4="22" antialias="true" y1="-3.5" x1="22" x3="25" y3="-0.5" y4="-3.5" x2="25"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7.5" x4="-28" antialias="true" y1="10.5" x1="-28" x3="-25" y3="13.5" y4="10.5" x2="-25"/>
+        <polygon y3="9.5" x7="24" closed="false" y8="24.5" x8="12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="44" y4="14.5" x1="12" x4="44" y6="24.5" x5="34" y5="19.5" y2="4.5" x2="44" x3="34" y7="24.5" y1="4.5"/>
+        <polygon y3="-18.5" x7="23" closed="false" y8="-3.5" x8="9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="43" y4="-13.5" x1="9" x4="43" y6="-3.5" x5="33" y5="-8.5" y2="-23.5" x2="43" x3="33" y7="-3.5" y1="-23.5"/>
+        <text size="4" y="2.5" x="-34" text="solaire"/>
+        <text size="4" y="16.5" x="19" text="chauff."/>
+        <text size="4" y="-10.5" x="22" text="ECS"/>
+        <text size="4" y="-20.5" x="-13" text="ballon"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9.5" x4="-42" x6="-42" antialias="true" y7="10.5" y6="10.5" y5="5.5" y1="-9.5" x1="-9" closed="false" x3="-32" y3="-4.5" y4="0.5" x2="-42" x5="-32" x7="-9"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/circulateur_sanitaire.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/circulateur_sanitaire.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/circulateur_sanitaire.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,23 +1,25 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{A6302F8C-7BFD-4B54-9AB9-27A6F74E4176}"/><names>
-        <name lang="ar">مضخة تداول صحية</name>
-        <name lang="en">Circulator health</name>
-        <name lang="fr">Circulateur sanitaire</name>
+<definition width="40" hotspot_x="19" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="10">
+    <uuid uuid="{d6a4fc14-9f04-4007-ab28-9f8e6c152ac7}"/>
+    <names>
+        <name lang="cs">Vodní pumpa</name>
         <name lang="pl">Pompa cyrkulacyjna CWU</name>
-        <name lang="cs">Vodní pumpa</name>
         <name lang="it">Pompa di ricircolo ACS</name>
+        <name lang="en">Circulator health</name>
         <name lang="nl">Pomp circulatie</name>
+        <name lang="ar">مضخة تداول صحية</name>
+        <name lang="fr">Circulateur sanitaire</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="0" x1="11" y2="0" x2="13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-8" y2="0" x2="-13"/>
-        <polygon x4="8" y5="0" x5="8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="8" y2="-3" x2="11" y3="3" x3="11" y4="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="-4" x1="8" y2="4" x2="8"/>
-        <polygon x4="-3" y5="5" x5="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-3" y2="-5" x2="-3" y3="0" x3="5" y4="5"/>
-        <circle x="-7.2111" y="-7.2111" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14.4222"/>
-        <terminal x="-13" y="0" orientation="w"/>
-        <terminal x="13" y="0" orientation="e"/>
+        <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="11" x2="13"/>
+        <input tagg="label" rotate="true" size="9" y="7.55" x="-6" text="_"/>
+        <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="-8" x2="-13"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" x4="8" antialias="false" y5="0" y1="0" x1="8" closed="false" x3="11" y3="3" y4="0" x2="11" x5="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="8" x2="8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" x4="-3" antialias="true" y5="5" y1="5" x1="-3" x3="5" y3="0" y4="5" x2="-3" x5="-3"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14.4222" y="-7.2111" x="-7.2111"/>
+        <terminal y="0" x="-13" orientation="w"/>
+        <terminal y="0" x="13" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumuls_elec_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumuls_elec_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumuls_elec_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,30 +1,32 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="50" height="100" type="element" orientation="ndny">
-<uuid uuid="{A8793BAA-5ACD-4096-81AE-6BB86A6D0DE7}"/><names>
-        <name lang="ar">صهريج كهربائي</name>
-        <name lang="en">Tank electrical ECS</name>
-        <name lang="fr">Ballon electrique ECS "droite"</name>
+<definition width="60" hotspot_x="30" type="element" link_type="simple" orientation="dyyy" version="0.5" height="100" hotspot_y="50">
+    <uuid uuid="{e6cbe175-495a-4875-81a6-4bc0474c0f4f}"/>
+    <names>
+        <name lang="cs">Elektrická jímka ECS</name>
         <name lang="pl">Zbiornik elektryczny CWU</name>
-        <name lang="cs">Elektrická jímka ECS</name>
         <name lang="it">Serbatoio ASC elettrico</name>
+        <name lang="en">Tank electrical ECS</name>
         <name lang="nl">Boiler elektrisch</name>
+        <name lang="ar">صهريج كهربائي</name>
+        <name lang="fr">Ballon electrique ECS "droite"</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="-40" x1="25" y2="37" x2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-25" y2="37" x2="-25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-36" x1="20" y2="40" x2="20"/>
-        <text x="15" y="14" size="6" rotation="-90" text="Ballon ECS"/>
-        <arc width="50" x="-25" y="31" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="-21.25" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="-21.25" y="-1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="18.75" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="-3" x3="3" x4="-3" antialias="true" x5="3" x6="-3" x7="3" x8="-3" x9="3" closed="false" y1="18" y2="20" y10="32" y3="21" y11="33" y4="23" y12="35" y5="24" x10="-3" y13="36" y6="26" x11="3" y14="38" y7="27" x12="-3" y15="39" y8="29" x13="3" y16="40" y9="30" x14="-3" y17="40" x15="3" x16="0" x17="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="31" x1="-20" y2="40" x2="-20"/>
-        <arc width="50" x="-25" y="-46" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="12" x="-6" y="40" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="-20" y="40" orientation="s"/>
-        <terminal x="20" y="40" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-69.45" x="-7" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="37" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="25" x2="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="37" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="-25" x2="-25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-36" x1="20" x2="20"/>
+        <text rotation="-90" size="6" y="14" x="15" text="Ballon ECS"/>
+        <arc width="50" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="31" x="-25" height="12"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="38.75" x="-21.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="-1.25" x="-21.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="38.75" x="18.75"/>
+        <polygon y16="40" y3="21" x7="3" y9="30" closed="false" y8="29" x8="-3" x13="3" x12="-3" antialias="true" x17="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x15="3" y14="38" y12="35" x6="-3" x9="3" y4="23" y13="36" x14="-3" x1="3" x4="-3" y6="26" y10="32" y15="39" x5="3" y5="24" y2="20" x2="-3" x3="3" x11="3" y11="33" y7="27" y17="40" y1="18" x16="0" x10="-3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" antialias="false" length2="1.5" end1="none" length1="1.5" y1="31" x1="-20" x2="-20"/>
+        <arc width="50" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-46" x="-25" height="12"/>
+        <rect width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="40" x="-6" height="5"/>
+        <terminal y="0" x="-20" orientation="w"/>
+        <terminal y="40" x="-20" orientation="s"/>
+        <terminal y="40" x="20" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumulus_elec_2.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumulus_elec_2.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/cumulus_elec_2.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,30 +1,32 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="50" height="100" type="element" orientation="dyyy">
-<uuid uuid="{9D956615-D7F6-458E-B07D-8432E78DBF4B}"/><names>
-        <name lang="ar">صهريج كهربائي</name>
-        <name lang="en">Tank electrical ECS</name>
-        <name lang="fr">Ballon electrique ECS "gauche"</name>
+<definition width="60" hotspot_x="30" type="element" link_type="simple" orientation="dyyy" version="0.5" height="100" hotspot_y="51">
+    <uuid uuid="{af7092b4-5940-4122-b0a2-a62b008604ed}"/>
+    <names>
+        <name lang="cs">Elektrická jímka ECS</name>
         <name lang="pl">Zbiornik elektryczny CWU</name>
-        <name lang="cs">Elektrická jímka ECS</name>
         <name lang="it">Serbatoio ACS elettrico</name>
+        <name lang="en">Tank electrical ECS</name>
         <name lang="nl">Boiler elektrisch</name>
+        <name lang="ar">صهريج كهربائي</name>
+        <name lang="fr">Ballon electrique ECS "gauche"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-7" y="14" size="6" rotation="-90" text="Ballon ECS"/>
-        <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" x1="25" y2="36" x2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-25" y2="37" x2="-25"/>
-        <arc width="50" x="-25" y="31" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="-21.25" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="18.75" y="-1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="18.75" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="-3" x3="3" x4="-3" antialias="true" x5="3" x6="-3" x7="3" x8="-3" x9="3" closed="false" y1="17" y2="19" y10="31" y3="20" y11="32" y4="22" y12="34" y5="23" x10="-3" y13="35" y6="25" x11="3" y14="37" y7="26" x12="-3" y15="38" y8="28" x13="3" y16="39" y9="29" x14="-3" y17="39" x15="3" x16="0" x17="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="31" x1="20" y2="40" 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="-40" x1="-20" y2="40" x2="-20"/>
-        <arc width="50" x="-25" y="-47" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="12" x="-6" y="40" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="-20" y="40" orientation="s"/>
-        <terminal x="20" y="40" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-59.45" x="-7" text="_"/>
+        <text rotation="-90" size="6" y="14" x="-7" text="Ballon ECS"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="36" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="25" x2="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="37" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="-25" x2="-25"/>
+        <arc width="50" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="31" x="-25" height="12"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="38.75" x="-21.25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="-1.25" x="18.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.5" y="38.75" x="18.75"/>
+        <polygon y16="39" y3="20" x7="3" y9="29" closed="false" y8="28" x8="-3" x13="3" x12="-3" antialias="true" x17="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x15="3" y14="37" y12="34" x6="-3" x9="3" y4="22" y13="35" x14="-3" x1="3" x4="-3" y6="25" y10="31" y15="38" x5="3" y5="23" y2="19" x2="-3" x3="3" x11="3" y11="32" y7="26" y17="39" y1="17" x16="0" x10="-3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" antialias="false" length2="1.5" end1="none" length1="1.5" y1="31" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="-20" x2="-20"/>
+        <arc width="50" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-47" x="-25" height="12"/>
+        <rect width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="40" x="-6" height="5"/>
+        <terminal y="40" x="20" orientation="s"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="40" x="-20" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01d.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01d.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01d.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,29 +1,31 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{D9F09D94-87EC-4F7F-92EC-53FDFCD1AD19}"/><names>
-        <name lang="ar">صمام منع إرتجاع "يمين"</name>
-        <name lang="en">Backflow</name>
-        <name lang="fr">Disconnecteur "droite"</name>
+<definition width="50" hotspot_x="24" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="23">
+    <uuid uuid="{a384520a-7cb0-40c6-a2cd-4d3eef74f50b}"/>
+    <names>
+        <name lang="cs">Zpětný tok</name>
         <name lang="pl">Zawór odcinający powrót CWU</name>
-        <name lang="cs">Zpětný tok</name>
         <name lang="it">Riflusso DX</name>
+        <name lang="en">Backflow</name>
         <name lang="nl">Terugstroombeveiliging</name>
+        <name lang="ar">صمام منع إرتجاع "يمين"</name>
+        <name lang="fr">Disconnecteur "droite"</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="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-3" y2="-8" x2="4"/>
-        <rect width="40" x="-20" y="-10" antialias="false" height="20" style="line-style:dotted;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="0" x1="-20" y2="0" x2="-17"/>
-        <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="1" 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="-7" x1="-6" y2="7" 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="0" x1="20" y2="0" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="17" y2="7" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-5" y2="0" x2="5"/>
-        <polygon x4="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-17" y2="7" x2="-17" y3="0" x3="-6" y4="-7"/>
-        <text x="-18" y="-12" size="4" text="disconnecteur"/>
-        <polygon x4="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="6" y2="7" x2="6" y3="0" x3="17" y4="-7"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-24.5" x="-7" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8" antialias="false" length2="1.5" end1="simple" length1="1.5" y1="-8" x1="-3" x2="4"/>
+        <rect width="40" style="line-style:dotted;line-weight:thin;filling:none;color:black" antialias="false" y="-10" x="-20" height="20"/>
+        <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="-20" x2="-17"/>
+        <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="10" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-7" x1="-6" x2="-6"/>
+        <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="20" x2="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-7" x1="17" x2="17"/>
+        <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="-5" x2="5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="-17" antialias="true" y1="-7" x1="-17" x3="-6" y3="0" y4="-7" x2="-17"/>
+        <text size="4" y="-12" x="-18" text="disconnecteur"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="6" antialias="true" y1="-7" x1="6" x3="17" y3="0" y4="-7" x2="6"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="0" x="-20" orientation="w"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01g.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01g.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_01g.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,29 +1,31 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{DFAEC731-0FCA-48C8-B3A2-E7E0B8873363}"/><names>
-        <name lang="ar">صمّام منع ارتجاع " يسار"</name>
-        <name lang="en">Backflow</name>
-        <name lang="fr">Disconnecteur "gauche"</name>
+<definition width="50" hotspot_x="24" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="23">
+    <uuid uuid="{682a2d10-6892-4dac-b301-42845112d1c7}"/>
+    <names>
+        <name lang="cs">Zpětný tok</name>
         <name lang="pl">Zawór odcinający powrót CWU</name>
-        <name lang="cs">Zpětný tok</name>
         <name lang="it">Riflusso SX</name>
+        <name lang="en">Backflow</name>
         <name lang="nl">Terugstroombeveiliging</name>
+        <name lang="ar">صمّام منع ارتجاع " يسار"</name>
+        <name lang="fr">Disconnecteur "gauche"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="40" x="-20" y="-10" antialias="false" height="20" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-4" y2="-8" x2="3"/>
-        <polygon x4="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="6" y2="-7" x2="17" y3="7" x3="17" y4="0"/>
-        <polygon x4="-17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-17" y2="-7" x2="-6" y3="7" x3="-6" y4="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="0" x1="-20" y2="0" x2="-17"/>
-        <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="1" 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="-7" x1="-17" y2="7" x2="-17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="6" y2="7" 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="0" x1="-5" y2="0" x2="5"/>
-        <text x="-18" y="-12" size="4" text="disconnecteur"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-24.5" x="-7" text="_"/>
+        <rect width="40" style="line-style:dotted;line-weight:thin;filling:none;color:black" antialias="false" y="-10" x="-20" height="20"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8" x1="-4" x2="3"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" x4="6" antialias="false" y1="0" x1="6" x3="17" y3="7" y4="0" x2="17"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" x4="-17" antialias="false" y1="0" x1="-17" x3="-6" y3="7" y4="0" x2="-6"/>
+        <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="-20" x2="-17"/>
+        <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="10" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-7" x1="-17" x2="-17"/>
+        <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="20" x2="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-7" x1="6" x2="6"/>
+        <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="-5" x2="5"/>
+        <text size="4" y="-12" x="-18" text="disconnecteur"/>
+        <terminal y="0" x="-20" orientation="w"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_sanitaire.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_sanitaire.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/disconnecteur_sanitaire.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{563F74CD-8193-49B1-A9AC-8C9887861F2E}"/><names>
-        <name lang="ar">صمّام منع تسريب</name>
-        <name lang="en">Backflow</name>
-        <name lang="fr">Disconnecteur</name>
+<definition width="60" hotspot_x="30" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="20">
+    <uuid uuid="{afcd91cd-7f6a-46f7-bce6-3699f153c78a}"/>
+    <names>
+        <name lang="cs">Zpětný tok</name>
         <name lang="pl">Zawór odcinający powrót CWU</name>
-        <name lang="cs">Zpětný tok</name>
         <name lang="it">Riflusso</name>
+        <name lang="en">Backflow</name>
         <name lang="nl">Terugstroombeveiliging</name>
+        <name lang="ar">صمّام منع تسريب</name>
+        <name lang="fr">Disconnecteur</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="0" x1="0" y2="11" 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="0" x1="-5" y2="0" x2="5"/>
-        <polygon x4="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-17" y2="7" x2="-17" y3="0" x3="-6" y4="-7"/>
-        <rect width="50" x="-25" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <text x="-18" y="-9" size="4" text="disconnecteur"/>
-        <circle x="-23" y="-1" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-18" y2="0" x2="-21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="18" y2="0" x2="22"/>
-        <circle x="22" y="-1" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <circle x="-1" y="11" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <rect width="1" x="16" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="-6" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="5" y2="7" x2="5" y3="0" x3="16" y4="-7"/>
-        <terminal x="23" y="0" orientation="e"/>
-        <terminal x="-22" y="0" orientation="w"/>
-        <terminal x="0" y="12" orientation="s"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="0" x2="0"/>
+        <input tagg="label" rotate="true" size="9" y="-22.5" x="-6" text="_"/>
+        <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="-5" x2="5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="-17" antialias="true" y1="-7" x1="-17" x3="-6" y3="0" y4="-7" x2="-17"/>
+        <rect width="50" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="-15" x="-25" height="30"/>
+        <text size="4" y="-9" x="-18" text="disconnecteur"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="2" y="-1" x="-23"/>
+        <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="-18" x2="-21"/>
+        <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="18" x2="22"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="2" y="-1" x="22"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="2" y="11" x="-1"/>
+        <rect width="1" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7" x="16" height="14"/>
+        <rect width="1" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7" x="-6" height="14"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" x4="5" antialias="true" y1="-7" x1="5" x3="16" y3="0" y4="-7" x2="5"/>
+        <terminal y="0" x="23" orientation="e"/>
+        <terminal y="0" x="-22" orientation="w"/>
+        <terminal y="12" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/douche.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/douche.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/douche.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,27 +1,28 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{1BD93DE1-6E37-4BAD-BA42-FC17F1022241}"/><names>
-        <name lang="ar">دش</name>
-        <name lang="en">shower</name>
-        <name lang="fr">Douche</name>
+<definition width="30" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="6">
+    <uuid uuid="{97536d28-5875-482c-a1ab-2b9d89388a9f}"/>
+    <names>
+        <name lang="cs">Sprcha</name>
         <name lang="pl">Prysznic</name>
-        <name lang="cs">Sprcha</name>
         <name lang="it">Doccia</name>
+        <name lang="en">shower</name>
         <name lang="nl">Douche</name>
+        <name lang="ar">دش</name>
+        <name lang="fr">Douche</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-5" y="0" size="3" rotate="true" text="douche"/>
-        <polygon x4="-9" y5="8" x5="-9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-2" x1="-1" y2="-3" x2="-2" y3="-3" x3="-9" y4="8"/>
-        <polygon x4="-1" y5="6" x5="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-1" y2="-2" x2="8" y3="-2" x3="-1" y4="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="2" x1="5" y2="4" x2="7"/>
-        <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="-1" x1="8" y2="1" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6" x1="1" y2="8" 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="5" x1="2" y2="7" 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="0" x1="7" y2="2" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1" x1="6" y2="3" x2="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="4" x1="3" y2="6" 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="3" x1="4" y2="5" x2="6"/>
-        <terminal x="-9" y="8" orientation="s"/>
+        <input tagg="label" rotate="true" size="3" y="0" x="-5" text="douche"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" x4="-9" antialias="false" y5="8" y1="-2" x1="-1" closed="false" x3="-9" y3="-3" y4="8" x2="-2" x5="-9"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2" x4="-1" antialias="true" y5="6" y1="6" x1="-1" x3="-1" y3="-2" y4="6" x2="8" x5="-1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2" x1="5" x2="7"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1" x1="8" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6" x1="1" x2="3"/>
+        <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="5" x1="2" x2="4"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="7" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="1" x1="6" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="4" x1="3" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="4" x2="6"/>
+        <terminal y="8" x="-9" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/eau_ville.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/eau_ville.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/eau_ville.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,21 +1,23 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" orientation="dyyy">
-<uuid uuid="{60CD7BE3-416B-49E8-83D1-BE09C3C5BB24}"/><names>
-        <name lang="ar">إمداد بالمياه الباردة</name>
-        <name lang="el">Παροχή κρύου νερού</name>
-        <name lang="en">Cold water supply</name>
+<definition width="40" hotspot_x="19" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="11">
+    <uuid uuid="{53074485-fe71-4c9e-9760-4db8a131d48a}"/>
+    <names>
+        <name lang="cs">Přípojka studené vody</name>
         <name lang="it">Entrata acqua calda</name>
-        <name lang="fr">Arrivée d'eau froide</name>
         <name lang="pl">Przyłącze zimnej wody</name>
-        <name lang="cs">Přípojka studené vody</name>
+        <name lang="en">Cold water supply</name>
         <name lang="nl">Koud water toevoer</name>
+        <name lang="ar">إمداد بالمياه الباردة</name>
+        <name lang="fr">Arrivée d'eau froide</name>
+        <name lang="el">Παροχή κρύου νερού</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="0" x1="-6" y2="0" x2="-10"/>
-        <polygon x4="4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="4" y2="5" x2="4" y3="0" x3="-6" y4="-5"/>
-        <text x="11" y="5" size="5" rotation="-90" text="E.F."/>
-        <circle x="-10.5" y="-0.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <terminal x="-10" y="0" orientation="w"/>
+        <input tagg="label" rotate="true" size="9" y="-1.45" x="11" text="_"/>
+        <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="-6" x2="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" x4="4" antialias="true" y1="-5" x1="4" x3="-6" y3="0" y4="-5" x2="4"/>
+        <text rotation="-90" size="5" y="5" x="11" text="E.F."/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1" y="-0.5" x="-10.5"/>
+        <terminal y="0" x="-10" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/ecs_robinet.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/ecs_robinet.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/ecs_robinet.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,26 +1,28 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
-<uuid uuid="{A54FD1F3-5964-44E4-81C1-0C1438A3219D}"/><names>
-        <name lang="ar">حنفية ماء</name>
-        <name lang="en">ECS draw-off valve</name>
-        <name lang="fr">robinet puisage ECS</name>
+<definition width="30" hotspot_x="16" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="8">
+    <uuid uuid="{7d97d034-74cf-4200-a510-1c5482a03748}"/>
+    <names>
+        <name lang="cs">Vodovodní uzávěr ECS</name>
         <name lang="pl">Zawór CWU</name>
-        <name lang="cs">Vodovodní uzávěr ECS</name>
         <name lang="it">Rubinetto acqua calda sanitaria ACS</name>
+        <name lang="en">ECS draw-off valve</name>
         <name lang="nl">Tapkraan</name>
+        <name lang="ar">حنفية ماء</name>
+        <name lang="fr">robinet puisage ECS</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="12" x="-7" y="0" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="12" x="-6" y="-0.5" antialias="true" height="5" 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="3" x1="4" y2="7" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-2" y2="-3" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" 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="-0.5" x1="0" y2="-0.5" 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="0" x1="-1" y2="0" x2="-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="3" x1="7" y2="7" x2="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="3" x1="6" y2="7" x2="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="3" x1="5" y2="7" x2="5"/>
-        <terminal x="-8" y="0" orientation="w"/>
+        <input tagg="label" rotate="true" size="9" y="-3.45" x="8" text="_"/>
+        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="0" x="-7" height="4"/>
+        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="-0.5" x="-6" height="5"/>
+        <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="4" 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="-3" x1="-2" x2="2"/>
+        <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="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-0.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-0.5" x1="0" x2="-8"/>
+        <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="-1" x2="-8"/>
+        <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="8"/>
+        <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"/>
+        <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="5"/>
+        <terminal y="0" x="-8" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro-vanne3v.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro-vanne3v.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro-vanne3v.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,22 +1,24 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="20" height="30" type="element" orientation="dyyy">
-<uuid uuid="{F909D299-4505-46B6-B2B6-663044B4E373}"/><names>
-        <name lang="ar">صمّام كهربائي 3V  "صحي"</name>
-        <name lang="en">Solenoid 3V "health"</name>
-        <name lang="fr">Electro-vanne 3V "sanitaire"</name>
+<definition width="30" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="15">
+    <uuid uuid="{498f12f0-6976-46fe-b1ee-512da700fafb}"/>
+    <names>
+        <name lang="cs">Elektrický uzávěr 3V</name>
         <name lang="pl">Elektrozawór trójdrożny</name>
-        <name lang="cs">Elektrický uzávěr 3V</name>
         <name lang="it">Elettrovalvola 3vie acqua sanitaria</name>
+        <name lang="en">Solenoid 3V "health"</name>
         <name lang="nl">Elektrisch klep sanitair 3</name>
+        <name lang="ar">صمّام كهربائي 3V  "صحي"</name>
+        <name lang="fr">Electro-vanne 3V "sanitaire"</name>
     </names>
     <informations>24v et anti-bélier </informations>
     <description>
-        <polygon x4="1" y5="-7" x5="1" y6="-7" x6="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-7" x1="-3" y2="-7" x2="-1" y3="-9" x3="-1" y4="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="0" x2="0"/>
-        <rect width="8" x="-4" y="-11" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="8" x2="-4" y3="8" x3="4" y4="0"/>
-        <polygon x4="0" y5="-4" x5="8" y6="4" x6="8" y7="0" x7="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-4" x2="-8" y3="4" x3="-8" y4="0"/>
-        <terminal x="-8" y="0" orientation="w"/>
-        <terminal x="8" y="0" orientation="e"/>
-        <terminal x="0" y="8" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-21.5" x="-7" text="_"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-7" x4="1" x6="3" antialias="false" y6="-7" y5="-7" y1="-7" x1="-3" closed="false" x3="-1" y3="-9" y4="-9" x2="-1" x5="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="-5" x1="0" x2="0"/>
+        <rect width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-11" x="-4" height="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="8" x4="0" antialias="true" y1="0" x1="0" x3="4" y3="8" y4="0" x2="-4"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" x4="0" x6="8" antialias="true" y7="0" y6="4" y5="-4" y1="0" x1="0" x3="-8" y3="4" y4="0" x2="-8" x5="8" x7="0"/>
+        <terminal y="8" x="0" orientation="s"/>
+        <terminal y="0" x="-8" orientation="w"/>
+        <terminal y="0" x="8" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro_vanne2v_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro_vanne2v_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/electro_vanne2v_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,21 +1,23 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="20" height="30" type="element" orientation="dyyy">
-<uuid uuid="{794DE06A-407A-4C99-8BBB-6FB9F0EDFBA5}"/><names>
-        <name lang="ar">صمّام كهربائي 2V "صحي"</name>
-        <name lang="en">Solenoid 2V "health"</name>
-        <name lang="fr">Electro-vanne 2V "sanitaire"</name>
+<definition width="30" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="13">
+    <uuid uuid="{f61cab44-59d5-4439-8ac3-961dabbecdf5}"/>
+    <names>
+        <name lang="cs">Elektrický uzávěr 2V</name>
         <name lang="pl">Elektrozawór dwudrożny</name>
-        <name lang="cs">Elektrický uzávěr 2V</name>
         <name lang="it">Elettrovalvola 2vie acqua sanitaria</name>
+        <name lang="en">Solenoid 2V "health"</name>
         <name lang="nl">Elketrische klep sanitair 2</name>
+        <name lang="ar">صمّام كهربائي 2V "صحي"</name>
+        <name lang="fr">Electro-vanne 2V "sanitaire"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="1" y5="-7" x5="1" y6="-7" x6="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-7" x1="-3" y2="-7" x2="-1" y3="-9" x3="-1" y4="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="0" x2="0"/>
-        <rect width="8" x="-4" y="-11" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="0" y5="-4" x5="8" y6="4" x6="8" y7="0" x7="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-4" x2="-8" y3="4" x3="-8" y4="0"/>
-        <terminal x="-8" y="0" orientation="w"/>
-        <terminal x="8" y="0" orientation="e"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-7" x4="1" x6="3" antialias="false" y6="-7" y5="-7" y1="-7" x1="-3" closed="false" x3="-1" y3="-9" y4="-9" x2="-1" x5="1"/>
+        <input tagg="label" rotate="true" size="9" y="-21.5" x="-7" text="_"/>
+        <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="-5" x1="0" x2="0"/>
+        <rect width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-11" x="-4" height="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" x4="0" x6="8" antialias="true" y7="0" y6="4" y5="-4" y1="0" x1="0" x3="-8" y3="4" y4="0" x2="-8" x5="8" x7="0"/>
+        <terminal y="0" x="-8" orientation="w"/>
+        <terminal y="0" x="8" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,35 +1,37 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{D5A89F8B-D560-4C26-8E72-827AE1B7A2D6}"/><names>
-        <name lang="ar">خلاّط 01  ECS</name>
-        <name lang="en">Mixer 01 ECS</name>
-        <name lang="fr">Mitigeur01 ECS</name>
+<definition width="40" hotspot_x="19" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="31">
+    <uuid uuid="{3e3e707a-4126-46b9-bc31-2ee3e0843233}"/>
+    <names>
+        <name lang="cs">Směšovač 01 ECS</name>
         <name lang="pl">Mieszacz CWU</name>
-        <name lang="cs">Směšovač 01 ECS</name>
         <name lang="it">Valvola miscelatrice ACS 1</name>
+        <name lang="en">Mixer 01 ECS</name>
         <name lang="nl">Mengklep 1</name>
+        <name lang="ar">خلاّط 01  ECS</name>
+        <name lang="fr">Mitigeur01 ECS</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-8" x2="-8" x3="-10" x4="-10" antialias="true" x5="10" x6="10" x7="8" x8="8" closed="false" y1="-5" y2="-11" y3="-11" y4="-19" y5="-19" y6="-11" y7="-11" y8="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="0" y2="-13" 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="-17" x1="-2" y2="-13" x2="-2"/>
-        <text x="-10" y="-21" size="4" text="Mitigeur"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="2" y2="-13" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="4" y2="-13" x2="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="-17" x1="8" y2="-13" 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="-17" x1="6" y2="-13" 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="-17" x1="-8" y2="-13" 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="-17" x1="-6" y2="-13" 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="-17" x1="-4" y2="-13" x2="-4"/>
-        <input x="-9" y="-7.5" size="5" rotate="true" text="°C"/>
-        <polygon x15="13" y21="13" x16="10" y22="13" x17="10" x18="4" x19="4" x20="5" x21="5" x22="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-5" x3="-5" x4="-4" x5="-4" x6="-10" x7="-10" x8="-13" x9="-13" y1="13" y2="13" y3="10" y4="10" y5="4" y6="4" y7="5" y8="5" y10="-5" y9="-5" y11="-4" y12="-4" y13="-5" y14="-5" y15="5" y16="5" y17="4" y18="4" y19="10" x10="-10" x11="-10" x12="10" antialias="true" x13="10" x14="13" y20="10"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7" x1="0" y2="5" x2="-2" y3="5" x3="2" y4="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="7" y2="0" x2="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="0" x1="-8" y2="0" x2="-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="-2" x1="-6" y2="2" x2="-6"/>
-        <terminal x="-13" y="0" orientation="w"/>
-        <terminal x="13" y="0" orientation="e"/>
-        <terminal x="0" y="13" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-36.5" x="-6" text="_"/>
+        <polygon y3="-11" x7="8" closed="false" y8="-5" x8="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="10" y4="-19" x1="-8" x4="-10" y6="-11" x5="10" y5="-19" y2="-11" x2="-8" x3="-10" y7="-11" y1="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-2" x2="-2"/>
+        <text size="4" y="-21" x="-10" text="Mitigeur"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="2" x2="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="4" x2="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="8" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="6" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-8" x2="-8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-6" x2="-6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-4" x2="-4"/>
+        <input tagg="none" rotate="true" size="5" y="-7.5" x="-9" text="°C"/>
+        <polygon y22="13" y17="4" y15="5" x4="-4" x5="-4" y20="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x10="-10" x18="4" x8="-13" y1="13" y5="4" x11="-10" x7="-10" y14="-5" y19="10" x1="0" x19="4" y16="5" y13="-5" x20="5" y9="-5" x12="10" y7="5" y2="13" y12="-4" x14="13" antialias="true" x9="-13" y6="4" x21="5" x16="10" y8="5" x22="0" x13="10" y10="-5" x15="13" x3="-5" y18="4" x17="10" x2="-5" y3="10" y11="-4" y21="13" x6="-10" y4="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" x4="0" antialias="true" y1="7" x1="0" closed="false" x3="2" y3="5" y4="7" x2="-2"/>
+        <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="7" x2="4"/>
+        <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="-8" x2="-4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2" x1="-6" x2="-6"/>
+        <terminal y="0" x="-13" orientation="w"/>
+        <terminal y="0" x="13" orientation="e"/>
+        <terminal y="13" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_02.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_02.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_02.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,33 +1,34 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{EC61CFA8-8EE5-4E0C-BB9C-9D9BB18BA2A6}"/><names>
-        <name lang="ar">خلاّط 02 ECS</name>
-        <name lang="en">Mixer 02 ECS</name>
-        <name lang="fr">Mitigeur02 ECS</name>
+<definition width="40" hotspot_x="20" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="8">
+    <uuid uuid="{23c476e7-508e-4537-a455-686500b1e6e6}"/>
+    <names>
+        <name lang="cs">Směšovač 02 ECS</name>
         <name lang="pl">Mieszacz CWU</name>
-        <name lang="cs">Směšovač 02 ECS</name>
         <name lang="it">Valvola miscelatrice ACS 2</name>
+        <name lang="en">Mixer 02 ECS</name>
         <name lang="nl">Mengklep 2</name>
+        <name lang="ar">خلاّط 02 ECS</name>
+        <name lang="fr">Mitigeur02 ECS</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="20" x="-14" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-14" y="-1.5" size="2" rotate="true" text="Mitigeur"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-1" y2="0" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-10" y2="1" x2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-11" y2="0" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="7" y2="3" x2="10"/>
-        <rect width="4" x="-2" y="5" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-16" y="-2" antialias="false" height="4" 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="5" x1="16" y2="5" x2="7"/>
-        <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" x1="16" y2="-5" x2="7"/>
-        <arc width="3" x="14.5" y="-5" antialias="true" height="10" 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="-3" x1="7" y2="-3" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="7" y2="-1" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="7" y2="1" x2="10"/>
-        <rect width="4" x="-12" y="5" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="7" orientation="s"/>
-        <terminal x="-10" y="7" orientation="s"/>
-        <terminal x="-16" y="0" orientation="w"/>
+        <rect width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-5" x="-14" height="10"/>
+        <input tagg="label" rotate="true" size="2" y="-1.5" x="-14" text="Mitigeur"/>
+        <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="-1" x2="1"/>
+        <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="-10"/>
+        <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="-11" x2="-9"/>
+        <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="7" x2="10"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="5" x="-2" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-2" x="-16" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5" x1="16" x2="7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5" x1="16" x2="7"/>
+        <arc width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-180" y="-5" x="14.5" height="10"/>
+        <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="7" x2="10"/>
+        <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="7" x2="10"/>
+        <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="7" x2="10"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="5" x="-12" height="2"/>
+        <terminal y="7" x="0" orientation="s"/>
+        <terminal y="7" x="-10" orientation="s"/>
+        <terminal y="0" x="-16" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_03.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_03.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_melangeur_03.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,41 +1,43 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
-<uuid uuid="{6EDF3EC5-60DE-4333-B022-249A2AD8FDB1}"/><names>
-        <name lang="ar">خلاّط 03 ECS</name>
-        <name lang="en">Mixer 03 ECS</name>
-        <name lang="fr">Mitigeur 03 ECS</name>
+<definition width="40" hotspot_x="19" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="33">
+    <uuid uuid="{23edc2e9-4ba0-46bd-8a27-9a377594dccb}"/>
+    <names>
+        <name lang="cs">Směšovač 03 ECS</name>
         <name lang="pl">Mieszacz CWU</name>
-        <name lang="cs">Směšovač 03 ECS</name>
         <name lang="it">Valvola miscelatrice ACS 3</name>
+        <name lang="en">Mixer 03 ECS</name>
         <name lang="nl">Mengklep 3</name>
+        <name lang="ar">خلاّط 03 ECS</name>
+        <name lang="fr">Mitigeur 03 ECS</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:thin;filling:none;color:black" y1="10" x1="-3" y2="10" 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="-3" x1="10" y2="3" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="-10" y2="3" x2="-10"/>
-        <polygon x15="12" y21="12" x16="10" y22="12" x17="10" y23="12" x18="3" x19="3" x20="4" x21="4" x22="0" x23="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-4" x3="-4" x4="-3" x5="-3" x6="-10" x7="-10" x8="-12" x9="-12" y1="12" y2="12" y3="10" y4="10" y5="3" y6="3" y7="4" y8="4" y10="-4" y9="-4" y11="-3" y12="-3" y13="-4" y14="-4" y15="4" y16="4" y17="3" y18="3" y19="10" x10="-10" x11="-10" x12="10" antialias="true" x13="10" x14="12" y20="10"/>
-        <polygon x4="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="7" y2="-2" x2="5" y3="2" x3="5" y4="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="6" x1="-1" y2="6" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="0" x2="-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="-1" x1="-5" y2="1" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="7" y2="-12" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-7" y2="-12" x2="-7"/>
-        <arc width="14" x="-7" y="-19.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="14" x="-7" y="-11" antialias="false" height="8" 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="-16" x1="5" y2="-12" x2="5"/>
-        <text x="-11" y="-24" size="4" text="Mitigeur"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="3" y2="-12" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="1" y2="-12" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-3" y2="-12" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-5" y2="-12" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-1" y2="-12" x2="-1"/>
-        <input x="-8" y="-4.5" size="5" rotate="true" text="°C"/>
-        <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" x1="1" y2="8" x2="-1"/>
-        <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" x1="-9" y2="0" x2="-7"/>
-        <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="-1" x1="-8" y2="1" x2="-8"/>
-        <terminal x="-12" y="0" orientation="w"/>
-        <terminal x="12" y="0" orientation="e"/>
-        <terminal x="0" y="12" orientation="s"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="-3" x2="3"/>
+        <input tagg="label" rotate="true" size="9" y="-34.45" x="-7" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3" x1="-10" x2="-10"/>
+        <polygon y22="12" y17="3" y23="12" y15="4" x4="-3" x5="-3" y20="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x23="0" x10="-10" x18="3" x8="-12" y1="12" y5="3" x11="-10" x7="-10" y14="-4" y19="10" x1="0" x19="3" y16="4" y13="-4" x20="4" y9="-4" x12="10" y7="4" y2="12" y12="-3" x14="12" antialias="true" x9="-12" y6="3" x21="4" x16="10" y8="4" x22="0" x13="10" y10="-4" x15="12" x3="-4" y18="3" x17="10" x2="-4" y3="10" y11="-3" y21="12" x6="-10" y4="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2" x4="7" antialias="true" y1="0" x1="7" x3="5" y3="2" y4="0" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6" x1="-1" 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="-6" x2="-4"/>
+        <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="-5" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="7" x2="7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="-7" x2="-7"/>
+        <arc width="14" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-19.5" x="-7" height="3"/>
+        <rect width="14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-11" x="-7" height="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="5" x2="5"/>
+        <text size="4" y="-24" x="-11" text="Mitigeur"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="3" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-3" x2="-3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-5" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-1" x2="-1"/>
+        <input tagg="none" rotate="true" size="5" y="-4.5" x="-8" text="°C"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="1" x2="-1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-9" x2="-7"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1" x1="-8" x2="-8"/>
+        <terminal y="0" x="-12" orientation="w"/>
+        <terminal y="0" x="12" orientation="e"/>
+        <terminal y="12" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_thermostatique.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_thermostatique.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/mitigeur_thermostatique.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{4B0073EB-7FD4-4E07-B1D4-125CC2B16830}"/><names>
-        <name lang="ar">صمّام خلط ترموستاتي ECS</name>
-        <name lang="en">Thermostatic mixing valve ECS</name>
-        <name lang="fr">Mitigeur thermostatique ECS</name>
+<definition width="50" hotspot_x="24" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="20">
+    <uuid uuid="{f9b1efaa-eedc-4856-af0d-99c59a63fb79}"/>
+    <names>
+        <name lang="cs">Termostatický uzávěr ECS</name>
         <name lang="pl">Zawór termostatyczny CWU</name>
-        <name lang="cs">Termostatický uzávěr ECS</name>
         <name lang="it">Valvola miscelatrice termostatica</name>
+        <name lang="en">Thermostatic mixing valve ECS</name>
         <name lang="nl">Mengklep thermostatisch</name>
+        <name lang="ar">صمّام خلط ترموستاتي ECS</name>
+        <name lang="fr">Mitigeur thermostatique ECS</name>
     </names>
     <informations>Le mitigeur thermostatique posé en sortie de ballon permet de distribuer l'eau chaude sanitaire à une température constante.</informations>
     <description>
-        <circle x="-13" y="-13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="26"/>
-        <arc width="14" x="-7" y="-9" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-221" angle="-97"/>
-        <text x="-4" y="-2" size="4" text="°C"/>
-        <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="-8" x1="0" y2="-10" 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="-6" x1="5" y2="-7" 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="-6" x1="-5" y2="-7" x2="-6"/>
-        <text x="12" y="-10" size="4" text="EF"/>
-        <text x="-17" y="-10" size="4" text="EC"/>
-        <rect width="2" x="13" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-1" y="13" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-15" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="1"/>
-        <polygon x4="10" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5" x1="10" y2="6" x2="10" y3="0" x3="1" y4="-5"/>
-        <polygon x4="-10" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6" x1="-10" y2="6" x2="-10" y3="0" x3="-1" y4="-6"/>
-        <terminal x="-14" y="0" orientation="w"/>
-        <terminal x="14" y="0" orientation="e"/>
-        <terminal x="0" y="14" orientation="s"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="26" y="-13" x="-13"/>
+        <input tagg="label" rotate="true" size="9" y="-26.45" x="-7" text="_"/>
+        <arc width="14" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-221" antialias="true" angle="-97" y="-9" x="-7" height="16"/>
+        <text size="4" y="-2" x="-4" text="°C"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6" x1="5" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6" x1="-5" x2="-6"/>
+        <text size="4" y="-10" x="12" text="EF"/>
+        <text size="4" y="-10" x="-17" text="EC"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-1" x="13" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="13" x="-1" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-1" x="-15" height="2"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" x4="0" antialias="true" y1="1" x1="0" x3="6" y3="10" y4="1" x2="-6"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="6" x4="10" antialias="true" y1="-5" x1="10" x3="1" y3="0" y4="-5" x2="10"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="6" x4="-10" antialias="true" y1="-6" x1="-10" x3="-1" y3="0" y4="-6" x2="-10"/>
+        <terminal y="0" x="14" orientation="e"/>
+        <terminal y="14" x="0" orientation="s"/>
+        <terminal y="0" x="-14" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,37 +1,39 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="dyyy">
-<uuid uuid="{DB2061F3-FF0B-45B4-84E6-822D5E6667AE}"/><names>
-        <name lang="ar">سخّان ECS  بغلاف مزدوج</name>
-        <name lang="en">ECS heater jacket</name>
-        <name lang="fr">Réchauffeur ECS double enveloppe</name>
+<definition width="100" hotspot_x="30" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="35">
+    <uuid uuid="{7018bb20-31a7-43da-90ae-091006c43a63}"/>
+    <names>
+        <name lang="cs">Ohřívač s dvojitým pláštěm ECS</name>
         <name lang="pl">Zasobnik z płaszczem CWU</name>
-        <name lang="cs">Ohřívač s dvojitým pláštěm ECS</name>
         <name lang="it">Riscaldatore ACS</name>
+        <name lang="en">ECS heater jacket</name>
         <name lang="nl">Tank met interne tank wisselaar</name>
+        <name lang="ar">سخّان ECS  بغلاف مزدوج</name>
+        <name lang="fr">Réchauffeur ECS double enveloppe</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="12" y="-22" size="4" text="EF"/>
-        <text x="-10" y="-24" size="4" text="ECS"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-17" y2="20" x2="-25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-24" y2="-20" x2="-16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="10" y2="18" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-10" y2="-18" x2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-15" y2="19" x2="-15"/>
-        <text x="25" y="20" size="4" text="réchauffeur ecs"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="15" y2="19" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-20" y2="27" x2="-20"/>
-        <arc width="30" x="-15" y="-21.5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="20" y2="26" x2="20"/>
-        <arc width="30" x="-15" y="16.5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="-21" y="-21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <arc width="40" x="-20" y="-29.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="19" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-21" y="19" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <arc width="40" x="-20" y="22.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <terminal x="-24" y="-20" orientation="w"/>
-        <terminal x="-24" y="20" orientation="w"/>
-        <terminal x="10" y="-30" orientation="n"/>
-        <terminal x="-10" y="-30" orientation="n"/>
+        <input tagg="label" rotate="true" size="9" y="35.55" x="-7" text="_"/>
+        <text size="4" y="-22" x="12" text="EF"/>
+        <text size="4" y="-24" x="-10" text="ECS"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="20" x1="-17" x2="-25"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="-24" x2="-16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="18" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-31" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-18" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-31" x1="-10" x2="-10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="-15" x2="-15"/>
+        <text size="4" y="20" x="25" text="réchauffeur ecs"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="15" x2="15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-20" x2="-20"/>
+        <arc width="30" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-21.5" x="-15" height="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="26" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-25" x1="20" x2="20"/>
+        <arc width="30" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="16.5" x="-15" height="6"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-21" x="-21"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-29.5" x="-20" height="8"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="23" x="19"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="19" x="-21"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="22.5" x="-20" height="8"/>
+        <terminal y="-20" x="-24" orientation="w"/>
+        <terminal y="20" x="-24" orientation="w"/>
+        <terminal y="-30" x="10" orientation="n"/>
+        <terminal y="-30" x="-10" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_plaques.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_plaques.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_plaques.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="dyyy">
-<uuid uuid="{07420B2F-4ECD-4E5A-932B-6286E86D72FF}"/><names>
-        <name lang="ar">سخّان ECS بلوحات</name>
-        <name lang="en">ECS heater plates</name>
-        <name lang="fr">Réchauffeur ECS à Plaques</name>
+<definition width="70" hotspot_x="30" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="35">
+    <uuid uuid="{facb5b6c-d703-42dc-ba98-01bef421dd61}"/>
+    <names>
+        <name lang="cs">Deskový ohřívač ECS</name>
         <name lang="pl">Płytowy wymiennik CWU</name>
-        <name lang="cs">Deskový ohřívač ECS</name>
         <name lang="it">Riscaldatore ACS a placche</name>
+        <name lang="en">ECS heater plates</name>
         <name lang="nl">Tank met plaatwisselaar</name>
+        <name lang="ar">سخّان ECS بلوحات</name>
+        <name lang="fr">Réchauffeur ECS à Plaques</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="25" y="-18" size="4" text="ECS"/>
-        <text x="25" y="28" size="4" text="EF"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-26.55" y2="30" x2="-19.55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-27.55" y2="-30" x2="-20.55"/>
-        <circle x="19" y="-31" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-21" y="-31" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-21" y="29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="19" y="29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <rect width="40" x="-20" y="-33" antialias="true" height="65" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" x2="10" x3="-5" x4="10" antialias="true" x5="-5" x6="10" x7="-5" x8="10" x9="20" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="20" y6="10" y7="20" y8="30" y9="30"/>
-        <polygon style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-20" x2="5" x3="-10" x4="5" antialias="true" x5="-10" x6="5" x7="-10" x8="5" x9="-20" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="-20" y6="10" y7="20" y8="30" y9="30"/>
-        <text x="18" y="9" size="4" text="Plaques"/>
-        <terminal x="-20" y="-30" orientation="w"/>
-        <terminal x="-20" y="30" orientation="w"/>
-        <terminal x="20" y="-30" orientation="e"/>
-        <terminal x="20" y="30" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="35.55" x="-7" text="_"/>
+        <text size="4" y="-18" x="25" text="ECS"/>
+        <text size="4" y="28" x="25" text="EF"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="30" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="30" x1="-26.55" x2="-19.55"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="-27.55" x2="-20.55"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-31" x="19"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-31" x="-21"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="29" x="-21"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="29" x="19"/>
+        <rect width="40" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" y="-33" x="-20" height="65"/>
+        <polygon y3="-20" x7="-5" y9="30" closed="false" y8="30" x8="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="10" x9="20" y4="-10" x1="20" x4="10" y10="30" y6="10" x5="-5" y5="0" y2="-30" x2="10" x3="-5" y7="20" y1="-30" x10="20"/>
+        <polygon y3="-20" x7="-10" y9="30" closed="false" y8="30" x8="5" antialias="true" style="line-style:dashed;line-weight:normal;filling:none;color:black" x6="5" x9="-20" y4="-10" x1="-20" x4="5" y10="30" y6="10" x5="-10" y5="0" y2="-30" x2="5" x3="-10" y7="20" y1="-30" x10="-20"/>
+        <text size="4" y="9" x="18" text="Plaques"/>
+        <terminal y="30" x="20" orientation="e"/>
+        <terminal y="-30" x="-20" orientation="w"/>
+        <terminal y="-30" x="20" orientation="e"/>
+        <terminal y="30" x="-20" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_tubulaire.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_tubulaire.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauff_ecs_tubulaire.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,29 +1,31 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="dyyy">
-<uuid uuid="{691F8B31-BA71-44E6-87E6-697C4F7EEB62}"/><names>
-        <name lang="ar">سخّان أنبوبي</name>
-        <name lang="en">ECS tubular heater</name>
-        <name lang="fr">réchauffeur ECS tubulaire</name>
+<definition width="100" hotspot_x="30" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="36">
+    <uuid uuid="{010cb92b-beac-4052-a73e-f670c188f7ec}"/>
+    <names>
+        <name lang="cs">Trubkový ohřívač ECS</name>
         <name lang="pl">Ogrzewacz CWU</name>
-        <name lang="cs">Trubkový ohřívač ECS</name>
         <name lang="it">Riscaldatore ACS tubolare</name>
+        <name lang="en">ECS tubular heater</name>
         <name lang="nl">tank met pijpwisselaar</name>
+        <name lang="ar">سخّان أنبوبي</name>
+        <name lang="fr">réchauffeur ECS tubulaire</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="13" y="-27" size="4" text="EF"/>
-        <text x="-26" y="-27" size="4" text="ECS"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-17" y2="15" x2="-23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-23" y2="-16" x2="-16"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" x2="-10" x3="14" x4="-15" antialias="false" x5="14" x6="-15" x7="14" x8="-15" x9="14" closed="false" y1="-32" y2="-20" y10="20" y3="-15" y11="20" y4="-10" y12="-32" y5="-5" x10="-15" y6="0" x11="10" y7="5" x12="10" y8="10" y9="15"/>
-        <text x="25" y="21" size="4" text="réchauffeur ecs"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-20" y2="26" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="20" y2="26" x2="20"/>
-        <arc width="40" x="-20" y="-29.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="40" x="-20" y="22.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <terminal x="-23" y="-16" orientation="w"/>
-        <terminal x="-22" y="15" orientation="w"/>
-        <terminal x="-10" y="-32" orientation="n"/>
-        <terminal x="10" y="-32" orientation="n"/>
+        <text size="4" y="-27" x="13" text="EF"/>
+        <input tagg="label" rotate="true" size="9" y="30.55" x="-7" text="_"/>
+        <text size="4" y="-27" x="-26" text="ECS"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="15" x1="-17" x2="-23"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-23" x2="-16"/>
+        <polygon y3="-15" x7="14" y9="15" closed="false" y8="10" x8="-15" x12="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-32" x6="-15" x9="14" y4="-10" x1="-10" x4="-15" y10="20" y6="0" x5="14" y5="-5" y2="-20" x2="-10" x3="14" x11="10" y11="20" y7="5" y1="-32" x10="-15"/>
+        <text size="4" y="21" x="25" text="réchauffeur ecs"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="26" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-25" x1="-20" x2="-20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="26" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-25" x1="20" x2="20"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-29.5" x="-20" height="8"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="22.5" x="-20" height="8"/>
+        <terminal y="15" x="-22" orientation="w"/>
+        <terminal y="-32" x="-10" orientation="n"/>
+        <terminal y="-16" x="-23" orientation="w"/>
+        <terminal y="-32" x="10" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauffeur_ecs.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauffeur_ecs.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/rechauffeur_ecs.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,33 +1,35 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="ndny">
-<uuid uuid="{CA3D1292-71C2-414E-94E0-D3E94B2F90DE}"/><names>
-        <name lang="ar">سخّان ECS</name>
-        <name lang="en">ECS heater</name>
-        <name lang="fr">Réchauffeur ECS</name>
+<definition width="90" hotspot_x="30" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="35">
+    <uuid uuid="{2db7b0bc-d64f-4885-b755-e5d8b14ac15c}"/>
+    <names>
+        <name lang="cs">Ohřívač ECS</name>
         <name lang="pl">Ogrzewacz CWU</name>
-        <name lang="cs">Ohřívač ECS</name>
         <name lang="it">Riscaldatore ACS</name>
+        <name lang="en">ECS heater</name>
         <name lang="nl">Tank met wisselaar</name>
+        <name lang="ar">سخّان ECS</name>
+        <name lang="fr">Réchauffeur ECS</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="2" y="-25" size="4" text="ECS"/>
-        <text x="26" y="28" size="4" text="EF"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-26.55" y2="20" x2="-19.55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-27.55" y2="-20" x2="-20.55"/>
-        <text x="17" y="19" size="4" text="réchauffeur ecs"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="-20" y2="25" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="20" y2="25" x2="20"/>
-        <circle x="-21" y="-21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="10" x3="-10" x4="10" antialias="true" x5="-10" x6="10" x7="-10" x8="10" x9="-10" closed="false" y1="-20" y2="-20" y10="20" y3="-15" y11="20" y4="-10" y12="20" y5="-6" x10="10" y13="20" y6="0" x11="10" y7="5" x12="-20" y8="10" x13="-20" y9="15"/>
-        <arc width="40" x="-20" y="-30.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="19" y="19" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-1" y="-31.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-21" y="19" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <arc width="40" x="-20" y="21.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <terminal x="-20" y="-20" orientation="w"/>
-        <terminal x="-20" y="20" orientation="w"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="20" y="20" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="30.55" x="-7" text="_"/>
+        <text size="4" y="-25" x="2" text="ECS"/>
+        <text size="4" y="28" x="26" text="EF"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="false" length2="1.5" end1="triangle" length1="1.5" y1="20" x1="-26.55" x2="-19.55"/>
+        <line end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="-27.55" x2="-20.55"/>
+        <text size="4" y="19" x="17" text="réchauffeur ecs"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="25" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-26" x1="-20" x2="-20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="25" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-26" x1="20" x2="20"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-21" x="-21"/>
+        <polygon y3="-15" x7="-10" y9="15" closed="false" y8="10" x8="10" x13="-20" x12="-20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="20" x6="10" x9="-10" y13="20" y4="-10" x1="-20" x4="10" y6="0" y10="20" x5="-10" y5="-6" y2="-20" x2="10" x3="-10" x11="10" y11="20" y7="5" y1="-20" x10="10"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-30.5" x="-20" height="8"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="19" x="19"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-31.5" x="-1"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="19" x="-21"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="21.5" x="-20" height="8"/>
+        <terminal y="20" x="-20" orientation="w"/>
+        <terminal y="-30" x="0" orientation="n"/>
+        <terminal y="20" x="20" orientation="e"/>
+        <terminal y="-20" x="-20" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_melangeur_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_melangeur_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_melangeur_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,27 +1,29 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="30" type="element" orientation="dyyy">
-<uuid uuid="{C03AC737-736D-41B3-AE2B-76122C0A214C}"/><names>
-        <name lang="ar">خلاّط حنفيّة</name>
-        <name lang="en">Mixer tap</name>
-        <name lang="fr">Robinet melangeur</name>
+<definition width="20" hotspot_x="10" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="16">
+    <uuid uuid="{0a8dd16b-0fe5-428a-a645-605a2ff7cdcf}"/>
+    <names>
+        <name lang="cs">Směšovací baterie</name>
         <name lang="pl">Bateria mieszająca</name>
-        <name lang="cs">Směšovací baterie</name>
         <name lang="it">Miscelatrore</name>
+        <name lang="en">Mixer tap</name>
         <name lang="nl">Mengkraan</name>
+        <name lang="ar">خلاّط حنفيّة</name>
+        <name lang="fr">Robinet melangeur</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:thin;filling:none;color:black" y1="-9" x1="2" y2="-7" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-2" y2="7" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-5" y2="-4" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="4" y2="-4" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-4" y2="2" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="3" y2="2" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="1" y2="7" x2="1"/>
-        <arc width="3" x="-1.5" y="-12" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-200"/>
-        <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="-10" x1="2" y2="-8" 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="-10" x1="1" y2="-6" x2="1"/>
-        <terminal x="-2" y="7" orientation="s"/>
-        <terminal x="1" y="7" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-5.45" x="4" text="_"/>
+        <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="-9" x1="2" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="true" length2="1.5" end1="none" length1="1.5" y1="2" x1="-2" x2="-2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" antialias="true" 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="-4" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-3" x1="4" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-3" x1="-4" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-3" x1="3" x2="-2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="true" length2="1.5" end1="none" length1="1.5" y1="2" x1="1" x2="1"/>
+        <arc width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" antialias="true" angle="-200" y="-12" x="-1.5" height="12"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="2" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="1" x2="1"/>
+        <terminal y="7" x="1" orientation="s"/>
+        <terminal y="7" x="-2" orientation="s"/>
     </description>
 </definition>

Modified: 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	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,26 +1,28 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{27C054B3-06D1-4A13-B8CE-8C34C41138DC}"/><names>
-        <name lang="ar">حنفيّة</name>
-        <name lang="en">Faucet</name>
-        <name lang="fr">Robinet de Puisage</name>
+<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="cs">Baterie</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>
     </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="-1" x1="-10" y2="-1" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="0"/>
-        <arc width="12" x="-6" y="0" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="12" x="-5" y="-0.8" antialias="true" height="5.6" 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="3" x1="5" y2="7" x2="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="-3" x1="-1" y2="-3" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="1" y2="-3" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="8" y2="7" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="7" y2="7" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="6" y2="7" x2="6"/>
-        <terminal x="-10" y="0" orientation="w"/>
+        <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/eau_sanitaire/robinet_tournant_boulle_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_tournant_boulle_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_tournant_boulle_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,25 +1,26 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{8C469CE9-5CF9-410A-AB4E-D5327F13E6C7}"/><names>
-        <name lang="ar">صمّام دوّار كروي</name>
-        <name lang="en">Ball valve ball</name>
-        <name lang="fr">Robinet tournant à boule</name>
+<definition width="30" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="10">
+    <uuid uuid="{ed107ff8-1f58-4c43-8ee3-1aca53689fac}"/>
+    <names>
+        <name lang="cs">Kulový uzávěr</name>
         <name lang="pl">Zawór kulowy</name>
-        <name lang="cs">Kulový uzávěr</name>
         <name lang="it">Valvola a sfera</name>
+        <name lang="en">Ball valve ball</name>
         <name lang="nl">Kogelklep</name>
+        <name lang="ar">صمّام دوّار كروي</name>
+        <name lang="fr">Robinet tournant à boule</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-7" y="-3" size="7" rotate="true" text="R"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="0" y2="4" 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="6" x1="0" y2="4" 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="10" y2="10" x2="12"/>
-        <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="-10" y2="10" x2="-12"/>
-        <polygon x4="4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8" x1="4" y2="5" x2="10" y3="15" x3="10" y4="12"/>
-        <polygon x4="-4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="-4" y2="15" x2="-10" y3="5" x3="-10" y4="8"/>
-        <circle x="-3.60555" y="6.39445" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.2111"/>
-        <terminal x="-10" y="10" orientation="w"/>
-        <terminal x="10" y="10" orientation="e"/>
+        <input tagg="label" rotate="true" size="7" y="-13" x="-7" text="R"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6" x1="0" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="0" x2="0"/>
+        <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="12"/>
+        <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="-12"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" x4="4" antialias="false" y1="-2" x1="4" closed="false" x3="10" y3="5" y4="2" x2="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" x4="-4" antialias="false" y1="2" x1="-4" closed="false" x3="-10" y3="-5" y4="-2" x2="-10"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.2111" y="-3.60555" x="-3.60555"/>
+        <terminal y="0" x="-10" orientation="w"/>
+        <terminal y="0" x="10" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/bouteille_guy_delsol.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/bouteille_guy_delsol.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/bouteille_guy_delsol.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,30 +1,32 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="dnnn">
-<uuid uuid="{4A74CE00-6321-4AF2-BDAF-2AD7CFF0D287}"/><names>
-        <name lang="ar">خزّان ذاتي التفريغ Guy  Delsol </name>
-        <name lang="en">Bottle self-emptying Guy Delsol</name>
-        <name lang="fr">Bouteille auto-vidange Guy Delsol</name>
+<definition width="50" hotspot_x="22" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="44">
+    <uuid uuid="{74b612f7-8009-42fc-8c2b-845504bc1e3f}"/>
+    <names>
+        <name lang="cs">Samočinně se vyprazdňující zásobník Guy Delsol</name>
         <name lang="pl">Samoopróżniający się zasobnik Guy Delsol</name>
-        <name lang="cs">Samočinně se vyprazdňující zásobník Guy Delsol</name>
         <name lang="it">Serbatoio Guy Delsol ad auto-svuotamento</name>
+        <name lang="en">Bottle self-emptying Guy Delsol</name>
         <name lang="nl">automatische aftap Guy Delsol</name>
+        <name lang="ar">خزّان ذاتي التفريغ Guy  Delsol </name>
+        <name lang="fr">Bouteille auto-vidange Guy Delsol</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="40" x1="0" y2="35" x2="0"/>
-        <rect width="8" x="12" y="-21" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-2" y="2" size="4" text="bouteille&#xa;guy Delsol"/>
-        <circle x="-0.414214" y="-33.4142" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.82843"/>
-        <arc width="20" x="-20" y="-41" antialias="true" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-80"/>
-        <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" x1="0" y2="-6" x2="0"/>
-        <arc width="25" x="-12.5" y="-37.5" antialias="true" height="25" 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:thin;filling:none;color:black" y1="-20" x1="-12" y2="-20" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" x1="-12" y2="14" x2="12"/>
-        <arc width="25" x="-12.5" y="12.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-12.5" y2="25" x2="-12.5"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="12.5" y2="25" x2="12.5"/>
-        <terminal x="0" y="40" orientation="s"/>
-        <terminal x="0" y="-40" orientation="n"/>
-        <terminal x="20" y="-20" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="0.55" x="23" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="35" antialias="false" length2="1.5" end1="none" length1="1.5" y1="40" x1="0" x2="0"/>
+        <rect width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-21" x="12" height="1"/>
+        <text size="4" y="2" x="-2" text="bouteille&#xa;guy Delsol"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.82843" y="-33.4142" x="-0.414214"/>
+        <arc width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-80" y="-41" x="-20" height="70"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="0" x2="0"/>
+        <arc width="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-37.5" x="-12.5" height="25"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="-12" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="14" x1="-12" x2="12"/>
+        <arc width="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="12.5" x="-12.5" height="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="25" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-25" x1="-12.5" x2="-12.5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="25" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-25" x1="12.5" x2="12.5"/>
+        <terminal y="-20" x="20" orientation="e"/>
+        <terminal y="40" x="0" orientation="s"/>
+        <terminal y="-40" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/event_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/event_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/event_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,20 +1,21 @@
-<definition width="30" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dyyy">
-<uuid uuid="{D4EC606A-86D9-49EC-8BA1-36C92BB70338}"/><names>
-        <name lang="ar">إناء حالة مفتوحة</name>
-        <name lang="en">Event Open Vase</name>
-        <name lang="fr">Event Vase Ouvert</name>
+<definition width="20" hotspot_x="16" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="21">
+    <uuid uuid="{a6692a62-4bb6-4d5b-8792-93bdffb4ad48}"/>
+    <names>
+        <name lang="cs">Otvor nádoba otevřena</name>
         <name lang="pl">Wylot otwartego naczynia wzbiorczego</name>
-        <name lang="cs">Otvor nádoba otevřena</name>
         <name lang="it">Uscita vaso aperto</name>
+        <name lang="en">Event Open Vase</name>
         <name lang="nl">Afblaaspunt</name>
+        <name lang="ar">إناء حالة مفتوحة</name>
+        <name lang="fr">Event Vase Ouvert</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-14" y="-4.5" size="4" rotate="true" text="Event"/>
-        <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="-8" 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="0" x1="-10" y2="-10" x2="-10"/>
-        <arc width="10" x="-10" y="-15" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="-10" y="0" orientation="s"/>
+        <input tagg="label" rotate="true" size="4" y="-4.5" x="-14" text="Event"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-10" x2="-10"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-15" x="-10" height="10"/>
+        <terminal y="0" x="-10" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01d.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01d.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01d.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,28 +1,29 @@
-<definition width="50" version="0.3" hotspot_x="20" hotspot_y="20" height="50" type="element" orientation="dyyy">
-<uuid uuid="{FF23302F-D0E0-4D15-A756-8955AAFC2825}"/><names>
-        <name lang="ar">مجموعة حماية (يمين)</name>
-        <name lang="en">Security Group (right)</name>
-        <name lang="fr">Groupe de Sécurité (droite)</name>
+<definition width="40" hotspot_x="13" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="14">
+    <uuid uuid="{906b3a6c-b06e-44a8-8640-f02e631ced6d}"/>
+    <names>
+        <name lang="cs">Bezpečnostní skupina (pravá)</name>
         <name lang="pl">Grupa bezpieczeństwa</name>
-        <name lang="cs">Bezpečnostní skupina (pravá)</name>
         <name lang="it">Gruppo di sicurezza DX</name>
+        <name lang="en">Security Group (right)</name>
         <name lang="nl">Inlaatcombinatie</name>
+        <name lang="ar">مجموعة حماية (يمين)</name>
+        <name lang="fr">Groupe de Sécurité (droite)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" x1="0" x2="-8" x3="-8" x4="8" antialias="false" x5="8" x6="20" x7="20" x8="8" x9="8" closed="false" y1="20" y2="20" y10="20" y3="-10" y4="-10" y5="-7" x10="0" y6="-7" y7="7" y8="7" y9="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="0" x1="20" y2="0" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="8"/>
-        <polygon x4="17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="17" y2="-5" x2="8" y3="5" x3="8" y4="0"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-3" x3="-4" x4="-5" antialias="false" x5="-6" x6="-7" x7="-8" x8="-9" closed="false" y1="12" y2="12" y3="14" y4="10" y5="14" y6="10" y7="12" y8="12"/>
-        <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="4" 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="-5" x1="17" y2="5" x2="17"/>
-        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="20" x2="-5" y3="20" x3="5" y4="12"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="4" x2="-5" y3="4" x3="5" y4="12"/>
-        <input x="5" y="18.5" size="5" text="xBar"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="0" y="-10" orientation="n"/>
+        <polygon y3="-10" x7="20" y9="20" closed="false" y8="7" x8="8" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" x6="20" x9="8" y4="-10" x1="0" x4="8" y10="20" y6="-7" x5="8" y5="-7" y2="20" x2="-8" x3="-8" y7="7" y1="20" x10="0"/>
+        <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="20" x2="17"/>
+        <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="0" x2="8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" x4="17" antialias="false" y1="0" x1="17" x3="8" y3="5" y4="0" x2="8"/>
+        <polygon y3="14" x7="-8" closed="false" y8="12" x8="-9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-7" y4="10" x1="0" x4="-5" y6="10" x5="-6" y5="14" y2="12" x2="-3" x3="-4" y7="12" y1="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5" x1="17" x2="17"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" x4="0" antialias="false" y1="12" x1="0" closed="false" x3="5" y3="20" y4="12" x2="-5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="0" antialias="true" y1="12" x1="0" closed="false" x3="5" y3="4" y4="12" x2="-5"/>
+        <input tagg="label" size="5" y="18.5" x="5" text="xBar"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="20" x="0" orientation="s"/>
+        <terminal y="-10" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01g.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01g.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/groupe_securite_01g.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,28 +1,29 @@
-<definition width="50" version="0.3" hotspot_x="30" hotspot_y="20" height="50" type="element" orientation="dyyy">
-<uuid uuid="{F987A046-A123-4AD5-99B3-3385865716C8}"/><names>
-        <name lang="ar">مجموعة حماية (يسار)</name>
-        <name lang="en">Security Group (left)</name>
-        <name lang="fr">Groupe de Sécurité (gauche)</name>
+<definition width="40" hotspot_x="26" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="14">
+    <uuid uuid="{757659ee-e2f7-483d-904c-868fa6c581e3}"/>
+    <names>
+        <name lang="cs">Bezpečnostní skupina (levá)</name>
         <name lang="pl">Grupa bezpieczeństwa</name>
-        <name lang="cs">Bezpečnostní skupina (levá)</name>
         <name lang="it">Gruppo di sicurezza SX</name>
+        <name lang="en">Security Group (left)</name>
         <name lang="nl">Inlaatcombinatie</name>
+        <name lang="ar">مجموعة حماية (يسار)</name>
+        <name lang="fr">Groupe de Sécurité (gauche)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" x1="0" x2="-6" x3="-6" x4="-20" antialias="false" x5="-20" x6="-8" x7="-8" x8="7" x9="7" closed="false" y1="20" y2="20" y10="20" y3="7" y4="7" y5="-7" x10="0" y6="-7" y7="-10" y8="-10" y9="20"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="3" x3="4" x4="5" antialias="false" x5="6" x6="7" x7="8" x8="10" closed="false" y1="12" y2="12" y3="10" y4="14" y5="10" y6="14" y7="12" y8="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-8" y2="0" 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="4" 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="0" x1="-20" y2="0" x2="-17"/>
-        <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" x1="-17" y2="5" x2="-17"/>
-        <polygon x4="-17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-17" y2="-5" x2="-8" y3="5" x3="-8" y4="0"/>
-        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="20" x2="-5" y3="20" x3="5" y4="12"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="4" x2="-5" y3="4" x3="5" y4="12"/>
-        <input x="-27" y="17.5" size="5" text="xBar"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="0" y="-10" orientation="n"/>
+        <polygon y3="7" x7="-8" y9="20" closed="false" y8="-10" x8="7" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" x6="-8" x9="7" y4="7" x1="0" x4="-20" y10="20" y6="-7" x5="-20" y5="-7" y2="20" x2="-6" x3="-6" y7="-10" y1="20" x10="0"/>
+        <polygon y3="10" x7="8" closed="false" y8="12" x8="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="7" y4="14" x1="0" x4="5" y6="14" x5="6" y5="10" y2="12" x2="3" x3="4" y7="12" y1="12"/>
+        <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="-8" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="0" x2="0"/>
+        <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="-20" x2="-17"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5" x1="-17" x2="-17"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" x4="-17" antialias="false" y1="0" x1="-17" x3="-8" y3="5" y4="0" x2="-8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" x4="0" antialias="false" y1="12" x1="0" closed="false" x3="5" y3="20" y4="12" x2="-5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="0" antialias="true" y1="12" x1="0" closed="false" x3="5" y3="4" y4="12" x2="-5"/>
+        <input tagg="label" size="5" y="17.5" x="-27" text="xBar"/>
+        <terminal y="0" x="-20" orientation="w"/>
+        <terminal y="20" x="0" orientation="s"/>
+        <terminal y="-10" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/manometre_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/manometre_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/manometre_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,31 +1,33 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{870FCCB3-CBC0-4428-A988-91677ED746D0}"/><names>
-        <name lang="ar">مقياس ضغط</name>
-        <name lang="en">Manometer</name>
-        <name lang="fr">Manomètre </name>
+<definition width="30" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="19">
+    <uuid uuid="{6541c6ec-8009-4a63-89a0-f4e0cad12c7d}"/>
+    <names>
+        <name lang="cs">Tlakoměr</name>
         <name lang="pl">Manometr</name>
-        <name lang="cs">Tlakoměr</name>
         <name lang="it">Manometro</name>
+        <name lang="en">Manometer</name>
         <name lang="nl">Drukmeter</name>
+        <name lang="ar">مقياس ضغط</name>
+        <name lang="fr">Manomètre </name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="1" y5="7.75" x5="1" y6="7.75" x6="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.75" x1="-1" y2="10.75" x2="-1" y3="10.75" x3="-1" y4="10.75"/>
-        <text x="-4" y="3.75" size="4" text="bar"/>
-        <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.75" x1="0" y2="11.75" 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="-5.25" x1="-3" y2="-4.25" 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="-5.25" x1="-3" y2="-2.25" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="-3" y2="-0.25" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.75" x1="6" y2="2.75" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.75" x1="-6" y2="2.75" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.25" x1="6" y2="-7.25" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.25" x1="-6" y2="-7.25" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.25" x1="0" y2="-9.25" x2="0"/>
-        <circle x="-8.60233" y="-10.8523" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
-        <circle x="-10" y="-12.25" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="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.25" x1="7" y2="-2.25" 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="-2.25" x1="-8" y2="-2.25" x2="-7"/>
-        <terminal x="0" y="11.75" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10.75" x4="1" x6="1" antialias="false" y6="7.75" y5="7.75" y1="7.75" x1="-1" closed="false" x3="-1" y3="10.75" y4="10.75" x2="-1" x5="1"/>
+        <input tagg="label" rotate="true" size="9" y="-1.45" x="11" text="_"/>
+        <text size="4" y="3.75" x="-4" text="bar"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="11.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10.75" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5.25" x1="-3" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5.25" x1="-3" x2="-2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-0.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5.25" x1="-3" x2="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3.75" x1="6" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3.75" x1="-6" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.25" x1="6" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.25" x1="-6" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10.25" x1="0" x2="0"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="17.2047" y="-10.8523" x="-8.60233"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="20" y="-12.25" x="-10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.25" x1="7" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.25" x1="-8" x2="-7"/>
+        <terminal y="11.75" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/purgeur.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/purgeur.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/purgeur.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,28 +1,30 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="ndny">
-<uuid uuid="{C3331F00-5738-4899-9C75-85D921D9B098}"/><names>
-        <name lang="ar">مُنفّس</name>
-        <name lang="en">Trap</name>
-        <name lang="fr">Purgeur</name>
+<definition width="30" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="20">
+    <uuid uuid="{811404b7-c01b-4f71-99c2-2f4ee015195a}"/>
+    <names>
+        <name lang="cs">Vypouštěcí kohout</name>
         <name lang="pl">Odpowietrznik</name>
-        <name lang="cs">Vypouštěcí kohout</name>
         <name lang="it">Sfiato</name>
+        <name lang="en">Trap</name>
         <name lang="nl">luchtvanger</name>
+        <name lang="ar">مُنفّس</name>
+        <name lang="fr">Purgeur</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:thin;filling:none;color:black" y1="-12" x1="3.5" y2="-11" x2="3.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="-12" x1="-7" y2="-11" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="3" y2="-16" 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="-13" x1="4" y2="-15" x2="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="-13" x1="5" y2="-15" x2="5"/>
-        <rect width="2" x="-1" y="10" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="14" x="-7" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18" x="-9" y="-13" antialias="true" 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="-12" x1="0" y2="-11" x2="0"/>
-        <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="-12" x1="-4" y2="-11" 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="-12" x1="6.5" y2="-11" x2="6.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="-12" x1="-1" y2="-11" x2="-1"/>
-        <terminal x="0" y="13" orientation="s"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="3.5" x2="3.5"/>
+        <input tagg="label" rotate="true" size="9" y="-3.45" x="11" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="-7" x2="-7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="3" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="4" x2="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="5" x2="5"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="10" x="-1" height="3"/>
+        <rect width="14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-10" x="-7" height="20"/>
+        <rect width="18" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-13" x="-9" height="3"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="-4" x2="-4"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="6.5" x2="6.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="-1" x2="-1"/>
+        <terminal y="13" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01d.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01d.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01d.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,21 +1,22 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{C897D947-C69F-4CD3-BB0D-806DF263C9D1}"/><names>
-        <name lang="ar">"صمّام أمان" يمين</name>
-        <name lang="en">Safety Valve "right"</name>
-        <name lang="fr">Soupape de Sécurité "droite"</name>
+<definition width="30" hotspot_x="12" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="22">
+    <uuid uuid="{657c154f-68b0-4d42-863a-f653defbcb63}"/>
+    <names>
+        <name lang="cs">Bezpečnostní uzávěr (pravý)</name>
         <name lang="pl">Zawór bezpieczeństwa</name>
-        <name lang="cs">Bezpečnostní uzávěr (pravý)</name>
         <name lang="it">Valvola di sicurezza DX</name>
+        <name lang="en">Safety Valve "right"</name>
         <name lang="nl">Overdrukklep</name>
+        <name lang="ar">"صمّام أمان" يمين</name>
+        <name lang="fr">Soupape de Sécurité "droite"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
-        <polygon x4="0" y5="0" x5="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
-        <input x="-12" y="-19.5" size="5" text="xBar"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="10" y3="6" y4="0" x2="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x4="0" antialias="true" y5="0" y1="0" x1="0" closed="false" x3="6" y3="10" y4="0" x2="-6" x5="0"/>
+        <input tagg="label" size="5" y="-19.5" x="-12" text="xBar"/>
+        <polygon y3="-6" x7="-3" y9="-15" closed="false" y8="-14" x8="3" x12="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-17" x6="3" x9="0" y4="-8" x1="0" x4="3" y10="-17" y6="-11" x5="-3" y5="-9" y2="-4" x2="0" x3="-3" x11="0" y11="-17" y7="-12" y1="0" x10="0"/>
+        <terminal y="0" x="10" orientation="e"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01g.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01g.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/soupape_01g.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,21 +1,22 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{C5CFF5F2-F938-4C25-8C40-29F5841F0B9D}"/><names>
-        <name lang="ar">"صمّام أمان" يسار</name>
-        <name lang="en">Safety valve "left"</name>
-        <name lang="fr">Soupape Sécurité "gauche"</name>
+<definition width="30" hotspot_x="18" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="22">
+    <uuid uuid="{e628b510-6f84-4ee0-848d-f64a9fea0d54}"/>
+    <names>
+        <name lang="cs">Bezpečnostní uzávěr (levý)</name>
         <name lang="pl">Zawór bezpieczeństwa</name>
-        <name lang="cs">Bezpečnostní uzávěr (levý)</name>
         <name lang="it">Valvola di sicurezza SX</name>
+        <name lang="en">Safety valve "left"</name>
         <name lang="nl">Overdrukklep</name>
+        <name lang="ar">"صمّام أمان" يسار</name>
+        <name lang="fr">Soupape Sécurité "gauche"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
-        <polygon x4="0" y5="0" x5="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="-10" y3="6" x3="-10" y4="0"/>
-        <input x="-12" y="-19.5" size="5" text="xBar"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="6" y3="10" y4="0" x2="-6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" x4="0" antialias="true" y5="0" y1="0" x1="0" closed="false" x3="-10" y3="6" y4="0" x2="-10" x5="0"/>
+        <input tagg="label" size="5" y="-19.5" x="-12" text="xBar"/>
+        <polygon y3="-6" x7="-3" y9="-15" closed="false" y8="-14" x8="3" x12="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-17" x6="3" x9="0" y4="-8" x1="0" x4="3" y10="-17" y6="-11" x5="-3" y5="-9" y2="-4" x2="0" x3="-3" x11="0" y11="-17" y7="-12" y1="0" x10="0"/>
+        <terminal y="0" x="-10" orientation="w"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/termovar.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/termovar.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/termovar.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,28 +1,30 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{BCA0DD99-F730-483E-B8EC-75BA8F77CE09}"/><names>
-        <name lang="ar">Thermovar</name>
-        <name lang="en">Thermovar</name>
-        <name lang="fr">Thermovar</name>
+<definition width="40" hotspot_x="19" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="17">
+    <uuid uuid="{e7403431-f9ee-40ab-99cb-33c6dd69e027}"/>
+    <names>
+        <name lang="cs">Thermovar</name>
         <name lang="pl">Thermovar</name>
-        <name lang="cs">Thermovar</name>
         <name lang="it">Valvola 3vie Thermovar</name>
+        <name lang="en">Thermovar</name>
         <name lang="nl">Mengklep Thermovar</name>
+        <name lang="ar">Thermovar</name>
+        <name lang="fr">Thermovar</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="20" x="-10" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="22" x="-11" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-11" y="-5" size="3" text="Termovar"/>
-        <arc width="5" x="-2" y="1" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="0" x1="4" y2="0" x2="-5"/>
-        <polygon x4="8" y5="0" x5="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="8" y2="-3" x2="5" y3="3" x3="5" y4="0"/>
-        <rect width="10" x="-6" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="14" x="-7" y="11" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-14" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="11" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-14" y="0" orientation="w"/>
-        <terminal x="14" y="0" orientation="e"/>
-        <terminal x="0" y="14" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-22.5" x="-6" text="_"/>
+        <rect width="20" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="-10" x="-10" height="20"/>
+        <rect width="22" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-11" x="-11" height="22"/>
+        <text size="3" y="-5" x="-11" text="Termovar"/>
+        <arc width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="1" x="-2" height="5"/>
+        <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="4" x2="-5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" x4="8" antialias="true" y5="0" y1="0" x1="8" closed="false" x3="5" y3="3" y4="0" x2="5" x5="8"/>
+        <rect width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-1" x="-6" height="2"/>
+        <rect width="14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="11" x="-7" height="3"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9" x="-14" height="18"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9" x="11" height="18"/>
+        <terminal y="0" x="-14" orientation="w"/>
+        <terminal y="0" x="14" orientation="e"/>
+        <terminal y="14" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_rond_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_rond_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_rond_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,29 +1,31 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="30" type="element" orientation="dyyy">
-<uuid uuid="{14FFD7C9-3905-4218-B3C7-0971005997A1}"/><names>
-        <name lang="ar">ميزان حرارة</name>
-        <name lang="en">Dial Thermometer</name>
-        <name lang="fr">Thermomètre à cadran</name>
+<definition width="30" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="14">
+    <uuid uuid="{7ae977aa-13fc-405a-86c2-739618387763}"/>
+    <names>
+        <name lang="cs">Teploměr s číselníkem</name>
         <name lang="pl">Termometr</name>
-        <name lang="cs">Teploměr s číselníkem</name>
         <name lang="it">Termometro</name>
+        <name lang="en">Dial Thermometer</name>
         <name lang="nl">Thermometer rond</name>
+        <name lang="ar">ميزان حرارة</name>
+        <name lang="fr">Thermomètre à cadran</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="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-4" y2="0" x2="5"/>
-        <circle x="-8.60233" y="-5.85233" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
-        <circle x="-10" y="-7.25" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="20"/>
-        <polygon x4="1" y5="12.75" x5="1" y6="12.75" x6="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12.75" x1="-1" y2="15.75" x2="-1" y3="15.75" x3="-1" y4="15.75"/>
-        <text x="-3" y="10" size="4" text="°C"/>
-        <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.75" x1="0" y2="16.75" 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="8.75" x1="6" y2="7.75" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.75" x1="-6" y2="7.75" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.25" x1="6" y2="-2.25" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.25" x1="-6" y2="-2.25" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="0" y2="-4.25" 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="2.75" x1="7" y2="2.75" 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="2.75" x1="-8" y2="2.75" x2="-7"/>
-        <terminal x="0" y="16.75" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="2.55" x="9" text="_"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5" x1="-4" x2="5"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="17.2047" y="-5.85233" x="-8.60233"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="20" y="-7.25" x="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15.75" x4="1" x6="1" antialias="false" y6="12.75" y5="12.75" y1="12.75" x1="-1" closed="false" x3="-1" y3="15.75" y4="15.75" x2="-1" x5="1"/>
+        <text size="4" y="10" x="-3" text="°C"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="16.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="15.75" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8.75" x1="6" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8.75" x1="-6" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3.25" x1="6" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3.25" x1="-6" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5.25" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2.75" x1="7" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="2.75" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2.75" x1="-8" x2="-7"/>
+        <terminal y="16.75" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_vertical_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_vertical_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/thermometre_vertical_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,34 +1,36 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dyyy">
-<uuid uuid="{859F17D2-DF6C-4990-BF9E-564F640138EB}"/><names>
-        <name lang="ar">ميزان حرارة عمودي</name>
-        <name lang="en">Vertical thermometer</name>
-        <name lang="fr">Thermomètre Vertical </name>
+<definition width="20" hotspot_x="10" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="27">
+    <uuid uuid="{589e5ac6-f22a-4b4d-9132-46e3ff6abb6d}"/>
+    <names>
+        <name lang="cs">Svislý teploměr</name>
         <name lang="pl">Termometr</name>
-        <name lang="cs">Svislý teploměr</name>
         <name lang="it">Termometro verticale</name>
+        <name lang="en">Vertical thermometer</name>
         <name lang="nl">Thermometer vertikaal</name>
+        <name lang="ar">ميزان حرارة عمودي</name>
+        <name lang="fr">Thermomètre Vertical </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:thin;filling:none;color:black" y1="-16" x1="-1" y2="-16" x2="1"/>
-        <text x="-1" y="-16" size="2" text="°c"/>
-        <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="-17" x1="0" y2="7" x2="0"/>
-        <rect width="4" x="-2" y="-17" antialias="false" height="24" 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="13" x1="0" y2="22" 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="12" x2="0"/>
-        <rect width="2" x="-1" y="10" antialias="false" height="13" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8" x="-4" y="-20" antialias="false" height="30" 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="2" x1="-1" y2="2" x2="1"/>
-        <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" x1="-1" y2="4" x2="1"/>
-        <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" x1="-1" y2="-2" x2="1"/>
-        <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" x1="-1" y2="0" x2="1"/>
-        <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" x1="-1" y2="-6" x2="1"/>
-        <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" x1="-1" y2="-4" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-14" x1="-1" y2="-14" x2="1"/>
-        <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" x1="-1" y2="-8" x2="1"/>
-        <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="-10" x1="-1" y2="-10" x2="1"/>
-        <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="-12" x1="-1" y2="-12" x2="1"/>
-        <terminal x="0" y="23" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-4.45" x="8" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-1" x2="1"/>
+        <text size="2" y="-16" x="-1" text="°c"/>
+        <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="-17" x1="0" x2="0"/>
+        <rect width="4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="-17" x="-2" height="24"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="22" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="0" x2="0"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="10" x="-1" height="13"/>
+        <rect width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20" x="-4" height="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="4" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="-1" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="-1" x2="1"/>
+        <terminal y="23" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_01d.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_01d.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_01d.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,27 +1,28 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
-<uuid uuid="{76499ED6-C0D7-4EBF-BB79-307D79436B54}"/><names>
-        <name lang="ar">صمّام تفاضلي</name>
-        <name lang="en">Differential valve "right"</name>
-        <name lang="fr">Vanne différentielle "droite"</name>
+<definition width="40" hotspot_x="20" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="23">
+    <uuid uuid="{e9eaf2a7-cb9d-40a9-a5aa-39ae42a7815a}"/>
+    <names>
+        <name lang="cs">Rozdílový uzávěr (pravý)</name>
         <name lang="pl">Zawór różnicowy</name>
-        <name lang="cs">Rozdílový uzávěr (pravý)</name>
         <name lang="it">Valvola differenziale DX</name>
+        <name lang="en">Differential valve "right"</name>
         <name lang="nl">Drukverschil klep</name>
+        <name lang="ar">صمّام تفاضلي</name>
+        <name lang="fr">Vanne différentielle "droite"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="-9" y2="-18" x2="-11"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="9" y2="-18" x2="12"/>
-        <arc width="18" x="-9" y="-17.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-10" angle="-160"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="11" y2="-14" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="-15" y2="-14" x2="-11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-13" y2="-12" x2="-13"/>
-        <input x="-12" y="-23.5" size="5" text="xBar"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="10" y3="6" y4="0" x2="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="6" y3="10" y4="0" x2="-6"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-18" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-9" x2="-11"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-18" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-16" x1="9" x2="12"/>
+        <arc width="18" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-10" antialias="true" angle="-160" y="-17.5" x="-9" height="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14" x1="11" x2="15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14" x1="-15" x2="-11"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-13" x2="-13"/>
+        <input tagg="label" size="5" y="-23.5" x="-12" text="xBar"/>
+        <polygon y3="-6" x7="-3" y9="-15" closed="false" y8="-14" x8="3" x12="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-17" x6="3" x9="0" y4="-8" x1="0" x4="3" y10="-17" y6="-11" x5="-3" y5="-9" y2="-4" x2="0" x3="-3" x11="0" y11="-17" y7="-12" y1="0" x10="0"/>
+        <terminal y="0" x="10" orientation="e"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_03.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_03.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_03.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,28 +1,29 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{DB03ABDB-3942-4FF2-867E-93A0696FBEC9}"/><names>
-        <name lang="ar">صمام ضغط تفاضلي</name>
-        <name lang="en">Differential Pressure Valve</name>
-        <name lang="fr">Vanne Pression Différentielle</name>
+<definition width="30" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="11">
+    <uuid uuid="{01b29ec9-3774-4b5f-997c-ea57bc7a2d32}"/>
+    <names>
+        <name lang="cs">Rozdílový uzávěr</name>
         <name lang="pl">Zawór różnicowy</name>
-        <name lang="cs">Rozdílový uzávěr</name>
         <name lang="it">Valvola pressione differenziale</name>
+        <name lang="en">Differential Pressure Valve</name>
         <name lang="nl">Drukverschil klep</name>
+        <name lang="ar">صمام ضغط تفاضلي</name>
+        <name lang="fr">Vanne Pression Différentielle</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:thin;filling:none;color:black" y1="-6" x1="8" y2="-6" x2="12"/>
-        <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" x1="4" y2="-5" x2="6"/>
-        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="0" y2="4" x2="-10" y3="16" x3="-10" y4="10"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="0" y2="4" x2="10" y3="16" x3="10" y4="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-7" x1="6" y2="3" x2="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="2" x1="8" y2="2" x2="12"/>
-        <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" x1="10" y2="-4" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1" x1="4" y2="1" x2="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="-2" x1="4" y2="-2" x2="6"/>
-        <input x="-12" y="-19.5" size="5" text="xBar"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="9" y2="5" y10="-8" y3="3" y11="-8" y4="1" y12="-8" y5="0" x10="0" y6="-2" x11="0" y7="-3" x12="0" y8="-5" y9="-6"/>
-        <terminal x="10" y="10" orientation="e"/>
-        <terminal x="-10" y="10" orientation="w"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5" x1="4" x2="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="0" antialias="false" y1="10" x1="0" closed="false" x3="-10" y3="16" y4="10" x2="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="0" antialias="true" y1="10" x1="0" closed="false" x3="10" y3="16" y4="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-7" x1="6" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1" antialias="false" length2="1.5" end1="none" length1="1.5" y1="1" x1="4" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2" x1="4" x2="6"/>
+        <input tagg="label" size="5" y="-19.5" x="-12" text="xBar"/>
+        <polygon y3="3" x7="-3" y9="-6" closed="false" y8="-5" x8="3" x12="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-8" x6="3" x9="0" y4="1" x1="0" x4="3" y10="-8" y6="-2" x5="-3" y5="0" y2="5" x2="0" x3="-3" x11="0" y11="-8" y7="-3" y1="9" x10="0"/>
+        <terminal y="10" x="10" orientation="e"/>
+        <terminal y="10" x="-10" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_1g.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_1g.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_1g.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,27 +1,28 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
-<uuid uuid="{CF578626-4E85-4BE7-BC4C-3AA32AB21C8F}"/><names>
-        <name lang="ar">"صمّام ضغط" يسار</name>
-        <name lang="en">Differential valve "left"</name>
-        <name lang="fr">Vanne différentielle "gauche"</name>
+<definition width="40" hotspot_x="20" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="23">
+    <uuid uuid="{9bde3461-c305-4e69-a9d9-1f5abafffec7}"/>
+    <names>
+        <name lang="cs">Rozdílový uzávěr (levý)</name>
         <name lang="pl">Zawór różnicowy</name>
-        <name lang="cs">Rozdílový uzávěr (levý)</name>
         <name lang="it">Valvola differenziale SX</name>
+        <name lang="en">Differential valve "left"</name>
         <name lang="nl">Drukverschil klep</name>
+        <name lang="ar">"صمّام ضغط" يسار</name>
+        <name lang="fr">Vanne différentielle "gauche"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="-10" y3="6" x3="-10" y4="0"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="-9" y2="-18" x2="-11"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="9" y2="-18" x2="12"/>
-        <arc width="18" x="-9" y="-17.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-10" angle="-160"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="11" y2="-14" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="-15" y2="-14" x2="-11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-13" y2="-12" x2="-13"/>
-        <input x="-12" y="-21.5" size="5" text="xBar"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="-10" y3="6" y4="0" x2="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="6" y3="10" y4="0" x2="-6"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-18" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-9" x2="-11"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-18" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-16" x1="9" x2="12"/>
+        <arc width="18" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-10" antialias="true" angle="-160" y="-17.5" x="-9" height="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14" x1="11" x2="15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14" x1="-15" x2="-11"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-13" x2="-13"/>
+        <input tagg="label" size="5" y="-21.5" x="-12" text="xBar"/>
+        <polygon y3="-6" x7="-3" y9="-15" closed="false" y8="-14" x8="3" x12="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-17" x6="3" x9="0" y4="-8" x1="0" x4="3" y10="-17" y6="-11" x5="-3" y5="-9" y2="-4" x2="0" x3="-3" x11="0" y11="-17" y7="-12" y1="0" x10="0"/>
+        <terminal y="0" x="-10" orientation="w"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3d.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3d.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3d.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,28 +1,29 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
-<uuid uuid="{3A41C805-8C8F-4FE8-98B4-A90B5BE38945}"/><names>
-        <name lang="ar">"صمّام تفاضلي" يمين</name>
-        <name lang="en">Differential valve "right"</name>
-        <name lang="fr">Vanne différentielle "droite"</name>
+<definition width="30" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="23">
+    <uuid uuid="{166d942e-b24d-4b0d-b5ac-fcb89a6f057c}"/>
+    <names>
+        <name lang="cs">Rozdílový uzávěr (pravý)</name>
         <name lang="pl">Zawór różnicowy</name>
-        <name lang="cs">Rozdílový uzávěr (pravý)</name>
         <name lang="it">Valvola differenziale "destra"</name>
+        <name lang="en">Differential valve "right"</name>
         <name lang="nl">Drukverschil klep</name>
+        <name lang="ar">"صمّام تفاضلي" يمين</name>
+        <name lang="fr">Vanne différentielle "droite"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="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="-14" x1="-7" y2="-4" x2="-7"/>
-        <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="-12" y2="-2" 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="-16" x1="-12" y2="-16" 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="-18" x1="-10" y2="-14" x2="-10"/>
-        <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="-7" y2="-6" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-7" y2="-9" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-7" y2="-12" x2="-5"/>
-        <input x="-12" y="-22.5" size="5" text="xBar"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="10" y3="6" y4="0" x2="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="6" y3="10" y4="0" x2="-6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14" x1="-7" x2="-7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2" x1="-12" x2="-8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-12" x2="-8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="-10" x2="-10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6" x1="-7" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-9" x1="-7" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="-7" x2="-5"/>
+        <input tagg="label" size="5" y="-22.5" x="-12" text="xBar"/>
+        <polygon y3="-6" x7="-3" y9="-15" closed="false" y8="-14" x8="3" x12="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-17" x6="3" x9="0" y4="-8" x1="0" x4="3" y10="-17" y6="-11" x5="-3" y5="-9" y2="-4" x2="0" x3="-3" x11="0" y11="-17" y7="-12" y1="0" x10="0"/>
+        <terminal y="0" x="10" orientation="e"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3g.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3g.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_diferentielle_3g.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,28 +1,29 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
-<uuid uuid="{A0959F73-AC63-4099-A86E-40B3BD035467}"/><names>
-        <name lang="ar">"صمّام تفاضلي" يسار</name>
-        <name lang="en">Differential valve "left"</name>
-        <name lang="fr">Vanne différentielle "gauche"</name>
+<definition width="30" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="24">
+    <uuid uuid="{b0a01464-ad2f-4b00-b683-69744cb0311e}"/>
+    <names>
+        <name lang="cs">Rozdílový uzávěr (levý)</name>
         <name lang="pl">Zawór różnicowy</name>
-        <name lang="cs">Rozdílový uzávěr (levý)</name>
         <name lang="it">Valvola differenziale "sinistra"</name>
+        <name lang="en">Differential valve "left"</name>
         <name lang="nl">Drukverschil klep</name>
+        <name lang="ar">"صمّام تفاضلي" يسار</name>
+        <name lang="fr">Vanne différentielle "gauche"</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="-10" y3="6" x3="-10" y4="0"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="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="-16" x1="7" y2="-6" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="8" y2="-4" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="8" y2="-18" x2="12"/>
-        <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="10" y2="-16" x2="10"/>
-        <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="-8" x1="5" y2="-8" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="5" y2="-11" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="5" y2="-14" x2="7"/>
-        <input x="-12" y="-22.5" size="5" text="xBar"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="-10" y3="6" y4="0" x2="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" x4="0" antialias="true" y1="0" x1="0" closed="false" x3="6" y3="10" y4="0" x2="-6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="7" x2="7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-18" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8" x1="5" x2="7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-11" x1="5" x2="7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14" x1="5" x2="7"/>
+        <input tagg="label" size="5" y="-22.5" x="-12" text="xBar"/>
+        <polygon y3="-6" x7="-3" y9="-15" closed="false" y8="-14" x8="3" x12="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="-17" x6="3" x9="0" y4="-8" x1="0" x4="3" y10="-17" y6="-11" x5="-3" y5="-9" y2="-4" x2="0" x3="-3" x11="0" y11="-17" y7="-12" y1="0" x10="0"/>
+        <terminal y="0" x="-10" orientation="w"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,29 +1,30 @@
-<definition width="50" version="0.3" hotspot_x="35" hotspot_y="35" height="60" type="element" orientation="dyyy">
-<uuid uuid="{06F9AFCD-7F2B-4412-90C3-9362301D5E3D}"/><names>
-        <name lang="ar">صمّام لإعادة تدوير ترموستاتي</name>
-        <name lang="en">Thermostatic valve Recycling</name>
-        <name lang="fr">Vanne de Recyclage Thermostatique</name>
+<definition width="50" hotspot_x="34" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="36">
+    <uuid uuid="{f20be40d-db9a-4989-9304-dd5af5e22f1d}"/>
+    <names>
+        <name lang="cs">Termostatický uzávěr</name>
         <name lang="pl">Zawór termostatyczny</name>
-        <name lang="cs">Termostatický uzávěr</name>
         <name lang="it">Valvola termostatica</name>
+        <name lang="en">Thermostatic valve Recycling</name>
         <name lang="nl">Thermostaat klep</name>
+        <name lang="ar">صمّام لإعادة تدوير ترموستاتي</name>
+        <name lang="fr">Vanne de Recyclage Thermostatique</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="-30" x1="-10" y2="-25" x2="-10"/>
-        <rect width="4" x="-12" y="-24" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-18" x2="-15" y3="-18" x3="-5" y4="-10"/>
-        <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="-20" y2="-10" x2="-30"/>
-        <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="10" y2="-10" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-1"/>
-        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-5" x2="-15" x3="-5" x4="-15" antialias="false" x5="-5" x6="-15" x7="-5" x8="-15" x9="-5" closed="false" y1="-4" y2="-4" y3="-6" y4="-7" y5="-9" y6="-11" y7="-13" y8="-14" y9="-14"/>
-        <polygon x4="-4" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-7" x1="-16" y2="-3" x2="-16" y3="-3" x3="-4" y4="-7"/>
-        <polygon x4="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-10" y2="-16" x2="0" y3="-4" x3="0" y4="-10"/>
-        <polygon x4="-10" y5="-10" x5="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-16" x2="-20" y3="-4" x3="-20" y4="-10"/>
-        <input x="-32" y="12" size="6" text="termovar"/>
-        <terminal x="-30" y="-10" orientation="w"/>
-        <terminal x="-10" y="-30" orientation="n"/>
-        <terminal x="10" y="-10" orientation="e"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="-10" x2="-10"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-24" x="-12" height="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-18" x4="-10" antialias="false" y1="-10" x1="-10" closed="false" x3="-5" y3="-18" y4="-10" x2="-15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="-20" x2="-30"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="10" x2="0"/>
+        <line end2="triangle" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-21" x2="-1"/>
+        <polygon y3="-6" x7="-5" y9="-14" closed="false" y8="-14" x8="-15" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" x6="-15" x9="-5" y4="-7" x1="-5" x4="-15" y6="-11" x5="-5" y5="-9" y2="-4" x2="-15" x3="-5" y7="-13" y1="-4"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-3" x4="-4" antialias="false" y1="-7" x1="-16" closed="false" x3="-4" y3="-3" y4="-7" x2="-16"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" x4="-10" antialias="false" y1="-10" x1="-10" x3="0" y3="-4" y4="-10" x2="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" x4="-10" antialias="true" y5="-10" y1="-10" x1="-10" closed="false" x3="-20" y3="-4" y4="-10" x2="-20" x5="-10"/>
+        <input tagg="label" size="6" y="12" x="-32" text="termovar"/>
+        <terminal y="-10" x="-30" orientation="w"/>
+        <terminal y="-30" x="-10" orientation="n"/>
+        <terminal y="-10" x="10" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,25 +1,26 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="60" type="element" orientation="dyyy">
-<uuid uuid="{01D878AD-AD3F-4E20-B33D-2E61EEF19001}"/><names>
-        <name lang="ar">إناء تسخين 01</name>
-        <name lang="en">Heating Vase 01</name>
-        <name lang="fr">Vase Chauffage 01</name>
+<definition width="50" hotspot_x="25" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="25">
+    <uuid uuid="{a0fcc0bf-18c1-4d54-a179-389b32dffce2}"/>
+    <names>
+        <name lang="cs">Nádoba, ohřívání 01</name>
         <name lang="pl">Naczynie wzbiorcze</name>
-        <name lang="cs">Nádoba, ohřívání 01</name>
         <name lang="it">Vaso di espansione 10L</name>
+        <name lang="en">Heating Vase 01</name>
         <name lang="nl">Expansie tank</name>
+        <name lang="ar">إناء تسخين 01</name>
+        <name lang="fr">Vase Chauffage 01</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-13" y="25" size="7" rotate="true" text="10L"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.1" x1="0" y2="20.1" x2="0"/>
-        <polygon x4="1" y5="-17.9" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17.9" x1="-1" y2="-19.9" x2="-1" y3="-19.9" x3="1" y4="-17.9"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.9" x1="20" y2="10.1" 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="1.1" x1="-20" y2="1.1" x2="20"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="1.1" x1="0" y2="9.1" x2="-5" y3="9.1" x3="5" y4="1.1"/>
-        <arc width="40" x="-20" y="-18.4" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="40" x="-20" y="3.6" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.9" x1="-20" y2="10.1" x2="-20"/>
-        <terminal x="0" y="-18.9" orientation="n"/>
+        <input tagg="label" rotate="true" size="7" y="25" x="-13" text="10L"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20.1" antialias="false" length2="1.5" end1="none" length1="1.5" y1="19.1" x1="0" x2="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-19.9" x4="1" antialias="false" y5="-17.9" y1="-17.9" x1="-1" closed="false" x3="1" y3="-19.9" y4="-17.9" x2="-1" x5="1"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10.1" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-9.9" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="1.1" antialias="false" length2="1.5" end1="none" length1="1.5" y1="1.1" x1="-20" x2="20"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9.1" x4="0" antialias="true" y1="1.1" x1="0" closed="false" x3="5" y3="9.1" y4="1.1" x2="-5"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-18.4" x="-20" height="15"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="3.6" x="-20" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10.1" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-9.9" x1="-20" x2="-20"/>
+        <terminal y="-18.9" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_02.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_02.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_02.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,25 +1,26 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="30" height="80" type="element" orientation="dyyy">
-<uuid uuid="{02B706D4-0073-4A6A-A345-F92F3DB452DB}"/><names>
-        <name lang="ar">إناء تسخين 02</name>
-        <name lang="en">Heating Vase 02</name>
-        <name lang="fr">Vase Chauffage 02</name>
+<definition width="50" hotspot_x="25" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="35">
+    <uuid uuid="{b190fe06-2721-4efb-90a1-212f167b9ff1}"/>
+    <names>
+        <name lang="cs">Nádoba, ohřívání 02</name>
         <name lang="pl">Naczynie wzbiorcze</name>
-        <name lang="cs">Nádoba, ohřívání 02</name>
         <name lang="it">Vaso di espansione 50L</name>
+        <name lang="en">Heating Vase 02</name>
         <name lang="nl">Expansie tank</name>
+        <name lang="ar">إناء تسخين 02</name>
+        <name lang="fr">Vase Chauffage 02</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="3" x2="-3" y3="3" x3="3" y4="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="0" x1="-20" y2="0" x2="20"/>
-        <input x="-12" y="36" size="7" rotate="true" text="50L"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="20" y2="20" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-20" y2="20" x2="-20"/>
-        <rect width="2" x="-1" y="27" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="1" y5="-23.9" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-23.9" x1="-1" y2="-25.9" x2="-1" y3="-25.9" x3="1" y4="-23.9"/>
-        <arc width="40" x="-20" y="-24.5" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="40" x="-20" y="12.5" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <terminal x="0" y="-26" orientation="n"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="0" antialias="true" y1="0" x1="0" x3="3" y3="3" y4="0" x2="-3"/>
+        <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="-20" x2="20"/>
+        <input tagg="label" rotate="true" size="7" y="36" x="-12" text="50L"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-17" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-20" x2="-20"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="27" x="-1" height="1"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-25.9" x4="1" antialias="false" y5="-23.9" y1="-23.9" x1="-1" closed="false" x3="1" y3="-25.9" y4="-23.9" x2="-1" x5="1"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-24.5" x="-20" height="15"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="12.5" x="-20" height="15"/>
+        <terminal y="-26" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_03.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_03.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_03.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,30 +1,32 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="50" type="element" orientation="dyyy">
-<uuid uuid="{C1E3E7C4-03E1-4741-B9E7-CE4814179BD7}"/><names>
-        <name lang="ar">إناء تسخين دائري</name>
-        <name lang="en">Heating circular vase</name>
-        <name lang="fr">Vase Chauffage circulaire</name>
+<definition width="50" hotspot_x="25" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="28">
+    <uuid uuid="{dc8d4b40-9cfb-46a3-bdd5-b545b82898ee}"/>
+    <names>
+        <name lang="cs">Nádoba, kruhové ohřívání</name>
         <name lang="pl">Naczynie wzbiorcze</name>
-        <name lang="cs">Nádoba, kruhové ohřívání</name>
         <name lang="it">Vaso di espansione</name>
+        <name lang="en">Heating circular vase</name>
         <name lang="nl">Expansie tank</name>
+        <name lang="ar">إناء تسخين دائري</name>
+        <name lang="fr">Vase Chauffage circulaire</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="-21.6333" y="-21.6333" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="43.2666"/>
-        <circle x="-20" y="-20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="40"/>
-        <input x="-9" y="-9" size="7" rotate="true" text="xL"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="-4" y2="8" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="4" y2="-7" x2="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="3" x1="3" y2="7" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="-3" y2="-7" x2="-7"/>
-        <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" x1="-4" y2="0" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0" x1="4" y2="0" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4" x1="0" y2="9" x2="0"/>
-        <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" x1="0" y2="-9" x2="0"/>
-        <circle x="-3.60555" y="-3.60555" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7.2111"/>
-        <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="-21" x2="0"/>
-        <rect width="2" x="-1" y="22" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="23" orientation="s"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="43.2666" y="-21.6333" x="-21.6333"/>
+        <input tagg="label" rotate="true" size="9" y="-4.45" x="23" text="_"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="40" y="-20" x="-20"/>
+        <input tagg="none" rotate="true" size="7" y="-9" x="-9" text="xL"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="-4" 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="4" x2="8"/>
+        <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="3" 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="-3" x2="-7"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-4" x2="-9"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="4" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="9" antialias="false" length2="1.5" end1="none" length1="1.5" y1="4" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-9" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="0" x2="0"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="7.2111" y="-3.60555" x="-3.60555"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="0" x2="0"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="22" x="-1" height="1"/>
+        <terminal y="23" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,24 +1,25 @@
-<definition width="70" version="0.3" hotspot_x="35" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{6654AD92-681F-47EE-9BEE-BEFB93F5A0E8}"/><names>
+<definition width="70" hotspot_x="37" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="19">
+    <uuid uuid="{29c0a828-9b26-4578-a40d-5475fed4713e}"/>
+    <names>
+        <name lang="cs">Nádoba, otevřené ohřívání 01</name>
+        <name lang="pl">Naczynie wzbiorcze otwarte</name>
+        <name lang="it">Vaso aperto</name>
+        <name lang="en">Heating Open vase 01</name>
+        <name lang="nl">expansie tank open</name>
         <name lang="ar">إناء تسخين مفتوح</name>
-        <name lang="en">Heating Open vase 01</name>
         <name lang="fr">Vase Chauffage Ouvert 01</name>
-        <name lang="pl">Naczynie wzbiorcze otwarte</name>
-        <name lang="cs">Nádoba, otevřené ohřívání 01</name>
-        <name lang="nl">expansie tank open</name>
-        <name lang="it">Vaso aperto</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-10" y="1.5" size="7" rotate="true" text="xL"/>
-        <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="-7" x1="-29" y2="-7" x2="29"/>
-        <rect width="2" x="-1" y="10" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-32" y="-9" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-1" y="-12" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="60" x="-30" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-12" orientation="n"/>
-        <terminal x="-32" y="-8" orientation="w"/>
-        <terminal x="0" y="12" orientation="s"/>
+        <input tagg="label" rotate="true" size="7" y="1.5" x="-10" text="xL"/>
+        <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="-7" x1="-29" x2="29"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="10" x="-1" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9" x="-32" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-12" x="-1" height="2"/>
+        <rect width="60" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10" x="-30" height="20"/>
+        <terminal y="-12" x="0" orientation="n"/>
+        <terminal y="-8" x="-32" orientation="w"/>
+        <terminal y="12" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_02.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_02.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vase_chauffage_ouvert_02.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,29 +1,30 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dyyy">
-<uuid uuid="{3B779C2A-4A88-4EBF-9D55-8225CF1C9F5D}"/><names>
-        <name lang="ar">إناء تسخين مفتوح 02</name>
-        <name lang="en">Heating Open vase 02</name>
-        <name lang="fr">Vase Chauffage Ouvert 02</name>
+<definition width="50" hotspot_x="23" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="27">
+    <uuid uuid="{7818f94c-6336-415b-bfba-9999c529e6ec}"/>
+    <names>
+        <name lang="cs">Nádoba, otevřené ohřívání 02</name>
         <name lang="pl">Naczynie wzbiorcze otwarte</name>
-        <name lang="cs">Nádoba, otevřené ohřívání 02</name>
         <name lang="it">Vaso aperto</name>
+        <name lang="en">Heating Open vase 02</name>
         <name lang="nl">expansie tank open</name>
+        <name lang="ar">إناء تسخين مفتوح 02</name>
+        <name lang="fr">Vase Chauffage Ouvert 02</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-11" y="-9.5" size="9" rotate="true" text="xL"/>
-        <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="-15" x1="15" y2="-15" x2="-15"/>
-        <circle x="-0.75" y="15.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
-        <rect width="2" x="16" y="-18" antialias="false" height="2" 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="-18" x1="16" y2="18" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-16" y2="17" x2="-16"/>
-        <circle x="-0.75" y="1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
-        <polygon x4="1" y5="-20.9" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.9" x1="-1" y2="-22.9" x2="-1" y3="-22.9" x3="1" y4="-20.9"/>
-        <arc width="32" x="-16" y="-20" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="32" x="-16" y="16" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <terminal x="0" y="-23" orientation="n"/>
-        <terminal x="18" y="-17" orientation="e"/>
-        <terminal x="0" y="2" orientation="s"/>
-        <terminal x="0" y="16" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-9.5" x="-11" text="xL"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-15" x1="15" x2="-15"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1.5" y="15.25" x="-0.75"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-18" x="16" height="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="18" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="16" x2="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18" x1="-16" x2="-16"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1.5" y="1.25" x="-0.75"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-22.9" x4="1" antialias="false" y5="-20.9" y1="-20.9" x1="-1" closed="false" x3="1" y3="-22.9" y4="-20.9" x2="-1" x5="1"/>
+        <arc width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-20" x="-16" height="4"/>
+        <arc width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="16" x="-16" height="4"/>
+        <terminal y="-23" x="0" orientation="n"/>
+        <terminal y="-17" x="18" orientation="e"/>
+        <terminal y="2" x="0" orientation="s"/>
+        <terminal y="16" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vidange.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vidange.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/expansion_soupape/vidange.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,26 +1,28 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnnn">
-<uuid uuid="{9F87D002-CC7F-4867-BC79-A402FF586683}"/><names>
-        <name lang="ar">مجرى صرف</name>
-        <name lang="en">Sewer drain</name>
-        <name lang="fr">Vidange égout</name>
+<definition width="40" hotspot_x="20" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="25">
+    <uuid uuid="{0b6d7891-449a-4c71-8e01-fbafea04318a}"/>
+    <names>
+        <name lang="cs">Kohoutek</name>
         <name lang="pl">Spust</name>
-        <name lang="cs">Kohoutek</name>
         <name lang="it">Scarico</name>
+        <name lang="en">Sewer drain</name>
         <name lang="nl">Afvoer</name>
+        <name lang="ar">مجرى صرف</name>
+        <name lang="fr">Vidange égout</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="-20" x1="0" y2="-7" x2="0"/>
-        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="16" x1="-15" y2="21" x2="-12" y3="16" x3="-9" y4="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-12" y2="21" x2="-12"/>
-        <arc width="5" x="-12" y="5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="5" x="-11" y="5" antialias="true" height="5" 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="12" x1="-6" y2="8" 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="4" x1="0" y2="12" x2="0"/>
-        <arc width="5" x="-6" y="10" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="5" x="-5" y="10" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <polygon x4="18" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-14" x1="-18" y2="4" x2="0" y3="-14" x3="18" y4="-14"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input tagg="label" rotate="true" size="9" y="0.55" x="8" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="0" x2="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" x4="-9" antialias="true" y1="16" x1="-15" closed="false" x3="-9" y3="16" y4="16" x2="-12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="-12" x2="-12"/>
+        <arc width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-90" y="5" x="-12" height="5"/>
+        <arc width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="5" x="-11" height="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="8" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="-6" x2="-6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="4" x1="0" x2="0"/>
+        <arc width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="10" x="-6" height="5"/>
+        <arc width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="10" x="-5" height="5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" x4="18" antialias="false" y1="-14" x1="-18" closed="false" x3="18" y3="-14" y4="-14" x2="0"/>
+        <terminal y="-20" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_reversible_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_reversible_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_reversible_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,26 +1,27 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{49365DF5-96CF-48E5-B877-3517D5ED5F57}"/><names>
-        <name lang="ar">مضخة تداول</name>
-        <name lang="el">Αναστρέψιμος κυκλοφορητής</name>
-        <name lang="en">Reversible circulator</name>
+<definition width="30" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="13">
+    <uuid uuid="{53b2ec13-cbe6-4f5a-bbc6-5575e826c6ac}"/>
+    <names>
+        <name lang="cs">Cirkulační pumpa</name>
         <name lang="it">Circolatore reversibile</name>
-        <name lang="fr">Circulateur Réversible</name>
         <name lang="pl">Pompa cyrkulacyjna</name>
-        <name lang="cs">Cirkulační pumpa</name>
+        <name lang="en">Reversible circulator</name>
         <name lang="nl">Pomp circulator 2 zijdig</name>
+        <name lang="ar">مضخة تداول</name>
+        <name lang="fr">Circulateur Réversible</name>
+        <name lang="el">Αναστρέψιμος κυκλοφορητής</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="6" y2="-5" x2="1" y3="5" x3="1" y4="0"/>
-        <polygon x4="-6" y5="0" x5="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="-5" x2="-1" y3="5" x3="-1" y4="0"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-7" y2="10" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="7"/>
-        <input x="-11" y="-12" size="7" text="C1"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="0" y="7" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" x4="6" antialias="true" y1="0" x1="6" x3="1" y3="5" y4="0" x2="1"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" x4="-6" antialias="true" y5="0" y1="0" x1="-6" x3="-1" y3="5" y4="0" x2="-1" x5="-6"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14" y="-7" x="-7"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="simple" length1="1.5" y1="10" x1="-7" x2="7"/>
+        <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="-7"/>
+        <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="7"/>
+        <input tagg="label" size="7" y="-12" x="-11" text="C1"/>
+        <terminal y="0" x="-10" orientation="w"/>
+        <terminal y="0" x="10" orientation="e"/>
+        <terminal y="7" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,24 +1,25 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{3776938A-A32F-47E9-ABF5-7BF1A2F48393}"/><names>
-        <name lang="ar">مضخة صرف صحي</name>
-        <name lang="en">Sanitary pump</name>
-        <name lang="fr">Circulateur Sanitaire</name>
+<definition width="30" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="13">
+    <uuid uuid="{f3c033b4-3ec6-4de8-888f-08d617b9eca9}"/>
+    <names>
+        <name lang="cs">Sanitární cirkulační pumpa</name>
         <name lang="pl">Pompa cyrkulacyjna CWU</name>
-        <name lang="cs">Sanitární cirkulační pumpa</name>
         <name lang="it">Circolatore sanitaria</name>
+        <name lang="en">Sanitary pump</name>
         <name lang="nl">Pomp sanitair</name>
+        <name lang="ar">مضخة صرف صحي</name>
+        <name lang="fr">Circulateur Sanitaire</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="4" y5="0" x5="4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="4" y2="-4" x2="-2" y3="4" x3="-2" y4="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-7" y2="10" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="7"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <input x="-11" y="-12" size="7" text="C1"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="0" y="7" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" x4="4" antialias="false" y5="0" y1="0" x1="4" x3="-2" y3="4" y4="0" x2="-2" x5="4"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="-7" x2="7"/>
+        <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="-7"/>
+        <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="7"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14" y="-7" x="-7"/>
+        <input tagg="label" size="7" y="-12" x="-11" text="C1"/>
+        <terminal y="0" x="-10" orientation="w"/>
+        <terminal y="0" x="10" orientation="e"/>
+        <terminal y="7" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_clapet_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_clapet_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/circulateur_sanitaire_clapet_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,26 +1,27 @@
-<definition width="50" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{DCE1FD83-FFF3-46E6-8889-DEDD623D7693}"/><names>
-        <name lang="ar">مضخة صرف صحي بصمّام</name>
-        <name lang="en">Sanitary pump and valve</name>
-        <name lang="fr">Circulateur Sanitaire et clapet</name>
+<definition width="40" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="13">
+    <uuid uuid="{6333eed4-3bb0-4c71-955b-bc281cf80990}"/>
+    <names>
+        <name lang="cs">Sanitární cirkulační pumpa se zvratným uzávěrem</name>
         <name lang="pl">Pompa cyrkulacyjna CWU z zaworem zwrotnym</name>
-        <name lang="cs">Sanitární cirkulační pumpa se zvratným uzávěrem</name>
         <name lang="it">Circolatore e valvola</name>
+        <name lang="en">Sanitary pump and valve</name>
         <name lang="nl">Pomp met terugslagklep</name>
+        <name lang="ar">مضخة صرف صحي بصمّام</name>
+        <name lang="fr">Circulateur Sanitaire et clapet</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="0" x1="-10" y2="0" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="13" y2="0" x2="20"/>
-        <polygon x4="8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="8" y2="-3" x2="13" y3="3" x3="13" y4="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="-5" x1="8" y2="6" x2="8"/>
-        <polygon x4="4" y5="0" x5="4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="4" y2="-4" x2="-2" y3="4" x3="-2" y4="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-8" y2="10" x2="6"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <input x="-11" y="-12" size="7" text="C1"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="0" y="7" orientation="s"/>
+        <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="-7"/>
+        <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="13" x2="20"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" x4="8" antialias="false" y1="0" x1="8" x3="13" y3="3" y4="0" x2="13"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5" x1="8" x2="8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" x4="4" antialias="false" y5="0" y1="0" x1="4" x3="-2" y3="4" y4="0" x2="-2" x5="4"/>
+        <line end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="-8" x2="6"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14" y="-7" x="-7"/>
+        <input tagg="label" size="7" y="-12" x="-11" text="C1"/>
+        <terminal y="0" x="-10" orientation="w"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="7" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/debimetre_helice_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/debimetre_helice_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/debimetre_helice_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,23 +1,24 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{758E4FD7-9DB2-429F-B357-A6B10F1267F9}"/><names>
-        <name lang="ar">مقياس تدفق بمروحة</name>
-        <name lang="en">Propeller flowmeter</name>
-        <name lang="fr">Débimetre Hélice</name>
+<definition width="30" hotspot_x="14" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="18">
+    <uuid uuid="{401b7bc3-ffe1-460d-b43e-2ba1157cdbed}"/>
+    <names>
+        <name lang="cs">Točitý průtokoměr</name>
         <name lang="pl">Przepływomierz wirnikowy</name>
-        <name lang="cs">Točitý průtokoměr</name>
         <name lang="it">Misuratore di portata a elica</name>
+        <name lang="en">Propeller flowmeter</name>
         <name lang="nl">Stromingsmeter propellor</name>
+        <name lang="ar">مقياس تدفق بمروحة</name>
+        <name lang="fr">Débimetre Hélice</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-4.5" y="17" size="5" rotate="true" text="Débim&#xE8;tre"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="11" y2="15" x2="11"/>
-        <arc width="5" x="6" y="0" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <circle x="-8.60233" y="-8.60233" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
-        <rect width="6" x="-3" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <ellipse width="2" x="-1" y="-7" antialias="true" height="9" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <ellipse width="2" x="-1" y="-1" antialias="true" height="9" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <terminal x="0" y="-10" orientation="n"/>
+        <input tagg="label" rotate="true" size="5" y="17" x="-4.5" text="Débimètre"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5" x1="11" x2="11"/>
+        <arc width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="0" x="6" height="9"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" diameter="17.2047" y="-8.60233" x="-8.60233"/>
+        <rect width="6" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="-1" x="-3" height="2"/>
+        <ellipse width="2" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" y="-7" x="-1" height="9"/>
+        <ellipse width="2" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" y="-1" x="-1" height="9"/>
+        <terminal y="-10" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,57 +1,59 @@
-<definition width="80" version="0.3" hotspot_x="40" hotspot_y="55" height="100" type="element" orientation="dyyy">
-<uuid uuid="{404D6183-09F3-46AE-84FD-B2A9B62E6C96}"/><names>
-        <name lang="ar">وحدة هيدروليكية  #1</name>
-        <name lang="el">Υδραυλική μονάδα Ν°1</name>
-        <name lang="en">Hydraulic unit # 1</name>
+<definition width="70" hotspot_x="34" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="44">
+    <uuid uuid="{db961b35-3f85-487a-b8ae-ef4af336e428}"/>
+    <names>
+        <name lang="cs">Hydraulický modul n°1</name>
         <name lang="it">Gruppo idraulico n°1</name>
-        <name lang="fr">module Hydraulique n°1</name>
         <name lang="pl">Moduł hydrauliczny n°1</name>
-        <name lang="cs">Hydraulický modul n°1</name>
+        <name lang="en">Hydraulic unit # 1</name>
         <name lang="nl">Water eenheid 1</name>
+        <name lang="ar">وحدة هيدروليكية  #1</name>
+        <name lang="fr">module Hydraulique n°1</name>
+        <name lang="el">Υδραυλική μονάδα Ν°1</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="0" y2="3" x2="-6" y3="3" x3="6" y4="-8"/>
-        <circle x="-9.99995" y="-11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <polygon x4="20" y5="-1" x5="20" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-1" x1="10" y2="1" x2="14" y3="-3" x3="16" y4="-1"/>
-        <rect width="60" x="-31" y="-40" antialias="false" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-22" y="-14" antialias="false" height="54" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-22" y="-39" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-2" y="-39" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="21" x2="21" x3="29" x4="29" antialias="false" x5="23" x6="23" x7="21" x8="21" y1="-13" y2="-9" y3="-9" y4="-11" y5="-11" y6="-14" y7="-14" y8="-14"/>
-        <polygon x4="22" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="22" y2="-33" x2="26" y3="-27" x3="26" y4="-30"/>
-        <polygon x4="25" y5="-30" x5="22" y6="-30" x6="22" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="22" y2="-30" x2="22" y3="-26" x3="19" y4="-26"/>
-        <rect width="9" x="7" y="-22" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-2" y="9" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-2" y="-14" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7.00005" y="-28.0001" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <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="30" x1="9" y2="32" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="10" y2="22" x2="10"/>
-        <polygon x4="8" y5="21" x5="8" y6="21" x6="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="8" y2="19" x2="12" y3="21" x3="12" y4="19"/>
-        <polygon x4="7" y5="29" x5="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="7" y2="31" x2="11" y3="29" x3="11" y4="31"/>
-        <rect width="2" x="4" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="5" y="19" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-22" y="-15" size="2" text="°c"/>
-        <text x="-2" y="-15" size="2" text="°c"/>
-        <circle x="15.9999" y="-26.0001" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
-        <text x="17" y="-17" size="2" text="bar"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="21" y2="-23" x2="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-19" y2="-25" 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="-30" x1="26" y2="-30" x2="29"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="22" x2="22" x3="20" x4="23" antialias="false" x5="20" x6="23" x7="22" x8="22" x9="22" closed="false" y1="-30" y2="-32" y3="-33" y4="-34" y5="-35" y6="-36" y7="-37" y8="-38" y9="-38"/>
-        <rect width="4" x="-2" y="36" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-2" y="17" antialias="false" height="11" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="8" x="-4" y="14" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-27.0001" y="-28.0001" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="1" y2="-25" x2="-3"/>
-        <terminal x="-20" y="-40" orientation="n"/>
-        <terminal x="0" y="-40" orientation="n"/>
-        <terminal x="-20" y="40" orientation="s"/>
-        <terminal x="0" y="40" orientation="s"/>
-        <terminal x="30" y="-30" orientation="e"/>
-        <terminal x="30" y="-10" orientation="e"/>
-        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="30" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="5.55" x="33" text="_"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="3" x4="0" antialias="true" y1="-8" x1="0" x3="6" y3="3" y4="-8" x2="-6"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="20" y="-11" x="-9.99995"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1" x4="20" antialias="false" y5="-1" y1="-1" x1="10" closed="false" x3="16" y3="-3" y4="-1" x2="14" x5="20"/>
+        <rect width="60" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-40" x="-31" height="80"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-14" x="-22" height="54"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-39" x="-22" height="11"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-39" x="-2" height="11"/>
+        <polygon y3="-9" x7="21" y8="-14" x8="21" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="23" y4="-11" x1="21" x4="29" y6="-14" x5="23" y5="-11" y2="-9" x2="21" x3="29" y7="-14" y1="-13"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-33" x4="22" antialias="false" y1="-30" x1="22" closed="false" x3="26" y3="-27" y4="-30" x2="26"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" x4="25" x6="22" antialias="false" y6="-30" y5="-30" y1="-30" x1="22" closed="false" x3="19" y3="-26" y4="-26" x2="22" x5="22"/>
+        <rect width="9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-22" x="7" height="2"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="9" x="-2" height="5"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-14" x="-2" height="3"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14" y="-28.0001" x="-7.00005"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="32" antialias="false" length2="1.5" end1="none" length1="1.5" y1="30" x1="9" x2="9"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="22" antialias="false" length2="1.5" end1="none" length1="1.5" y1="20" x1="10" x2="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19" x4="8" x6="8" antialias="true" y6="21" y5="21" y1="21" x1="8" closed="false" x3="12" y3="21" y4="19" x2="12" x5="8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="31" x4="7" antialias="true" y5="29" y1="29" x1="7" closed="false" x3="11" y3="29" y4="31" x2="11" x5="7"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="29" x="4" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="19" x="5" height="2"/>
+        <text size="2" y="-15" x="-22" text="°c"/>
+        <text size="2" y="-15" x="-2" text="°c"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="12" y="-26.0001" x="15.9999"/>
+        <text size="2" y="-17" x="17" text="bar"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-23" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="21" x2="24"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="-19" x2="-23"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="26" x2="29"/>
+        <polygon y3="-33" x7="22" y9="-38" closed="false" y8="-38" x8="22" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="23" x9="22" y4="-34" x1="22" x4="23" y6="-36" x5="20" y5="-35" y2="-32" x2="22" x3="20" y7="-37" y1="-30"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="36" x="-2" height="4"/>
+        <rect width="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="17" x="-2" height="11"/>
+        <rect width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="14" x="-4" height="22"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14" y="-28.0001" x="-27.0001"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="1" x2="-3"/>
+        <terminal y="-40" x="-20" orientation="n"/>
+        <terminal y="-40" x="0" orientation="n"/>
+        <terminal y="40" x="-20" orientation="s"/>
+        <terminal y="40" x="0" orientation="s"/>
+        <terminal y="-30" x="30" orientation="e"/>
+        <terminal y="-10" x="30" orientation="e"/>
+        <terminal y="20" x="10" orientation="e"/>
+        <terminal y="30" x="10" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_02.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_02.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/module_hydraulique_02.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,56 +1,58 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="50" height="100" type="element" orientation="dyyy">
-<uuid uuid="{2ABD7F1B-5BE7-4CD5-B096-A02DE573626E}"/><names>
-        <name lang="ar">وحدة هيدروليكية #2</name>
-        <name lang="el">Υδραυλική μονάδα Ν°2</name>
-        <name lang="en">Hydraulic unit # 2</name>
+<definition width="50" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="44">
+    <uuid uuid="{f1dfdcee-59c6-4f6c-8f52-b545a9e24641}"/>
+    <names>
+        <name lang="cs">Hydraulický modul n°2</name>
         <name lang="it">Gruppo idraulico n°2</name>
-        <name lang="fr">Module Hydraulique n°2</name>
         <name lang="pl">Moduł hydrauliczny n°2</name>
-        <name lang="cs">Hydraulický modul n°2</name>
+        <name lang="en">Hydraulic unit # 2</name>
         <name lang="nl">Water eenheid 2</name>
+        <name lang="ar">وحدة هيدروليكية #2</name>
+        <name lang="fr">Module Hydraulique n°2</name>
+        <name lang="el">Υδραυλική μονάδα Ν°2</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="-10" x1="20" y2="-13" x2="20"/>
-        <rect width="4" x="-2" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-2" y="-20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7" x1="0" y2="5" x2="-6" y3="5" x3="6" y4="-7"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <polygon x4="20" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="10" y2="2" x2="14" y3="-1" x3="17" y4="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="32" x1="8" y2="31" 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="22" x1="8" y2="21" x2="8"/>
-        <rect width="42" x="-12" y="-40" antialias="false" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="10" y="29" antialias="false" height="2" 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="31" x1="6" y2="29" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="6" y2="31" x2="10"/>
-        <rect width="2" x="10" y="19" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="6" y2="19" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19" x1="6" y2="21" x2="10"/>
-        <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="20" y2="-10" x2="30"/>
-        <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="-30" x1="25" y2="-30" x2="30"/>
-        <polygon x4="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="20" y2="-33" x2="25" y3="-27" x3="25" y4="-30"/>
-        <polygon x4="23" y5="-30" x5="20" y6="-30" x6="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="20" y2="-26" x2="17" y3="-26" x3="22" y4="-26"/>
-        <rect width="2" x="4" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="4" y="19" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-2" y="-22" size="2" text="°c"/>
-        <circle x="14" y="-25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
-        <text x="17" y="-15" size="2" text="bar"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.25" x1="19.25" y2="-22.25" x2="22.25"/>
-        <rect width="10" x="3" y="-20" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20.25" x2="20.25" x3="18.25" x4="21.25" antialias="false" x5="18.25" x6="21.25" x7="20.25" x8="20.25" x9="20.25" closed="false" y1="-30.25" y2="-32.25" y3="-33.25" y4="-34.25" y5="-35.25" y6="-36.25" y7="-37.25" y8="-38.25" y9="-38.25"/>
-        <rect width="4" x="-2" y="36.75" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-2" y="21.75" antialias="false" height="11" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="8" x="-4" y="14.75" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-2" y="9.75" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25.25" x1="1.25" y2="-31.25" x2="-2.75"/>
-        <circle x="-7" y="-34.2501" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <terminal x="0" y="-40" orientation="n"/>
-        <terminal x="0" y="40" orientation="s"/>
-        <terminal x="30" y="-30" orientation="e"/>
-        <terminal x="30" y="-10" orientation="e"/>
-        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="30" orientation="e"/>
-        <terminal x="20" y="0" orientation="e"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="20" x2="20"/>
+        <input tagg="label" rotate="true" size="9" y="10.55" x="33" text="_"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-40" x="-2" height="6"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-20" x="-2" height="10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" x4="0" antialias="true" y1="-7" x1="0" closed="false" x3="6" y3="5" y4="-7" x2="-6"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="20" y="-10" x="-10"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2" x4="20" antialias="false" y1="0" x1="10" closed="false" x3="17" y3="-1" y4="0" x2="14"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="31" antialias="false" length2="1.5" end1="none" length1="1.5" y1="32" x1="8" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" antialias="false" length2="1.5" end1="none" length1="1.5" y1="22" x1="8" x2="8"/>
+        <rect width="42" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-40" x="-12" height="80"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="29" x="10" height="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="29" antialias="false" length2="1.5" end1="none" length1="1.5" y1="31" x1="6" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="31" antialias="false" length2="1.5" end1="none" length1="1.5" y1="29" x1="6" x2="10"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="19" x="10" height="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19" antialias="true" length2="1.5" end1="none" length1="1.5" y1="21" x1="6" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="21" antialias="true" length2="1.5" end1="none" length1="1.5" y1="19" x1="6" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="20" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="25" x2="30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-33" x4="20" antialias="true" y1="-30" x1="20" closed="false" x3="25" y3="-27" y4="-30" x2="25"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-26" x4="23" x6="20" antialias="true" y6="-30" y5="-30" y1="-30" x1="20" closed="false" x3="22" y3="-26" y4="-26" x2="17" x5="20"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="29" x="4" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="19" x="4" height="2"/>
+        <text size="2" y="-22" x="-2" text="°c"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="12" y="-25" x="14"/>
+        <text size="2" y="-15" x="17" text="bar"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-22.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-18.25" x1="19.25" x2="22.25"/>
+        <rect width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20" x="3" height="1"/>
+        <polygon y3="-33.25" x7="20.25" y9="-38.25" closed="false" y8="-38.25" x8="20.25" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="21.25" x9="20.25" y4="-34.25" x1="20.25" x4="21.25" y6="-36.25" x5="18.25" y5="-35.25" y2="-32.25" x2="20.25" x3="18.25" y7="-37.25" y1="-30.25"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="36.75" x="-2" height="3"/>
+        <rect width="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="21.75" x="-2" height="11"/>
+        <rect width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="14.75" x="-4" height="22"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="9.75" x="-2" height="5"/>
+        <line end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-31.25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-25.25" x1="1.25" x2="-2.75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14" y="-34.2501" x="-7"/>
+        <terminal y="-40" x="0" orientation="n"/>
+        <terminal y="40" x="0" orientation="s"/>
+        <terminal y="-30" x="30" orientation="e"/>
+        <terminal y="-10" x="30" orientation="e"/>
+        <terminal y="20" x="10" orientation="e"/>
+        <terminal y="30" x="10" orientation="e"/>
+        <terminal y="0" x="20" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/pompe_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/pompe_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/pompe_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,22 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{9535AF17-CB1D-48E6-BFA1-116EC4F6A67E}"/><names>
-        <name lang="ar">مضخة</name>
-        <name lang="el">Αντλία</name>
-        <name lang="en">Pump</name>
+<definition width="40" hotspot_x="19" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="13">
+    <uuid uuid="{cfaa1659-de56-4627-9c1e-aec6562cb90f}"/>
+    <names>
+        <name lang="cs">Pumpa</name>
         <name lang="it">Pompa</name>
-        <name lang="fr">Pompe</name>
         <name lang="pl">Pompa</name>
-        <name lang="cs">Pumpa</name>
+        <name lang="en">Pump</name>
         <name lang="nl">Pomp</name>
+        <name lang="ar">مضخة</name>
+        <name lang="fr">Pompe</name>
+        <name lang="el">Αντλία</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-10" y="-17" size="7" text="P1"/>
-        <polygon x4="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="8" y2="-7" x2="-4" y3="7" x3="-4" y4="0"/>
-        <circle x="-10.2956" y="-10.2956" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20.5913"/>
-        <terminal x="-11" y="0" orientation="w"/>
-        <terminal x="11" y="0" orientation="e"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <input tagg="label" size="7" y="-17" x="-10" text="P1"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" x4="8" antialias="true" y1="0" x1="8" x3="-4" y3="7" y4="0" x2="-4"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="20.5913" y="-10.2956" x="-10.2956"/>
+        <terminal y="0" x="-11" orientation="w"/>
+        <terminal y="0" x="11" orientation="e"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/pompe/pompe_clapet_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/pompe/pompe_clapet_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/pompe/pompe_clapet_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,26 +1,27 @@
-<definition width="50" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{B04A17A4-328C-44EF-8E30-39EAF1617A5E}"/><names>
-        <name lang="ar">مضخّة بصمّام</name>
-        <name lang="el">Αντλία με βαλβίδα</name>
-        <name lang="en">Pump with Valve</name>
+<definition width="40" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="13">
+    <uuid uuid="{935a0fa6-0349-4569-ab8c-b06b3280455d}"/>
+    <names>
+        <name lang="cs">Pumpa se zvratným uzávěrem</name>
         <name lang="it">Pompa con valvola</name>
-        <name lang="fr">Pompe avec Clapet</name>
         <name lang="pl">Pompa z zaworem zwrotnym</name>
-        <name lang="cs">Pumpa se zvratným uzávěrem</name>
+        <name lang="en">Pump with Valve</name>
         <name lang="nl">Pomp met terugslagklep</name>
+        <name lang="ar">مضخّة بصمّام</name>
+        <name lang="fr">Pompe avec Clapet</name>
+        <name lang="el">Αντλία με βαλβίδα</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:thin;filling:none;color:black" y1="14" x1="0" y2="11" 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="0" x1="20" y2="0" x2="16"/>
-        <polygon x4="11" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="11" y2="-4" x2="16" y3="4" x3="16" y4="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="-7" x1="11" y2="7" x2="11"/>
-        <input x="-10" y="-17" size="7" text="P1"/>
-        <polygon x4="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="8" y2="-7" x2="-4" y3="7" x3="-4" y4="0"/>
-        <circle x="-10.2956" y="-10.2956" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20.5913"/>
-        <terminal x="-11" y="0" orientation="w"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="14" x1="0" x2="0"/>
+        <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="20" x2="16"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4" x4="11" antialias="true" y1="0" x1="11" x3="16" y3="4" y4="0" x2="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-7" x1="11" x2="11"/>
+        <input tagg="label" size="7" y="-17" x="-10" text="P1"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7" x4="8" antialias="true" y1="0" x1="8" x3="-4" y3="7" y4="0" x2="-4"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="20.5913" y="-10.2956" x="-10.2956"/>
+        <terminal y="0" x="-11" orientation="w"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="10" x="0" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/productions/cap_thersolaire.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/productions/cap_thersolaire.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/productions/cap_thersolaire.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,51 +1,53 @@
-<definition width="170" version="0.3" hotspot_x="60" hotspot_y="40" height="100" type="element" orientation="ndny">
-<uuid uuid="{1C7BDE0C-413F-4760-9245-498FA685CA90}"/><names>
-        <name lang="ar">ألواح تسخين مياه بالطاقة الشمسية</name>
-        <name lang="el">Ηλιακοί συλλέκτες</name>
-        <name lang="en">Solar water</name>
+<definition width="160" hotspot_x="59" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="34">
+    <uuid uuid="{3321bd6a-00dc-404d-ae16-2ba3426dd9b5}"/>
+    <names>
+        <name lang="cs">Sluneční panely</name>
         <name lang="it">Pannello solare-termico</name>
-        <name lang="fr">Panneau solaire eau</name>
         <name lang="pl">Panele solarne</name>
-        <name lang="cs">Sluneční panely</name>
+        <name lang="en">Solar water</name>
         <name lang="nl">Zonnewarmte</name>
+        <name lang="ar">ألواح تسخين مياه بالطاقة الشمسية</name>
+        <name lang="fr">Panneau solaire eau</name>
+        <name lang="el">Ηλιακοί συλλέκτες</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="50" x1="50" y2="50" x2="-50"/>
-        <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="-30" x1="-9" y2="-30" x2="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="-32" x1="94" y2="-28" x2="48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="44" y2="-28" x2="-2"/>
-        <polygon x4="44" y5="50" x5="0" y6="50" x6="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="0" y2="-26" x2="0" y3="-30" x3="44" y4="46"/>
-        <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="53" x1="48" y2="-28" x2="48"/>
-        <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="50" x1="0" y2="-31" x2="0"/>
-        <polygon x4="-6" y5="50" x5="-50" y6="50" x6="-50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-50" y2="-26" x2="-50" y3="-30" x3="-6" y4="46"/>
-        <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="52" x1="-52" y2="-29" x2="-52"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="-6" y2="-28" x2="-52"/>
-        <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="-24" x1="-13" y2="41" 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="-24" x1="-20.5" y2="41" x2="-20.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="-24" x1="-28" y2="41" x2="-28"/>
-        <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="-24" x1="-35.5" y2="41" x2="-35.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="-24" x1="-43" y2="41" x2="-43"/>
-        <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="-24" x1="40" y2="41" x2="40"/>
-        <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="-24" x1="32.5" y2="41" 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="-24" x1="25" y2="41" x2="25"/>
-        <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="-24" x1="17" y2="41" x2="17"/>
-        <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="-24" x1="10" y2="41" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="90" y2="41" x2="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="-24" x1="82.5" y2="41" x2="82.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="-24" x1="75" y2="41" x2="75"/>
-        <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="-24" x1="67.5" y2="41" x2="67.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="-24" x1="60" y2="41" x2="60"/>
-        <circle x="-51" y="49" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-1" y="49" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="49" y="49" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="-10" y="-31" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="39" y="-31" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <circle x="89" y="-31" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <text x="-18" y="11" size="8" text="Panneaux Solaire"/>
-        <polygon x4="94" y5="50" x5="50" y6="50" x6="50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="50" y2="-26" x2="50" y3="-30" x3="94" y4="46"/>
-        <terminal x="-50" y="50" orientation="s"/>
-        <terminal x="90" y="-30" orientation="e"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="50" antialias="false" length2="1.5" end1="none" length1="1.5" y1="50" x1="50" x2="-50"/>
+        <input tagg="label" rotate="true" size="9" y="60.55" x="3" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-30" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="-9" x2="90"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-28" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-32" x1="94" x2="48"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-28" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-32" x1="44" x2="-2"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-26" x4="44" x6="0" antialias="true" y6="50" y5="50" y1="50" x1="0" x3="44" y3="-30" y4="46" x2="0" x5="0"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-28" antialias="false" length2="1.5" end1="none" length1="1.5" y1="53" x1="48" x2="48"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-31" antialias="false" length2="1.5" end1="none" length1="1.5" y1="50" x1="0" x2="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-26" x4="-6" x6="-50" antialias="true" y6="50" y5="50" y1="50" x1="-50" x3="-6" y3="-30" y4="46" x2="-50" x5="-50"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29" antialias="false" length2="1.5" end1="none" length1="1.5" y1="52" x1="-52" x2="-52"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-28" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-32" x1="-6" x2="-52"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-13" x2="-13"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-20.5" x2="-20.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-28" x2="-28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-35.5" x2="-35.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-43" x2="-43"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="40" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="32.5" x2="32.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="25" x2="25"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="17" x2="17"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="90" x2="90"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="82.5" x2="82.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="75" x2="75"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="67.5" x2="67.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="60" x2="60"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="49" x="-51"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="49" x="-1"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="49" x="49"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-31" x="-10"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-31" x="39"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2" y="-31" x="89"/>
+        <text size="8" y="11" x="-18" text="Panneaux Solaire"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-26" x4="94" x6="50" antialias="true" y6="50" y5="50" y1="50" x1="50" x3="94" y3="-30" y4="46" x2="50" x5="50"/>
+        <terminal y="-30" x="90" orientation="e"/>
+        <terminal y="50" x="-50" orientation="s"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/productions/capteur_tubes_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/productions/capteur_tubes_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/productions/capteur_tubes_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,122 +1,124 @@
-<definition width="160" version="0.3" hotspot_x="45" hotspot_y="25" height="100" type="element" orientation="dyyy">
-<uuid uuid="{A65C87EB-2E79-4BCA-A1F4-DA863D6DB3EE}"/><names>
-        <name lang="ar">مُجمّعات بأنابيب</name>
-        <name lang="el">Σωλήνες συλλέκτη</name>
-        <name lang="en">Tube collectors</name>
+<definition width="130" hotspot_x="24" type="element" link_type="simple" orientation="dyyy" version="0.5" height="100" hotspot_y="25">
+    <uuid uuid="{7f0eafb1-d3c3-4248-ae10-f6d3fd6e2e2f}"/>
+    <names>
+        <name lang="cs">Kolektory</name>
         <name lang="it">Pannello a tubi</name>
-        <name lang="fr">capteurs à tube</name>
         <name lang="pl">Kolektory</name>
-        <name lang="cs">Kolektory</name>
+        <name lang="en">Tube collectors</name>
         <name lang="nl">Buis collectors</name>
+        <name lang="ar">مُجمّعات بأنابيب</name>
+        <name lang="fr">capteurs à tube</name>
+        <name lang="el">Σωλήνες συλλέκτη</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="98" y2="-13" x2="100" y3="-22" x3="100" y4="-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="-13" x1="88" y2="-13" x2="91"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="77" y2="-13" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="65" y2="-13" x2="69"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="55" y2="-13" x2="58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="44" y2="-13" x2="47"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="33" y2="-13" x2="36"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="21" y2="-13" x2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="11" y2="-13" x2="14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-1" y2="-13" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-11" y2="-13" x2="-8"/>
-        <polygon x4="-20" y5="-13" x5="-18" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-22" x1="32" y2="-22" x2="-20" y3="-18" x3="-20" y4="-13"/>
-        <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="-17" y2="-20" x2="97"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-16" y2="-17" x2="97"/>
-        <rect width="114" x="-17" y="-18" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="116" x="-18" y="-19" antialias="false" height="4" 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="-13" x1="-14" y2="54" x2="-14"/>
-        <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="47" x1="-16" y2="65" x2="-16"/>
-        <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="17" x1="-16" y2="43" x2="-16"/>
-        <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="-17" x1="-16" y2="14" x2="-16"/>
-        <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="-19" x1="-15" y2="65" x2="-15"/>
-        <arc width="6" x="-18" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <polygon x4="-12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="-18" y2="-21" x2="-18" y3="-21" x3="-12" y4="67"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-19" x2="-19" x3="-20" x4="-20" antialias="false" x5="-10" x6="-10" x7="-11" x8="-11" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <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="-13" x1="-3" y2="54" 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="-13" x1="8" y2="54" x2="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="-13" x1="19" y2="54" x2="19"/>
-        <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="-13" x1="30" y2="54" x2="30"/>
-        <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="-13" x1="41" y2="54" x2="41"/>
-        <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="-13" x1="52" y2="54" x2="52"/>
-        <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="-13" x1="63" y2="54" x2="63"/>
-        <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="-13" x1="74" y2="54" x2="74"/>
-        <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="-13" x1="85" y2="54" x2="85"/>
-        <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="-13" x1="96" y2="54" x2="96"/>
-        <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="47" x1="-5" y2="65" 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="47" x1="6" y2="65" x2="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="47" x1="17" y2="65" x2="17"/>
-        <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="47" x1="28" y2="65" x2="28"/>
-        <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="47" x1="39" y2="65" x2="39"/>
-        <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="47" x1="50" y2="65" x2="50"/>
-        <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="47" x1="61" y2="65" x2="61"/>
-        <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="47" x1="72" y2="65" x2="72"/>
-        <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="47" x1="83" y2="65" x2="83"/>
-        <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="47" x1="94" y2="65" x2="94"/>
-        <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="17" x1="-5" y2="43" 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="17" x1="6" y2="43" x2="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="17" x1="17" y2="43" x2="17"/>
-        <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="17" x1="28" y2="43" x2="28"/>
-        <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="17" x1="39" y2="43" x2="39"/>
-        <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="17" x1="50" y2="43" x2="50"/>
-        <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="17" x1="61" y2="43" x2="61"/>
-        <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="17" x1="72" y2="43" x2="72"/>
-        <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="17" x1="83" y2="43" x2="83"/>
-        <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="17" x1="94" y2="43" x2="94"/>
-        <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="-17" x1="-5" y2="14" 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="-17" x1="6" y2="14" x2="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="-17" x1="17" y2="14" x2="17"/>
-        <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="-17" x1="28" y2="14" x2="28"/>
-        <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="-17" x1="39" y2="14" x2="39"/>
-        <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="-17" x1="50" y2="14" x2="50"/>
-        <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="-17" x1="61" y2="14" x2="61"/>
-        <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="-17" x1="72" y2="14" x2="72"/>
-        <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="-17" x1="83" y2="14" x2="83"/>
-        <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="-17" x1="94" y2="14" x2="94"/>
-        <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="-19" x1="-4" y2="65" x2="-4"/>
-        <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="-19" x1="7" y2="65" x2="7"/>
-        <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="-19" x1="18" y2="65" x2="18"/>
-        <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="-19" x1="29" y2="65" x2="29"/>
-        <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="-19" x1="40" y2="65" x2="40"/>
-        <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="-19" x1="51" y2="65" x2="51"/>
-        <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="-19" x1="62" y2="65" x2="62"/>
-        <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="-19" x1="73" y2="65" x2="73"/>
-        <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="-19" x1="84" y2="65" x2="84"/>
-        <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="-19" x1="95" y2="65" x2="95"/>
-        <arc width="6" x="-7" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="4" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="15" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="26" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="37" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="48" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="59" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="70" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="81" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="6" x="92" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <polygon x4="-1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="-7" y2="-21" x2="-7" y3="-21" x3="-1" y4="67"/>
-        <polygon x4="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="4" y2="-21" x2="4" y3="-21" x3="10" y4="67"/>
-        <polygon x4="21" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="15" y2="-21" x2="15" y3="-21" x3="21" y4="67"/>
-        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="26" y2="-21" x2="26" y3="-21" x3="32" y4="67"/>
-        <polygon x4="43" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="37" y2="-21" x2="37" y3="-21" x3="43" y4="67"/>
-        <polygon x4="54" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="48" y2="-21" x2="48" y3="-21" x3="54" y4="67"/>
-        <polygon x4="65" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="59" y2="-21" x2="59" y3="-21" x3="65" y4="67"/>
-        <polygon x4="76" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="70" y2="-21" x2="70" y3="-21" x3="76" y4="67"/>
-        <polygon x4="87" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="81" y2="-21" x2="81" y3="-21" x3="87" y4="67"/>
-        <polygon x4="98" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="92" y2="-21" x2="92" y3="-21" x3="98" y4="67"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-8" x2="-8" x3="-9" x4="-9" antialias="false" x5="1" x6="1" x7="0" x8="0" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="3" x3="2" x4="2" antialias="false" x5="12" x6="12" x7="11" x8="11" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="14" x3="13" x4="13" antialias="false" x5="23" x6="23" x7="22" x8="22" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="25" x2="25" x3="24" x4="24" antialias="false" x5="34" x6="34" x7="33" x8="33" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="36" x2="36" x3="35" x4="35" antialias="false" x5="45" x6="45" x7="44" x8="44" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="47" x2="47" x3="46" x4="46" antialias="false" x5="56" x6="56" x7="55" x8="55" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="58" x2="58" x3="57" x4="57" antialias="false" x5="67" x6="67" x7="66" x8="66" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="69" x2="69" x3="68" x4="68" antialias="false" x5="78" x6="78" x7="77" x8="77" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="80" x2="80" x3="79" x4="79" antialias="false" x5="89" x6="89" x7="88" x8="88" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="91" x2="91" x3="90" x4="90" antialias="false" x5="100" x6="100" x7="99" x8="99" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
-        <terminal x="-20" y="-20" orientation="w"/>
-        <terminal x="100" y="-20" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="80.55" x="23" text="_"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" x4="32" antialias="false" y1="-13" x1="98" closed="false" x3="100" y3="-22" y4="-22" x2="100"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="88" x2="91"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="77" x2="80"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="65" x2="69"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="55" x2="58"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="44" x2="47"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="33" x2="36"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="21" x2="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="11" x2="14"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="-1" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-13" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="-11" x2="-8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-22" x4="-20" antialias="false" y5="-13" y1="-22" x1="32" closed="false" x3="-20" y3="-18" y4="-13" x2="-20" x5="-18"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-20" x1="-17" x2="97"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-17" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-16" x2="97"/>
+        <rect width="114" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-18" x="-17" height="2"/>
+        <rect width="116" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-19" x="-18" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="-14" x2="-14"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="-16" x2="-16"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="-16" x2="-16"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-16" x2="-16"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="-15" x2="-15"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="-18" height="7"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="-12" antialias="false" y1="67" x1="-18" closed="false" x3="-12" y3="-21" y4="67" x2="-18"/>
+        <polygon y3="69" x7="-11" closed="false" y8="65" x8="-11" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-10" y4="72" x1="-19" x4="-20" y6="69" x5="-10" y5="72" y2="67" x2="-19" x3="-20" y7="67" y1="65"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="-3" x2="-3"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="8" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="19" x2="19"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="41" x2="41"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="52" x2="52"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="63" x2="63"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="74" x2="74"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="85" x2="85"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="54" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-13" x1="96" x2="96"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="-5" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="6" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="17" x2="17"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="28" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="39" x2="39"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="50" x2="50"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="61" x2="61"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="72" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="83" x2="83"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="47" x1="94" x2="94"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="-5" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="6" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="17" x2="17"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="28" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="39" x2="39"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="50" x2="50"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="61" x2="61"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="72" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="83" x2="83"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="43" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17" x1="94" x2="94"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="-5" x2="-5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="6" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="17" x2="17"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="28" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="39" x2="39"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="50" x2="50"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="61" x2="61"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="72" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="83" x2="83"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-17" x1="94" x2="94"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="-4" x2="-4"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="7" x2="7"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="18" x2="18"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="29" x2="29"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="40" x2="40"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="51" x2="51"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="62" x2="62"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="73" x2="73"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="84" x2="84"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-19" x1="95" x2="95"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="-7" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="4" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="15" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="26" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="37" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="48" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="59" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="70" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="81" height="7"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="63" x="92" height="7"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="-1" antialias="false" y1="67" x1="-7" closed="false" x3="-1" y3="-21" y4="67" x2="-7"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="10" antialias="false" y1="67" x1="4" closed="false" x3="10" y3="-21" y4="67" x2="4"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="21" antialias="false" y1="67" x1="15" closed="false" x3="21" y3="-21" y4="67" x2="15"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="32" antialias="false" y1="67" x1="26" closed="false" x3="32" y3="-21" y4="67" x2="26"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="43" antialias="false" y1="67" x1="37" closed="false" x3="43" y3="-21" y4="67" x2="37"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="54" antialias="false" y1="67" x1="48" closed="false" x3="54" y3="-21" y4="67" x2="48"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="65" antialias="false" y1="67" x1="59" closed="false" x3="65" y3="-21" y4="67" x2="59"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="76" antialias="false" y1="67" x1="70" closed="false" x3="76" y3="-21" y4="67" x2="70"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="87" antialias="false" y1="67" x1="81" closed="false" x3="87" y3="-21" y4="67" x2="81"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" x4="98" antialias="false" y1="67" x1="92" closed="false" x3="98" y3="-21" y4="67" x2="92"/>
+        <polygon y3="69" x7="0" closed="false" y8="65" x8="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="1" y4="72" x1="-8" x4="-9" y6="69" x5="1" y5="72" y2="67" x2="-8" x3="-9" y7="67" y1="65"/>
+        <polygon y3="69" x7="11" closed="false" y8="65" x8="11" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="12" y4="72" x1="3" x4="2" y6="69" x5="12" y5="72" y2="67" x2="3" x3="2" y7="67" y1="65"/>
+        <polygon y3="69" x7="22" closed="false" y8="65" x8="22" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="23" y4="72" x1="14" x4="13" y6="69" x5="23" y5="72" y2="67" x2="14" x3="13" y7="67" y1="65"/>
+        <polygon y3="69" x7="33" closed="false" y8="65" x8="33" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="34" y4="72" x1="25" x4="24" y6="69" x5="34" y5="72" y2="67" x2="25" x3="24" y7="67" y1="65"/>
+        <polygon y3="69" x7="44" closed="false" y8="65" x8="44" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="45" y4="72" x1="36" x4="35" y6="69" x5="45" y5="72" y2="67" x2="36" x3="35" y7="67" y1="65"/>
+        <polygon y3="69" x7="55" closed="false" y8="65" x8="55" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="56" y4="72" x1="47" x4="46" y6="69" x5="56" y5="72" y2="67" x2="47" x3="46" y7="67" y1="65"/>
+        <polygon y3="69" x7="66" closed="false" y8="65" x8="66" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="67" y4="72" x1="58" x4="57" y6="69" x5="67" y5="72" y2="67" x2="58" x3="57" y7="67" y1="65"/>
+        <polygon y3="69" x7="77" closed="false" y8="65" x8="77" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="78" y4="72" x1="69" x4="68" y6="69" x5="78" y5="72" y2="67" x2="69" x3="68" y7="67" y1="65"/>
+        <polygon y3="69" x7="88" closed="false" y8="65" x8="88" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="89" y4="72" x1="80" x4="79" y6="69" x5="89" y5="72" y2="67" x2="80" x3="79" y7="67" y1="65"/>
+        <polygon y3="69" x7="99" closed="false" y8="65" x8="99" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="100" y4="72" x1="91" x4="90" y6="69" x5="100" y5="72" y2="67" x2="91" x3="90" y7="67" y1="65"/>
+        <terminal y="-20" x="-20" orientation="w"/>
+        <terminal y="-20" x="100" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/productions/chaudiere_bois_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,47 +1,49 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="70" height="140" type="element" orientation="dyyy">
-<uuid uuid="{629209BB-42AB-40B8-8D48-A3C983839B46}"/><names>
-        <name lang="ar">مرجل خشب</name>
-        <name lang="el">Καυστήρας ξύλου</name>
-        <name lang="en">Wood boiler</name>
+<definition width="90" hotspot_x="44" type="element" link_type="simple" orientation="dyyy" version="0.5" height="140" hotspot_y="73">
+    <uuid uuid="{3fcb1aa6-c7ab-402d-be10-c524e3848372}"/>
+    <names>
+        <name lang="cs">Kotel na dřevo</name>
         <name lang="it">Caldaia a legna</name>
-        <name lang="fr">Chaudière Bois</name>
         <name lang="pl">Kocioł</name>
-        <name lang="cs">Kotel na dřevo</name>
+        <name lang="en">Wood boiler</name>
         <name lang="nl">boiler hout</name>
+        <name lang="ar">مرجل خشب</name>
+        <name lang="fr">Chaudière Bois</name>
+        <name lang="el">Καυστήρας ξύλου</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="70" x="-35" y="-60" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="35" y2="50" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="35" y2="-40" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-40" y2="50" x2="-36"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-35" y2="-40" x2="-40"/>
-        <circle x="-3.60555" y="-29.6056" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.2111"/>
-        <circle x="-7.28011" y="-33.2801" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14.5602"/>
-        <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="-55" x1="-18" y2="-55" x2="-19"/>
-        <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="-55" x1="-22" y2="-55" x2="-21"/>
-        <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="-57" x1="-20" y2="-56" x2="-20"/>
-        <circle x="-23.6056" y="-58.6056" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.2111"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="37" y2="47" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-66" x1="13" y2="-61" x2="39"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="24" x2="24" x3="25" x4="25" antialias="false" x5="24" x6="24" x7="25" x8="25" x9="20" closed="false" y1="-60" y2="-62" y10="-65" y3="-62" y11="-64" y4="-63" y12="-63" y5="-63" x10="20" y13="-63" y6="-64" x11="21" y14="-62" y7="-65" x12="21" y15="-62" y8="-67" x13="20" y16="-61" y9="-67" x14="20" y17="-61" x15="21" x16="21" x17="21"/>
-        <ellipse width="2" x="-26" y="-32" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="14.5858" y="46.5858" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.82843"/>
-        <ellipse width="9" x="-4.5" y="43.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="15" y5="25" x5="-14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25" x1="-15" y2="50" x2="-18" y3="50" x3="18" y4="25"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-27" x2="-27" x3="25" x4="25" antialias="true" x5="27" x6="27" x7="25" x8="25" x9="-26" y1="19" y2="56" y3="56" y4="54" y5="54" y6="21" y7="21" y8="19" y9="19"/>
-        <rect width="58" x="-29" y="17" antialias="false" height="41" 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="-2" x1="-31" y2="-2" x2="30"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-29" x2="-29" x3="27" x4="27" antialias="false" x5="29" x6="29" x7="27" x8="27" x9="-28" closed="false" y1="-48" y2="-4" y3="-4" y4="-6" y5="-6" y6="-46" y7="-46" y8="-48" y9="-48"/>
-        <rect width="70" x="-35" y="-60" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-35" y="-50" antialias="false" height="110" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2" x="-25" y="29" antialias="true" height="15" 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" x1="-31" y2="15" x2="30"/>
-        <rect width="4" x="31" y="-50" antialias="false" height="110" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-40" y="-40" orientation="w"/>
-        <terminal x="-40" y="50" orientation="w"/>
-        <terminal x="40" y="-40" orientation="e"/>
-        <terminal x="40" y="50" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="0.55" x="43" text="_"/>
+        <rect width="70" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-60" x="-35" height="120"/>
+        <line end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="50" antialias="false" length2="1.5" end1="none" length1="1.5" y1="50" x1="35" x2="40"/>
+        <line end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-40" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="35" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="50" antialias="false" length2="1.5" end1="circle" length1="1.5" y1="50" x1="-40" x2="-36"/>
+        <line end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-40" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-40" x1="-35" x2="-40"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.2111" y="-29.6056" x="-3.60555"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14.5602" y="-33.2801" x="-7.28011"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-55" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-55" x1="-18" x2="-19"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-55" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-55" x1="-22" x2="-21"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-56" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-57" x1="-20" x2="-20"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="7.2111" y="-58.6056" x="-23.6056"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="47" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-60" x1="37" x2="16"/>
+        <line end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-61" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-66" x1="13" x2="39"/>
+        <polygon y16="-61" y3="-62" x7="25" y9="-67" closed="false" y8="-67" x8="25" x13="20" x12="21" antialias="false" x17="21" style="line-style:normal;line-weight:normal;filling:none;color:black" x15="21" y14="-62" y12="-63" x6="24" x9="20" y4="-63" y13="-63" x14="20" x1="24" x4="25" y6="-64" y10="-65" y15="-62" x5="24" y5="-63" y2="-62" x2="24" x3="25" x11="21" y11="-64" y7="-65" y17="-61" y1="-60" x16="21" x10="20"/>
+        <ellipse width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-32" x="-26" height="15"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="2.82843" y="46.5858" x="14.5858"/>
+        <ellipse width="9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="43.5" x="-4.5" height="3"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="50" x4="15" antialias="false" y5="25" y1="25" x1="-15" closed="false" x3="18" y3="50" y4="25" x2="-18" x5="-14"/>
+        <polygon y3="56" x7="25" y9="19" y8="19" x8="25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="27" x9="-26" y4="54" x1="-27" x4="25" y6="21" x5="27" y5="54" y2="56" x2="-27" x3="25" y7="21" y1="19"/>
+        <rect width="58" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="17" x="-29" height="41"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2" x1="-31" x2="30"/>
+        <polygon y3="-4" x7="27" y9="-48" closed="false" y8="-48" x8="27" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="29" x9="-28" y4="-6" x1="-29" x4="27" y6="-46" x5="29" y5="-6" y2="-4" x2="-29" x3="27" y7="-46" y1="-48"/>
+        <rect width="70" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-60" x="-35" height="10"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-50" x="-35" height="110"/>
+        <ellipse width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="29" x="-25" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="15" x1="-31" x2="30"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-50" x="31" height="110"/>
+        <terminal y="-40" x="-40" orientation="w"/>
+        <terminal y="50" x="-40" orientation="w"/>
+        <terminal y="-40" x="40" orientation="e"/>
+        <terminal y="50" x="40" orientation="e"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/productions/poele_01.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/productions/poele_01.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/productions/poele_01.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,47 +1,49 @@
-<definition width="110" version="0.3" hotspot_x="65" hotspot_y="85" height="140" type="element" orientation="dyyy">
-<uuid uuid="{60AAFA44-88E3-4BE6-87F7-5982CE062C6B}"/><names>
-        <name lang="ar">موقد</name>
-        <name lang="en">JMO stove</name>
-        <name lang="fr">Poele Jmo</name>
+<definition width="90" hotspot_x="54" type="element" link_type="simple" orientation="dyyy" version="0.5" height="130" hotspot_y="75">
+    <uuid uuid="{ae98430d-d63a-4a8f-a0d6-528ba1be7388}"/>
+    <names>
+        <name lang="cs">Kamna</name>
         <name lang="pl">Piec</name>
-        <name lang="cs">Kamna</name>
         <name lang="it">Stufa</name>
+        <name lang="en">JMO stove</name>
         <name lang="nl">Allesbrander JMO</name>
+        <name lang="ar">موقد</name>
+        <name lang="fr">Poele Jmo</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="4" x="24" y="-51" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="-48" y="-51" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-52" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="11" x1="-8" y2="9" x2="-8" y3="8" x3="-9" y4="7"/>
-        <polygon x4="-11" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="11" x1="-12" y2="9" x2="-12" y3="8" x3="-11" y4="7"/>
-        <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="11" x1="-11" y2="9" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9" x1="-11" y2="11" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-11" y2="10" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9" x1="-10" y2="11" x2="-10"/>
-        <rect width="6" x="-12" y="-32" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="10" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="32" x="-26" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="50" x="-34" y="-40" antialias="true" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="50" x="-34" y="-58" antialias="false" height="14" 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="-60" x1="-42" y2="41" x2="-42"/>
-        <rect width="70" x="-44" y="-64" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="80" x="-50" y="-70" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="24" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="-48" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="28" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="28" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-52" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <rect width="50" x="-34" y="24" antialias="false" height="14" 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="-61" x1="-38" y2="40" x2="-38"/>
-        <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="-60" x1="20" y2="41" 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="-60" x1="24" y2="41" x2="24"/>
-        <rect width="70" x="-44" y="41" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="80" x="-50" y="44" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-50" y="-50" orientation="w"/>
-        <terminal x="-50" y="30" orientation="w"/>
-        <terminal x="30" y="-50" orientation="e"/>
-        <terminal x="30" y="30" orientation="e"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-51" x="24" height="2"/>
+        <input tagg="label" rotate="true" size="9" y="-19.45" x="33" text="_"/>
+        <rect width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-51" x="-48" height="2"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-52" x="-52"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="9" x4="-9" antialias="true" y1="11" x1="-8" closed="false" x3="-9" y3="8" y4="7" x2="-8"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" y2="9" x4="-11" antialias="true" y1="11" x1="-12" closed="false" x3="-11" y3="8" y4="7" x2="-12"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="9" antialias="false" length2="1.5" end1="none" length1="1.5" y1="11" x1="-11" x2="-9"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="9" x1="-11" x2="-9"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="-11" x2="-9"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="11" antialias="false" length2="1.5" end1="none" length1="1.5" y1="9" x1="-10" x2="-10"/>
+        <rect width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-32" x="-12" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20" x="10" height="20"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20" x="-26" height="20"/>
+        <rect width="50" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-40" x="-34" height="60"/>
+        <rect width="50" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-58" x="-34" height="14"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-60" x1="-42" x2="-42"/>
+        <rect width="70" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-64" x="-44" height="3"/>
+        <rect width="80" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-70" x="-50" height="6"/>
+        <rect width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="29" x="24" height="2"/>
+        <rect width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="29" x="-48" height="2"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="-52" x="28"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="28" x="28"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4" y="28" x="-52"/>
+        <rect width="50" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="24" x="-34" height="14"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-61" x1="-38" x2="-38"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-60" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="41" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-60" x1="24" x2="24"/>
+        <rect width="70" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="41" x="-44" height="3"/>
+        <rect width="80" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="44" x="-50" height="6"/>
+        <terminal y="30" x="-50" orientation="w"/>
+        <terminal y="-50" x="30" orientation="e"/>
+        <terminal y="30" x="30" orientation="e"/>
+        <terminal y="-50" x="-50" orientation="w"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,19 +1,21 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{239EC3FC-635A-498B-8778-0595499150D5}"/><names>
-        <name lang="ar">كوع ب 90 درجة</name>
-        <name lang="el">Γωνία 90°</name>
-        <name lang="en">Elbow at 90</name>
+<definition width="20" hotspot_x="15" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="15">
+    <uuid uuid="{6c9af6fe-cc41-4f86-8b7f-09e6a2254ade}"/>
+    <names>
+        <name lang="cs">Koleno 90</name>
         <name lang="it">Gomito 90°</name>
-        <name lang="fr">Coude à 90</name>
         <name lang="pl">Kolanko 90</name>
-        <name lang="cs">Koleno 90</name>
+        <name lang="en">Elbow at 90</name>
         <name lang="nl">Hoek 90</name>
+        <name lang="ar">كوع ب 90 درجة</name>
+        <name lang="fr">Coude à 90</name>
+        <name lang="el">Γωνία 90°</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="12" x="-12" y="-12" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <terminal x="-6" y="0" orientation="w"/>
-        <terminal x="0" y="-6" orientation="n"/>
+        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-12" x="-12" height="12"/>
+        <input tagg="label" rotate="true" size="9" y="-8.5" x="-1" text="_"/>
+        <terminal y="0" x="-6" orientation="w"/>
+        <terminal y="-6" x="0" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90_grandrayon.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90_grandrayon.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/coude_90_grandrayon.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,19 +1,21 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{73BA7781-00A7-47BC-8072-3CBB425FEA37}"/><names>
-        <name lang="ar">كوع ب 90 درجة شعاع كبير</name>
-        <name lang="el">Γωνία 90° μεγάλης ακτίνας</name>
-        <name lang="en">Large radius elbow 90</name>
+<definition width="30" hotspot_x="12" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="12">
+    <uuid uuid="{b6999848-8653-4421-8891-38eaf1f8d69a}"/>
+    <names>
+        <name lang="cs">Velké koleno 90</name>
         <name lang="it">Gomito 90° largo raggio</name>
-        <name lang="fr">Coude à 90 grand rayon</name>
         <name lang="pl">Kolanko duże 90</name>
-        <name lang="cs">Velké koleno 90</name>
+        <name lang="en">Large radius elbow 90</name>
         <name lang="nl">Hoek lang 90</name>
+        <name lang="ar">كوع ب 90 درجة شعاع كبير</name>
+        <name lang="fr">Coude à 90 grand rayon</name>
+        <name lang="el">Γωνία 90° μεγάλης ακτίνας</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="16" x="-6" y="-6" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <terminal x="3" y="10" orientation="w"/>
-        <terminal x="10" y="2" orientation="n"/>
+        <arc width="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-6" x="-6" height="16"/>
+        <input tagg="label" rotate="true" size="9" y="3.55" x="13" text="_"/>
+        <terminal y="10" x="3" orientation="w"/>
+        <terminal y="2" x="10" orientation="n"/>
     </description>
 </definition>

Modified: trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/cumulus2.elmt
===================================================================
--- trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/cumulus2.elmt	2015-08-29 20:44:58 UTC (rev 4178)
+++ trunk/elements/60_energy/31_solar_thermal/raccords_cuivre/cumulus2.elmt	2015-08-29 21:09:52 UTC (rev 4179)
@@ -1,23 +1,25 @@
-<definition width="40" version="0.3" hotspot_x="25" hotspot_y="35" height="70" type="element" orientation="dyyy">
-<uuid uuid="{FBCD486A-7B03-4260-BE2D-7D1C3A21B932}"/><names>
-        <name lang="ar">مُراكم كهربائي</name>
-        <name lang="en">Electric cumulus</name>
-        <name lang="fr">Cumulus electrique</name>
+<definition width="30" hotspot_x="20" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="38">
+    <uuid uuid="{37276b5a-e186-45f8-a327-c691617f1f81}"/>
+    <names>
+        <name lang="cs">Elektrický ohřívač</name>
         <name lang="pl">Ogrzewacz elektryczny</name>
-        <name lang="cs">Elektrický ohřívač</name>
         <name lang="it">Riscaldamento elettrico</name>
+        <name lang="en">Electric cumulus</name>
         <name lang="nl">Cumulus elektrisch</name>
+        <name lang="ar">مُراكم كهربائي</name>
+        <name lang="fr">Cumulus electrique</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="20" x="-15" y="-25" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.5" x1="-9.25" y2="-9.25" x2="-1"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-9.5" y2="-3" x2="-0.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.5" x1="-10" y2="-2.5" x2="-0.25"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.75" x1="-9.75" y2="4.5" x2="-1.25"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.5" x1="-10.5" y2="4.5" x2="-1"/>
-        <terminal x="-10" y="-30" orientation="n"/>
-        <terminal x="0" y="-30" orientation="n"/>
+        <input tagg="label" rotate="true" size="9" y="25.55" x="-12" text="_"/>
+        <rect width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-25" x="-15" height="50"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9.25" antialias="true" length2="1.5" end1="none" length1="1.5" y1="-6.5" x1="-9.25" x2="-1"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black&quo