Reverting deletion of branch 0.2, 0.3

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.2b@5946 bfdf4180-ca20-0410-9c96-a3a8aa849046
Tag de la version 0.2 beta
2025-12-17 20:50:34 +01:00 · 2019-06-26 08:02:48 +00:00 · 2009-05-23 01:54:11 +00:00
217 changed files with 9675 additions and 12156 deletions
--- a/2
+++ b/2
@@ -31,7 +31,7 @@ Merci à qtcentre.org pour leur classe SingleApplication.
 Спасибо Everaldo Coelho за тему значков Crystal SVG ( http://www.everaldo.com/crystal/ ) лицензированную на условиях LGPL.
 Спасибо Nuno Pinheiro за тему значков Oxygen ( http://www.oxygen-icons.org/ ) лицензированную на условиях LGPL, а также за значки связанные с QElectroTech.
 Спасибо проекту KDE ( http://www.kde.org/ ).
-Спасибо Loic за объяснения связанные с математикой.
+Спасибо Loic за обяснения связанные с математикой.
 Спасибо Nicolas за эксперименты с Mac OS X.
 Спасибо Remi Collet за пакет для Fedora.
 Спасибо Laurent Trinques за пакет для Debian.
--- a/6
+++ b/6
@@ -42,10 +42,8 @@ Le dialogue "Exporter" (pour générer un fichier image d'un schéma) a égaleme
  * L'accrochage à la grille (aka "snap to grid", également connu sous le nom de grille magnétique ou encore grille aimantée) a été ajouté. Le dessin s'y accroche désormais avec une précision de 1px. On peut travailler en coordonnées libres en maintenant la touche Ctrl enfoncée durant le dessin.
  * Le copier-coller a été implémenté : il est possible de coller :
     * avec le bouton du milieu de la souris
-     * en choisissant une "zone de collage" sur l'élément (Ctrl+Shift+V)
+     * en choisissant une "zone de collage" sur l'élément (Ctrl+Shift+V) : cf screenshot à gauche
-     * directement (Ctrl+V) : les parties collées sont placées à côté des parties copiées ; si on recolle les parties, elles sont collées encore un cran à côté, et ce de manière incrémentale.
+     * directement (Ctrl+V) : les parties collées sont placées à côté des parties copiées ; si on recolle les parties, elles sont collées encore un cran à côté, et ce de manière incrémentale. Ainsi le screenshot à droite montre ce que l'on obtient en collant une sélection 8 fois d'affilée.
  * Des contrôles sont désormais effectués à l'enregistrement : présence de bornes, respect du cadre, etc.
  * Uniformisation des menus par rapport à l'éditeur de schémas
 ====== Changelog 0.1 -> 0.11 ======
--- a/ELEMENTS.LICENSE
+++ b/ELEMENTS.LICENSE
@@ -8,8 +8,8 @@ schémas.
 Si vous redistribuez tout ou partie de la collection QElectroTech, avec ou sans
 modification, en dehors d'un schéma électrique, vous devrez respecter les
 conditions de la licence CC-BY :
-Cette création est mise à disposition selon le Contrat Paternité 3.0
+Cette création est mise à disposition selon le Contrat Paternité 2.0 France
-disponible en ligne http://creativecommons.org/licenses/by/3.0/ ou par
+disponible en ligne http://creativecommons.org/licenses/by/2.0/fr/ ou par
 courrier postal à Creative Commons, 171 Second Street, Suite 300, San Francisco,
 California 94105, USA.
@@ -22,9 +22,9 @@ diagrams is.
 If you redistribute all or a part of the QElectroTech collection, with or
 without any modification, out of an electric diagram, you must respect the
 conditions of the CC-BY license:
-This work is licensed under the Creative Commons Attribution 3.0 License.
+This work is licensed under the Creative Commons Attribution 2.0 France License.
 To view a copy of this license, visit
-http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
+http://creativecommons.org/licenses/by/2.0/fr/ or send a letter to Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
 [es]
@@ -35,9 +35,9 @@ editar, e incluir estos elementos en esquemas eléctricos.
 Si usted redistribuye una parte de la colección o toda la collección de
 QElectrotech, con o sin ediciones, fuera de un esquema eléctrico, tiene que
 respetar las condiciones de la licencia CC-BY:
-Esta obra está bajo una licencia Reconocimiento 3.0 de Creative Commons.
+Esta obra está bajo una licencia Reconocimiento 2.0 Francia de Creative Commons.
 Para ver una copia de esta licencia, visite
-http://creativecommons.org/licenses/by/3.0/ o envie una carta a Creative
+http://creativecommons.org/licenses/by/2.0/fr/ o envie una carta a Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
 [ru]
@@ -48,9 +48,9 @@ Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
 схему.
 Если Вы распространяете всю или часть коллекции QElectroTech, с или без изменений,
 отдельно от электрической схемы, Вы должны соблюдать условия лицензии CC-BY:
-Эта работа лицензирована на условиях Creative Commons Attribution 3.0 License.
+Эта работа лицензирована на условиях Creative Commons Attribution 2.0 France License.
 Чтобы увидеть копию этой лицензии, посетите
-http://creativecommons.org/licenses/by/3.0/ или отправте письмо в Creative
+http://creativecommons.org/licenses/by/2.0/fr/ или отправте письмо в Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
 (данный перевод, на русский язык, является вольным и выполнен не юристом!)
@@ -58,7 +58,7 @@ Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
 A colecção de elementos fornecida com o programa QElectroTech é fornecida como é e sem nenhuma garantia da aptidão para o seu uso e sem garantia de que funciona.
 É permitido, sem condição alguma, qualquer que seja a licença final, usar, editar e incluir estes elementos em esquemas eléctricos.
 Se você redistribuir uma parte ou toda a colecção de elementos do programa QElectroTech, tendo editado ou não os elementos, sem ser num esquema eléctrico, tem de respeitar as condições da licença CC-BY:
-Este trabalho está licenciado de acordo com os termos da licença Creative Commons Attribution 3.0 License.
+Este trabalho está licenciado de acordo com os termos da licença Creative Commons Attribution 2.0 France License.
-Para ver uma cópia da licença visite http://creativecommons.org/licenses/by/3.0/ ou envie uma carta para o endereço Creative
+Para ver uma cópia da licença visite http://creativecommons.org/licenses/by/2.0/fr/ ou envie uma carta para o endereço Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
--- a/elements/automatisme/fonction/entree.elmt
+++ b/elements/automatisme/fonction/entree.elmt
@@ -1,16 +1,14 @@
-<definition width="80" version="0.2" hotspot_x="30" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="80" version="0.2" hotspot_x="30" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >Вход</name>
+        <name lang="en" >Input</name>
        <name lang="en" >Input</name>
        <name lang="fr" >Entrée</name>
-        <name lang="es" >Entrada</name>
+    </names>
-    </names>
+    <description>
-    <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="40" y2="0" 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="0" x1="40" y2="0" x2="20" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-2" y="5" size="12" text="I" />
-        <text x="-2" y="5" size="12" text="I" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/et.elmt
+++ b/elements/automatisme/fonction/et.elmt
@@ -1,22 +1,20 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
        <name lang="ru" >И</name>
        <name lang="en" >AND</name>
        <name lang="fr" >ET</name>
-        <name lang="es" >Y</name>
+        <name lang="en" >AND</name>
-    </names>
+    </names>
-    <description>
+    <description>
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" 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="40" 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="40" y2="0" x2="21" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <text x="-6" y="5" size="12" text="&amp;" />
+        <text x="-6" y="5" size="12" text="&amp;" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-    </description>
+    </description>
-</definition>
+</definition>
--- a/elements/automatisme/fonction/et3entrees.elmt
+++ b/elements/automatisme/fonction/et3entrees.elmt
@@ -1,25 +1,23 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >И, трёхвходовый</name>
+        <name lang="en" >AND 3 inputs</name>
        <name lang="en" >AND 3 inputs</name>
        <name lang="fr" >ET 3 entrées</name>
-        <name lang="es" >Y 3 entradas</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="-46" y="-10" size="8" rotate="true" text="_" />
-        <input x="-46" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="0" 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="0" x1="-40" y2="0" x2="-20" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" 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="40" 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="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-6" y="5" size="12" text="&amp;" />
-        <text x="-6" y="5" size="12" text="&amp;" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+        <terminal x="-40" y="0" orientation="w" />
-        <terminal x="-40" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/nand.elmt
+++ b/elements/automatisme/fonction/nand.elmt
@@ -1,23 +1,21 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >И-НЕ</name>
+        <name lang="en" >NAND</name>
        <name lang="en" >NAND</name>
        <name lang="fr" >NON-ET (NAND)</name>
-        <name lang="es" >NO-Y (NAND)</name>
+    </names>
-    </names>
+    <description>
-    <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="40" y2="0" x2="26" />
-        <line 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="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
-        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" x2="-21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-6" y="5" size="12" text="&amp;" />
-        <text x="-6" y="5" size="12" text="&amp;" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/non.elmt
+++ b/elements/automatisme/fonction/non.elmt
@@ -1,20 +1,18 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >НЕ</name>
+        <name lang="en" >NOT</name>
        <name lang="en" >NOT</name>
        <name lang="fr" >NON</name>
-        <name lang="es" >NO</name>
+    </names>
-    </names>
+    <description>
-    <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="40" y2="0" x2="26" />
-        <line 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="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
-        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="-10" size="8" rotate="true" text="_" />
-        <input x="-46" y="-10" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-39" y2="0" 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="0" x1="-39" y2="0" x2="-20" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-5" y="5" size="12" text="1" />
-        <text x="-5" y="5" size="12" text="1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="-40" y="0" orientation="w" />
-        <terminal x="-40" y="0" orientation="w" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/nor.elmt
+++ b/elements/automatisme/fonction/nor.elmt
@@ -1,23 +1,21 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >ИЛИ-НЕ</name>
+        <name lang="en" >NOR</name>
        <name lang="en" >NOR</name>
        <name lang="fr" >NON-OU (NOR)</name>
-        <name lang="es" >NO-O (NOR)</name>
+    </names>
-    </names>
+    <description>
-    <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="40" y2="0" x2="26" />
-        <line 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="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
-        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" x2="-21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="≥1" />
-        <text x="-11.5" y="5" size="12" text="≥1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/ou.elmt
+++ b/elements/automatisme/fonction/ou.elmt
@@ -1,22 +1,20 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >ИЛИ</name>
+        <name lang="en" >OR</name>
        <name lang="en" >OR</name>
        <name lang="fr" >OU</name>
-        <name lang="es" >O</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" 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="40" 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="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="≥1" />
-        <text x="-11.5" y="5" size="12" text="≥1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/ou3entrees.elmt
+++ b/elements/automatisme/fonction/ou3entrees.elmt
@@ -1,25 +1,23 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >ИЛИ, трёхвходовый</name>
+        <name lang="en" >OR 3 inputs</name>
        <name lang="en" >OR 3 inputs</name>
        <name lang="fr" >OU 3 entrées</name>
-        <name lang="es" >O 3 entradas</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="-46" y="-10" size="8" rotate="true" text="_" />
-        <input x="-46" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="0" 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="0" x1="-40" y2="0" x2="-20" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" 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="40" 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="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="≥1" />
-        <text x="-11.5" y="5" size="12" text="≥1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+        <terminal x="-40" y="0" orientation="w" />
-        <terminal x="-40" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/qet_directory
+++ b/elements/automatisme/fonction/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Логические устройства</name>
+        <name lang="en" >Logic gates</name>
-        <name lang="en" >Logic gates</name>
+        <name lang="fr" >Fonctions logiques</name>
-        <name lang="fr" >Fonctions logiques</name>
+        <name lang="es" >Puertas lógicas</name>
-        <name lang="es" >Puertas lógicas</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/automatisme/fonction/setreset.elmt
+++ b/elements/automatisme/fonction/setreset.elmt
@@ -1,24 +1,22 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >Установка/Сброс</name>
+        <name lang="en" >SET/RESET</name>
        <name lang="en" >SET/RESET</name>
        <name lang="fr" >SET/RESET</name>
-        <name lang="es" >SET/RESET</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="-46" y="-10" size="8" rotate="true" text="R" />
-        <input x="-46" y="-10" size="8" 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="0" x1="-40" y2="0" 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="0" x1="-40" y2="0" x2="-20" />
+        <input x="-46" y="15" size="8" rotate="true" text="Par" />
-        <input x="-46" y="15" size="8" rotate="true" text="Par" />
+        <input x="-46" y="-30" size="8" rotate="true" text="S" />
-        <input x="-46" y="-30" size="8" rotate="true" text="S" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" 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="40" 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="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-10.5" y="5" size="12" text="RS" />
-        <text x="-10.5" y="5" size="12" text="RS" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="0" orientation="w" />
-        <terminal x="-40" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/sortie.elmt
+++ b/elements/automatisme/fonction/sortie.elmt
@@ -1,15 +1,14 @@
-<definition width="80" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="80" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >Выход</name>
+        <name lang="en" >Output</name>
-        <name lang="en" >Output</name>
+        <name lang="fr" >Sortie</name>
-        <name lang="fr" >Sortie</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="-46" y="-10" size="8" rotate="true" text="_" />
-        <input x="-46" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-39" y2="0" 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="0" x1="-39" y2="0" x2="-20" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-6.5" y="5" size="12" text="Q" />
-        <text x="-6.5" y="5" size="12" text="Q" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="-40" y="0" orientation="w" />
-        <terminal x="-40" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/xnor.elmt
+++ b/elements/automatisme/fonction/xnor.elmt
@@ -1,23 +1,21 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >Инверсное исключающее ИЛИ</name>
+        <name lang="en" >XNOR</name>
        <name lang="en" >XNOR</name>
        <name lang="fr" >NON-OU excusif (XNOR)</name>
-        <name lang="es" >NO-O exclusiva (XNOR)</name>
+    </names>
-    </names>
+    <description>
-    <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="40" y2="0" x2="26" />
-        <line 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="40" y2="0" x2="26" />
+        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
-        <circle x="20.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" x2="-21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="=1" />
-        <text x="-11.5" y="5" size="12" text="=1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/fonction/xor.elmt
+++ b/elements/automatisme/fonction/xor.elmt
@@ -1,22 +1,20 @@
-<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
+<definition width="100" version="0.2" hotspot_x="50" hotspot_y="50" height="110" type="element" ic="true" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >Исключающее ИЛИ</name>
+        <name lang="en" >XOR</name>
        <name lang="en" >XOR</name>
        <name lang="fr" >OU exclusif (XOR)</name>
-        <name lang="es" >O exclusiva (XOR)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="-46" y="10" size="8" rotate="true" text="_" />
-        <input x="-46" y="10" size="8" rotate="true" text="_" />
+        <input x="-46" y="-30" size="8" rotate="true" text="_" />
-        <input x="-46" y="-30" size="8" rotate="true" text="_" />
+        <input x="25" y="-10" size="8" rotate="true" text="_" />
-        <input x="25" y="-10" size="8" rotate="true" text="_" />
+        <line 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="-40" y2="-20" 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="-20" x1="-40" y2="-20" 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="20" x1="-40" y2="20" 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="20" x1="-40" y2="20" 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="40" 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="40" y2="0" x2="21" />
+        <input x="-25" y="50" size="9" rotate="true" text="_" />
-        <input x="-25" y="50" size="9" rotate="true" text="_" />
+        <text x="-11.5" y="5" size="12" text="=1" />
-        <text x="-11.5" y="5" size="12" text="=1" />
+        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="40" x="-20" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <terminal x="40" y="0" orientation="e" />
-        <terminal x="40" y="0" orientation="e" />
+        <terminal x="-40" y="-20" orientation="w" />
-        <terminal x="-40" y="-20" orientation="w" />
+        <terminal x="-40" y="20" orientation="w" />
-        <terminal x="-40" y="20" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/input/entree.elmt
+++ b/elements/automatisme/lader/input/entree.elmt
@@ -1,17 +1,16 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Вход</name>
+        <name lang="en" >Input</name>
-        <name lang="en" >Input</name>
+        <name lang="fr" >Entrée</name>
-        <name lang="fr" >Entrée</name>
+        <name lang="es" >Entrada</name>
-        <name lang="es" >Entrada</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
-        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" 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="5" x1="10" y2="-5" x2="10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" 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="-5" x1="-10" y2="5" x2="-10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
-        <line 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="24" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" 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="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
-        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
-        <terminal x="-24" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/input/entree_fn.elmt
+++ b/elements/automatisme/lader/input/entree_fn.elmt
@@ -1,18 +1,17 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Вход (задний фронт)</name>
+        <name lang="en" >Input (down front)</name>
-        <name lang="en" >Input (down front)</name>
+        <name lang="fr" >Entrée (front descendant)</name>
-        <name lang="fr" >Entrée (front descendant)</name>
+        <name lang="es" >Entrada (front descendant)</name>
-        <name lang="es" >Entrada (descendente)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <text x="-4.25" y="5.25" size="9" text="N" />
-        <text x="-4.25" y="5.25" size="9" text="N" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
-        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" 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="5" x1="10" y2="-5" x2="10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" 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="-5" x1="-10" y2="5" x2="-10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
-        <line 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="24" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" 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="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
-        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
-        <terminal x="-24" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/input/entree_fp.elmt
+++ b/elements/automatisme/lader/input/entree_fp.elmt
@@ -1,18 +1,16 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Вход (передний фронт)</name>
+        <name lang="en" >Input (up front)</name>
        <name lang="en" >Input (up front)</name>
        <name lang="fr" >Entrée (front montant)</name>
-        <name lang="es" >Entrada (ascendente)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <text x="-3.5" y="5.25" size="9" text="P" />
-        <text x="-3.5" y="5.25" size="9" text="P" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
-        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" 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="5" x1="10" y2="-5" x2="10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" 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="-5" x1="-10" y2="5" x2="-10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
-        <line 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="24" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" 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="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
-        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
-        <terminal x="-24" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/input/entree_nf.elmt
+++ b/elements/automatisme/lader/input/entree_nf.elmt
@@ -1,18 +1,16 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Вход (отрицательная логика)</name>
+        <name lang="en" >Input (negative logic)</name>
        <name lang="en" >Input (negative logic)</name>
        <name lang="fr" >Entrée (NF)</name>
-        <name lang="es" >Entrada (lógica negativa)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="-5" x2="7" />
-        <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="7" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
-        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" 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="5" x1="10" y2="-5" x2="10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" 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="-5" x1="-10" y2="5" x2="-10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
-        <line 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="24" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" 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="-24" y2="0" x2="-10" />
+        <terminal x="24" y="0" orientation="e" />
-        <terminal x="24" y="0" orientation="e" />
+        <terminal x="-24" y="0" orientation="w" />
-        <terminal x="-24" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/input/qet_directory
+++ b/elements/automatisme/lader/input/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Входы</name>
+        <name lang="en" >Inputs</name>
-        <name lang="en" >Inputs</name>
+        <name lang="fr" >Entrées</name>
-        <name lang="fr" >Entrées</name>
+        <name lang="es" >Entradas</name>
-        <name lang="es" >Entradas</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/automatisme/lader/output/qet_directory
+++ b/elements/automatisme/lader/output/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Выходы</name>
+        <name lang="en" >Outputs</name>
-        <name lang="en" >Outputs</name>
+        <name lang="fr" >Sorties</name>
-        <name lang="fr" >Sorties</name>
+        <name lang="es" >Salidas</name>
-        <name lang="es" >Salidas</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/automatisme/lader/output/sortie.elmt
+++ b/elements/automatisme/lader/output/sortie.elmt
@@ -1,16 +1,15 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Выход</name>
+        <name lang="en" >Output</name>
-        <name lang="en" >Output</name>
+        <name lang="fr" >Sortie</name>
-        <name lang="fr" >Sortie</name>
+        <name lang="es" >Salida</name>
-        <name lang="es" >Salida</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
-        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
-        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
-        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
-        <line 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="24" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" 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="-24" y2="0" x2="-10" />
+        <terminal x="-24" y="0" orientation="w" />
-        <terminal x="-24" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/output/sortie_r.elmt
+++ b/elements/automatisme/lader/output/sortie_r.elmt
@@ -1,17 +1,16 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Выход (сброс)</name>
+        <name lang="en" >Output (reset)</name>
-        <name lang="en" >Output (reset)</name>
+        <name lang="fr" >Sortie (reset)</name>
-        <name lang="fr" >Sortie (reset)</name>
+        <name lang="es" >Salida (reset)</name>
-        <name lang="es" >Salida (reset)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <text x="-4.25" y="5.25" size="9" text="R" />
-        <text x="-4.25" y="5.25" size="9" text="R" />
+        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
-        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
-        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
-        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
-        <line 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="24" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" 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="-24" y2="0" x2="-10" />
+        <terminal x="-24" y="0" orientation="w" />
-        <terminal x="-24" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/output/sortie_s.elmt
+++ b/elements/automatisme/lader/output/sortie_s.elmt
@@ -1,17 +1,16 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Выход (установка)</name>
+        <name lang="en" >Output (set)</name>
-        <name lang="en" >Output (set)</name>
+        <name lang="fr" >Sortie (set)</name>
-        <name lang="fr" >Sortie (set)</name>
+        <name lang="es" >Salida (set)</name>
-        <name lang="es" >Salida (set)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
-        <arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
+        <input x="-18" y="-10" size="9" rotate="true" text="_" />
-        <input x="-18" y="-10" size="9" rotate="true" text="_" />
+        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
-        <arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
+        <text x="-4.25" y="5.25" size="9" text="S" />
-        <text x="-4.25" y="5.25" size="9" text="S" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
-        <line 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="24" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" 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="-24" y2="0" x2="-10" />
+        <terminal x="-24" y="0" orientation="w" />
-        <terminal x="-24" y="0" orientation="w" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/automatisme/lader/qet_directory
+++ b/elements/automatisme/lader/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Контактно-релейная схема</name>
+        <name lang="fr">Ladder</name>
-        <name lang="en" >Ladder</name>
+        <name lang="en">Ladder</name>
-        <name lang="fr" >Ladder</name>
+        <name lang="es">Ladder</name>
-        <name lang="es" >Ladder</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/automatisme/qet_directory
+++ b/elements/automatisme/qet_directory
@@ -3,6 +3,6 @@
        <name lang="ru" >Автоматика</name>
        <name lang="en" >Automatism</name>
        <name lang="fr" >Automatisme</name>
-        <name lang="es" >Automatismo</name>
+        <name lang="es" >Automática</name>
    </names>
 </qet-directory>
--- a/elements/capteurs/appareils_de_mesure/amperemetre-h.elmt
+++ b/elements/capteurs/appareils_de_mesure/amperemetre-h.elmt
@@ -1,17 +1,16 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Амперметр (горизонтальный)</name>
+        <name lang="en" >Horizontal ammeter</name>
-        <name lang="en" >Horizontal ammeter</name>
+        <name lang="fr" >Ampèremètre horizontal</name>
-        <name lang="fr" >Ampèremètre horizontal</name>
+        <name lang="es" >Amperímetro horizontal</name>
-        <name lang="es" >Amperímetro horizontal</name>
+    </names>
-    </names>
+    <description>
-    <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="-1.75" y2="0" x2="1.75" />
-        <line 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.75" y2="0" x2="1.75" />
+        <line 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="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="10" 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="-21" y2="0" 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="-21" y2="0" x2="-10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/appareils_de_mesure/amperemetre-v.elmt
+++ b/elements/capteurs/appareils_de_mesure/amperemetre-v.elmt
@@ -1,17 +1,16 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Амперметр (вертикальный)</name>
+        <name lang="en" >Vertical ammeter</name>
-        <name lang="en" >Vertical ammeter</name>
+        <name lang="fr" >Ampèremètre vertical</name>
-        <name lang="fr" >Ampèremètre vertical</name>
+        <name lang="es" >Amperímetro vertical</name>
-        <name lang="es" >Amperímetro vertical</name>
+    </names>
-    </names>
+    <description>
-    <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="-1.75" y2="0" x2="1.75" />
-        <line 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.75" y2="0" x2="1.75" />
+        <line 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="21" 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="21" 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="-21" 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="-21" x1="0" y2="-10" x2="0" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/appareils_de_mesure/ohmmetre-h.elmt
+++ b/elements/capteurs/appareils_de_mesure/ohmmetre-h.elmt
@@ -1,20 +1,19 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Омметр (горизонтальный)</name>
+        <name lang="en" >Horizontal ohmmeter</name>
-        <name lang="en" >Horizontal ohmmeter</name>
+        <name lang="fr" >Ohmmètre horizontal</name>
-        <name lang="fr" >Ohmmètre horizontal</name>
+        <name lang="es" >Óhmetro horizontal</name>
-        <name lang="es" >Óhmetro horizontal</name>
+    </names>
-    </names>
+    <description>
-    <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="5" x1="-5" y2="5" x2="-3.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="5" x1="-5" y2="5" x2="-3.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="5" x1="3.25" y2="5" 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" x1="3.25" y2="5" 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" x1="-3.25" y2="3" x2="-3.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="5" x1="-3.25" y2="3" x2="-3.25" />
+        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270" />
-        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270" />
+        <line 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="3.25" y2="5" x2="3.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="3" x1="3.25" y2="5" x2="3.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="0" x1="10" 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="10" 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="-21" y2="0" 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="-21" y2="0" x2="-10" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/appareils_de_mesure/ohmmetre-v.elmt
+++ b/elements/capteurs/appareils_de_mesure/ohmmetre-v.elmt
@@ -1,20 +1,19 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Омметр (вертикальный)</name>
+        <name lang="en" >Vertical ohmmeter</name>
-        <name lang="en" >Vertical ohmmeter</name>
+        <name lang="fr" >Ohmmètre vertical</name>
-        <name lang="fr" >Ohmmètre vertical</name>
+        <name lang="es" >Óhmetro vertical</name>
-        <name lang="es" >Óhmetro vertical</name>
+    </names>
-    </names>
+    <description>
-    <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="5" x1="-5" y2="5" x2="-3.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="5" x1="-5" y2="5" x2="-3.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="5" x1="3.25" y2="5" 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" x1="3.25" y2="5" 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" x1="-3.25" y2="3" x2="-3.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="5" x1="-3.25" y2="3" x2="-3.25" />
+        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270" />
-        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270" />
+        <line 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="3.25" y2="5" x2="3.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="3" x1="3.25" y2="5" x2="3.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="10" x1="0" y2="21" 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="21" 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="-21" 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="-21" x1="0" y2="-10" x2="0" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/appareils_de_mesure/qet_directory
+++ b/elements/capteurs/appareils_de_mesure/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Измеррительные приборы</name>
+        <name lang="en" >Measuring instruments</name>
-        <name lang="en" >Measuring instruments</name>
+        <name lang="fr" >Appareils de mesure</name>
-        <name lang="fr" >Appareils de mesure</name>
+        <name lang="es" >Instrumento de medición</name>
-        <name lang="es" >Instrumento de medición</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/capteurs/appareils_de_mesure/voltmetre-h.elmt
+++ b/elements/capteurs/appareils_de_mesure/voltmetre-h.elmt
@@ -1,16 +1,15 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Вольтметр (горизонтальный)</name>
+        <name lang="en" >Horizontal voltmeter</name>
-        <name lang="en" >Horizontal voltmeter</name>
+        <name lang="fr" >Voltmètre horizontal</name>
-        <name lang="fr" >Voltmètre horizontal</name>
+        <name lang="es" >Voltímetro horizontal</name>
-        <name lang="es" >Voltímetro horizontal</name>
+    </names>
-    </names>
+    <description>
-    <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="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="10" 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="-21" y2="0" 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="-21" y2="0" x2="-10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/appareils_de_mesure/voltmetre-v.elmt
+++ b/elements/capteurs/appareils_de_mesure/voltmetre-v.elmt
@@ -1,16 +1,15 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
+<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Вольтметр (вертикальный)</name>
+        <name lang="en" >Vertical voltmeter</name>
-        <name lang="en" >Vertical voltmeter</name>
+        <name lang="fr" >Voltmètre vertical</name>
-        <name lang="fr" >Voltmètre vertical</name>
+        <name lang="es" >Voltímetro vertical</name>
-        <name lang="es" >Voltímetro vertical</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="21" 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="21" 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="-21" 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="-21" x1="0" y2="-10" x2="0" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/appareils_de_mesure/wattmetre-h.elmt
+++ b/elements/capteurs/appareils_de_mesure/wattmetre-h.elmt
@@ -1,20 +1,19 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="40" type="element" ic="true" orientation="dnnn" >
+<definition width="50" version="0.2" hotspot_x="25" hotspot_y="15" height="40" type="element" ic="true" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Ватметр (горизонтальный)</name>
+        <name lang="en" >Horizontal wattmeter</name>
-        <name lang="en" >Horizontal wattmeter</name>
+        <name lang="fr" >Wattmètre horizontal</name>
-        <name lang="fr" >Wattmètre horizontal</name>
+        <name lang="es" >Vatímetro horizontal</name>
-        <name lang="es" >Vatímetro horizontal</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="15" x2="10" y3="20" x3="10" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="15" x2="10" y3="20" x3="10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="-7.5" y2="15" x2="-10" y3="20" x3="-10" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="-7.5" y2="15" x2="-10" y3="20" x3="-10" />
+        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="6" />
-        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="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="10" 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="10" 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="-21" y2="0" 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="-21" y2="0" x2="-10" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+        <terminal x="-10" y="20" orientation="s" />
-        <terminal x="-10" y="20" orientation="s" />
+        <terminal x="10" y="20" orientation="s" />
-        <terminal x="10" y="20" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/appareils_de_mesure/wattmetre-v.elmt
+++ b/elements/capteurs/appareils_de_mesure/wattmetre-v.elmt
@@ -1,20 +1,19 @@
-<definition width="40" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" ic="true" orientation="dnnn" >
+<definition width="40" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" ic="true" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Ватметр (вертикальный)</name>
+        <name lang="en" >Vertical wattmeter</name>
-        <name lang="en" >Vertical wattmeter</name>
+        <name lang="fr" >Wattmètre vertical</name>
-        <name lang="fr" >Wattmètre vertical</name>
+        <name lang="es" >Vatímetro vertical</name>
-        <name lang="es" >Vatímetro vertical</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="10" x2="15" y3="10" x3="20" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="10" x2="15" y3="10" x3="20" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7.5" x1="7.5" y2="-10" x2="15" y3="-10" x3="20" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7.5" x1="7.5" y2="-10" x2="15" y3="-10" x3="20" />
+        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="6" />
-        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="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="0" y2="21" 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="21" 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="-21" 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="-21" x1="0" y2="-10" x2="0" />
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+        <terminal x="20" y="-10" orientation="e" />
-        <terminal x="20" y="-10" orientation="e" />
+        <terminal x="20" y="10" orientation="e" />
-        <terminal x="20" y="10" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/capteurs/sondes/qet_directory
+++ b/elements/capteurs/sondes/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Датчики</name>
+        <name lang="en" >Sensors</name>
-        <name lang="en" >Sensors</name>
+        <name lang="fr" >Sondes</name>
-        <name lang="fr" >Sondes</name>
+        <name lang="es" >Sondeos</name>
-        <name lang="es" >Sondeos</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/bornes/connecteur_f.elmt
+++ b/elements/contacts/bornes/connecteur_f.elmt
@@ -2,8 +2,7 @@
    <names>
        <name lang="ru" >Гнездо (нов.)</name>
        <name lang="fr" >Connecteur femelle</name>
-        <name lang="en" >Female connector</name>
+        <name lang="en" >Female connector</name>
        <name lang="es" >Connector hembra</name>
    </names>
    <description>
        <input x="4" y="-7.5" size="8" rotate="true" text="_" />
--- a/elements/contacts/bornes/connecteur_m.elmt
+++ b/elements/contacts/bornes/connecteur_m.elmt
@@ -2,8 +2,7 @@
    <names>
        <name lang="ru" >Штырь (нов.)</name>
        <name lang="fr" >Connecteur mâle</name>
-        <name lang="en" >Male connector</name>
+        <name lang="en" >Male connector</name>
        <name lang="es" >Connector macho</name>
    </names>
    <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="-1" y2="9" x2="-1" />
--- a/elements/contacts/bornes/qet_directory
+++ b/elements/contacts/bornes/qet_directory
@@ -1,8 +1,7 @@
 <qet-directory>
    <names>
-        <name lang="ru" >соеденителей</name>
+        <name lang="ru" >Контакты</name>
        <name lang="en" >Terminals</name>
-        <name lang="fr" >Bornes</name>
+        <name lang="fr" >Bornes</name>
        <name lang="es" >Conectores</name>
    </names>
 </qet-directory>
--- a/elements/contacts/etanches/con_simple_etanche.elmt
+++ b/elements/contacts/etanches/con_simple_etanche.elmt
@@ -1,23 +1,22 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Герметичный контакт (НР)</name>
+        <name lang="en" >Simple contact (tight)</name>
-        <name lang="en" >Simple contact (tight)</name>
+        <name lang="fr" >Contact simple (étanche)</name>
-        <name lang="fr" >Contact simple (étanche)</name>
+        <name lang="es" >Contactor simple (resistente al agua)</name>
-        <name lang="es" >Contactor simple (resistente al agua)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-8.5" y2="12" x2="-8.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="-8.5" y2="12" x2="-8.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="8.5" y2="12" x2="8.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="8.5" y2="12" x2="8.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5" x1="-6" y2="-14.5" 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="-14.5" x1="-6" y2="-14.5" x2="6" />
+        <arc width="5" x="3.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" />
-        <arc width="5" x="3.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" />
+        <arc width="5" x="-8.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90" />
-        <arc width="5" x="-8.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90" />
+        <arc width="5" x="-8.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90" />
-        <arc width="5" x="-8.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14.5" x1="-6" y2="14.5" 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="14.5" x1="-6" y2="14.5" x2="6" />
+        <arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
-        <arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
+        <input x="12.75" y="3" size="9" text="_" />
-        <input x="12.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/etanches/con_simple_nf_etanche.elmt
+++ b/elements/contacts/etanches/con_simple_nf_etanche.elmt
@@ -1,24 +1,23 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Герметичный контакт (НЗ)</name>
+        <name lang="en" >Simple contact (NC / tight)</name>
-        <name lang="en" >Simple contact (NC / tight)</name>
+        <name lang="fr" >Contact simple (NF / étanche)</name>
-        <name lang="fr" >Contact simple (NF / étanche)</name>
+        <name lang="es" >Contactor simple (NC / resistente al agua)</name>
-        <name lang="es" >Contactor simple (NC / resistente al agua)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-8.5" y2="12" x2="-8.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="-8.5" y2="12" x2="-8.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="8.5" y2="12" x2="8.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="8.5" y2="12" x2="8.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5" x1="-6" y2="-14.5" 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="-14.5" x1="-6" y2="-14.5" x2="6" />
+        <arc width="5" x="3.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" />
-        <arc width="5" x="3.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" />
+        <arc width="5" x="-8.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90" />
-        <arc width="5" x="-8.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90" />
+        <arc width="5" x="-8.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90" />
-        <arc width="5" x="-8.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14.5" x1="-6" y2="14.5" 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="14.5" x1="-6" y2="14.5" x2="6" />
+        <arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
-        <arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
+        <input x="12.75" y="3" size="9" text="_" />
-        <input x="12.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/etanches/qet_directory
+++ b/elements/contacts/etanches/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >герметичные</name>
+        <name lang="en" >Tight</name>
-        <name lang="en" >Tight</name>
+        <name lang="fr" >Étanches</name>
-        <name lang="fr" >Étanches</name>
+        <name lang="es" >Resistentes al agua</name>
-        <name lang="es" >Resistentes al agua</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/fin_de_course/findecourse_nf.elmt
+++ b/elements/contacts/fin_de_course/findecourse_nf.elmt
@@ -1,18 +1,17 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Концевой контакт (НЗ)</name>
+        <name lang="en" >Limit (NC)</name>
-        <name lang="en" >Limit (NC)</name>
+        <name lang="fr" >Fin de course (NF)</name>
-        <name lang="fr" >Fin de course (NF)</name>
+        <name lang="es" >Final de carrera (NC)</name>
-        <name lang="es" >Final de carrera (NC)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="1.25" y2="-5.25" x2="3.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="-5.25" x1="1.25" y2="-5.25" x2="3.25" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="1.25" y2="-5.25" x2="1.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="4" x1="1.25" y2="-5.25" x2="1.25" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
+        <input x="5.75" y="3" size="9" text="_" />
-        <input x="5.75" y="3" size="9" text="_" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/fin_de_course/findecourse_no.elmt
+++ b/elements/contacts/fin_de_course/findecourse_no.elmt
@@ -1,16 +1,15 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Концевой контакт (НР)</name>
+        <name lang="en" >Limit</name>
-        <name lang="en" >Limit</name>
+        <name lang="fr" >Fin de course</name>
-        <name lang="fr" >Fin de course</name>
+        <name lang="es" >Final de carrera</name>
-        <name lang="es" >Final de carrera</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-4" y2="-3" x2="-6.75" y3="4.85" x3="-1.55" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-4" y2="-3" x2="-6.75" y3="4.85" x3="-1.55" />
+        <input x="2.75" y="3" size="9" text="_" />
-        <input x="2.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/fin_de_course/qet_directory
+++ b/elements/contacts/fin_de_course/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >концевые</name>
+		<name lang="en">Limits</name>
-        <name lang="en" >Limits</name>
+        <name lang="fr" >Fins de courses</name>
-        <name lang="fr" >Fins de courses</name>
+        <name lang="es" >Finales de carrera</name>
-        <name lang="es" >Finales de carrera</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/interupteur/inter_2.elmt
+++ b/elements/contacts/interupteur/inter_2.elmt
@@ -1,21 +1,20 @@
-<definition width="50" version="0.2" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
+<definition width="50" version="0.1" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >Переключатель 2-х позиционный</name>
+        <name lang="en" >Switch 2 positions</name>
-        <name lang="en" >Switch 2 positions</name>
+        <name lang="fr" >Interrupteur 2 positions</name>
-        <name lang="fr" >Interrupteur 2 positions</name>
+        <name lang="es" >Interruptor 2 posiciones</name>
-        <name lang="es" >Interruptor 2 posiciones</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <input x="22" y="-7" size="9" text="_" />
-        <input x="22" y="-7" size="9" text="_" />
+        <line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="9" y2="1" 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="-13" x1="9" y2="1" x2="2" />
+        <ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" 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="2" x1="0" y2="10" x2="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="20" y2="10" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="20" y2="10" x2="20" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="10" y2="-30" 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="-17" x1="10" y2="-30" x2="10" />
+        <terminal x="0" y="10" orientation="s" />
-        <terminal x="0" y="10" orientation="s" />
+        <terminal x="20" y="10" orientation="s" />
-        <terminal x="20" y="10" orientation="s" />
+        <terminal x="10" y="-30" orientation="n" />
-        <terminal x="10" y="-30" orientation="n" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/interupteur/inter_2n.elmt
+++ b/elements/contacts/interupteur/inter_2n.elmt
@@ -1,22 +1,21 @@
-<definition width="50" version="0.2" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
+<definition width="50" version="0.1" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
-    <names>
+    <names>
-        <name lang="ru" >Переключатель 3-х позиционный со средним положением</name>
+        <name lang="en" >Switch 3 positions including neutral</name>
-        <name lang="en" >Switch 3 positions including neutral</name>
+        <name lang="fr" >Interrupteur 3 positions dont neutre</name>
-        <name lang="fr" >Interrupteur 3 positions dont neutre</name>
+        <name lang="es" >Interruptor 3 posiciones incluso neutro</name>
-        <name lang="es" >Interruptor 3 posiciones incluso neutro</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="10" y2="4" x2="8" y3="4" x3="12" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="10" y2="4" x2="8" y3="4" x3="12" />
+        <input x="22" y="-7" size="9" text="_" />
-        <input x="22" y="-7" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" 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="-13" x1="10" y2="1" x2="10" />
+        <ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" 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="2" x1="0" y2="10" x2="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="20" y2="10" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="20" y2="10" x2="20" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="10" y2="-30" 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="-17" x1="10" y2="-30" x2="10" />
+        <terminal x="0" y="10" orientation="s" />
-        <terminal x="0" y="10" orientation="s" />
+        <terminal x="20" y="10" orientation="s" />
-        <terminal x="20" y="10" orientation="s" />
+        <terminal x="10" y="-30" orientation="n" />
-        <terminal x="10" y="-30" orientation="n" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/interupteur/interupteur.elmt
+++ b/elements/contacts/interupteur/interupteur.elmt
@@ -1,16 +1,15 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Переключатель</name>
+        <name lang="en" >Switch</name>
-        <name lang="en" >Switch</name>
+        <name lang="fr" >Interrupteur</name>
-        <name lang="fr" >Interrupteur</name>
+        <name lang="es" >Interruptor</name>
-        <name lang="es" >Interruptor</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-12.5" 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="-20" x1="0" y2="-12.5" x2="0" />
+        <input x="2.75" y="3" size="9" text="_" />
-        <input x="2.75" y="3" size="9" text="_" />
+        <circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
-        <circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/interupteur/qet_directory
+++ b/elements/contacts/interupteur/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >переключателей</name>
+        <name lang="en" >Switchs</name>
-        <name lang="en" >Switchs</name>
+        <name lang="fr" >Interrupteurs</name>
-        <name lang="fr" >Interrupteurs</name>
+        <name lang="es" >Interruptores</name>
-        <name lang="es" >Interruptores</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/poussoirs/poussoir.elmt
+++ b/elements/contacts/poussoirs/poussoir.elmt
@@ -1,19 +1,18 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Кнопка (НР)</name>
+        <name lang="en" >Push-button</name>
-        <name lang="en" >Push-button</name>
+        <name lang="fr" >Bouton poussoir</name>
-        <name lang="fr" >Bouton poussoir</name>
+        <name lang="es" >Pulsador</name>
-        <name lang="es" >Pulsador</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <input x="2.75" y="3" size="9" text="_" />
-        <input x="2.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
-        <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="-5" x1="-10" y2="5" x2="-10" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-3" />
-        <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="-10" y2="0" x2="-3" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="-5" 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="-5" x1="-10" y2="-5" x2="-7" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-10" y2="5" 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="5" x1="-10" y2="5" x2="-7" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/poussoirs/poussoir_nf.elmt
+++ b/elements/contacts/poussoirs/poussoir_nf.elmt
@@ -1,20 +1,19 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Кнопка (НЗ)</name>
+        <name lang="en" >Push-button (NC)</name>
-        <name lang="en" >Push-button (NC)</name>
+        <name lang="fr" >Bouton poussoir (NF)</name>
-        <name lang="fr" >Bouton poussoir (NF)</name>
+        <name lang="es" >Pulsador (NC)</name>
-        <name lang="es" >Pulsador (NC)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
+        <input x="5.75" y="3" size="9" text="_" />
-        <input x="5.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
-        <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="-5" x1="-10" y2="5" x2="-10" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="3" />
-        <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="-10" y2="0" x2="3" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="-5" 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="-5" x1="-10" y2="-5" x2="-7" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-10" y2="5" 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="5" x1="-10" y2="5" x2="-7" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/poussoirs/qet_directory
+++ b/elements/contacts/poussoirs/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >кнопок</name>
+        <name lang="en" >Push-buttons</name>
-        <name lang="en" >Push-buttons</name>
+        <name lang="fr" >Poussoirs</name>
-        <name lang="fr" >Poussoirs</name>
+        <name lang="es" >Pulsadores</name>
-        <name lang="es" >Pulsadores</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt
+++ b/elements/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt
@@ -1,6 +1,5 @@
 <definition width="50" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НЗ)</name>
        <name lang="en" >Contact power contactor (NC)</name>
        <name lang="fr" >Contact puissance contacteur (NF)</name>
        <name lang="es" >Interruptor de potencia contactor (NC)</name>
--- a/elements/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt
+++ b/elements/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt
@@ -1,6 +1,5 @@
 <definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НЗ)</name>
        <name lang="en" >Contact power contactor (NC)</name>
        <name lang="fr" >Contact puissance contacteur (NF)</name>
        <name lang="es" >Interruptor de potencia contactor (NC)</name>
--- a/elements/contacts/puissance/normalement_fermes/com_puiss_nf5.elmt
+++ b/elements/contacts/puissance/normalement_fermes/com_puiss_nf5.elmt
@@ -1,6 +1,5 @@
 <definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НЗ)</name>
        <name lang="en" >Contact power contactor (NC)</name>
        <name lang="fr" >Contact puissance contacteur (NF)</name>
        <name lang="es" >Interruptor de potencia contactor (NC)</name>
--- a/elements/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt
+++ b/elements/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt
@@ -1,6 +1,5 @@
 <definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НЗ)</name>
        <name lang="en" >Contact power contactor (NC)</name>
        <name lang="fr" >Contact puissance contacteur (NF)</name>
        <name lang="es" >Interruptor de potencia contactor (NC)</name>
--- a/elements/contacts/puissance/normalement_fermes/qet_directory
+++ b/elements/contacts/puissance/normalement_fermes/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Нормально замкнутые</name>
+        <name lang="en" >Normally closed</name>
-        <name lang="en" >Normally closed</name>
+        <name lang="fr" >Normalement fermés</name>
-        <name lang="fr" >Normalement fermés</name>
+        <name lang="es" >Normalmente cerrados</name>
-        <name lang="es" >Normalmente cerrados</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/puissance/normalement_ouverts/com_puiss1.elmt
+++ b/elements/contacts/puissance/normalement_ouverts/com_puiss1.elmt
@@ -1,6 +1,5 @@
 <definition width="40" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НР)</name>
        <name lang="en" >Contact power contactor</name>
        <name lang="fr" >Contact puissance contacteur</name>
        <name lang="es" >Interruptor de potencia contactor</name>
--- a/elements/contacts/puissance/normalement_ouverts/com_puiss4.elmt
+++ b/elements/contacts/puissance/normalement_ouverts/com_puiss4.elmt
@@ -1,6 +1,5 @@
 <definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НР)</name>
        <name lang="en" >Contact power contactor</name>
        <name lang="fr" >Contact puissance contacteur</name>
        <name lang="es" >Interruptor de potencia contactor</name>
--- a/elements/contacts/puissance/normalement_ouverts/com_puiss5.elmt
+++ b/elements/contacts/puissance/normalement_ouverts/com_puiss5.elmt
@@ -1,6 +1,5 @@
 <definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НР)</name>
        <name lang="en" >Contact power contactor</name>
        <name lang="fr" >Contact puissance contacteur</name>
        <name lang="es" >Interruptor de potencia contactor</name>
--- a/elements/contacts/puissance/normalement_ouverts/com_puiss6.elmt
+++ b/elements/contacts/puissance/normalement_ouverts/com_puiss6.elmt
@@ -1,6 +1,5 @@
 <definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
    <names>
        <name lang="ru" >Контакт контактора (НР)</name>
        <name lang="en" >Contact power contactor</name>
        <name lang="fr" >Contact puissance contacteur</name>
        <name lang="es" >Interruptor de potencia contactor</name>
--- a/elements/contacts/puissance/normalement_ouverts/qet_directory
+++ b/elements/contacts/puissance/normalement_ouverts/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Нормально разомкнутые</name>
+        <name lang="en" >Normally open</name>
-        <name lang="en" >Normally open</name>
+        <name lang="fr" >Normalement ouverts</name>
-        <name lang="fr" >Normalement ouverts</name>
+        <name lang="es" >Normalemente abiertos</name>
-        <name lang="es" >Normalemente abiertos</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/puissance/qet_directory
+++ b/elements/contacts/puissance/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >контактора</name>
+        <name lang="en" >Power</name>
-        <name lang="en" >Power</name>
+        <name lang="fr" >Puissance</name>
-        <name lang="fr" >Puissance</name>
+        <name lang="es" >Potencia</name>
-        <name lang="es" >Potencia</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/relais_thermique/contact_relais.elmt
+++ b/elements/contacts/relais_thermique/contact_relais.elmt
@@ -1,18 +1,17 @@
-<definition width="40" version="0.2" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="40" version="0.1" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Контакт теплового реле (НР)</name>
+        <name lang="en" >Contact relais thermique (NO)</name>
-        <name lang="en" >Contact relais thermique (NO)</name>
+        <name lang="fr" >Contact relais thermique (NO)</name>
-        <name lang="fr" >Contact relais thermique (NO)</name>
+        <name lang="es" >Contacto relé térmico (NA)</name>
-        <name lang="es" >Contacto relé térmico (NA)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-9" y2="4" 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="0" x1="-9" y2="4" x2="-9" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="2" 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="-7" y2="2" x2="-7" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-3" 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="0" x1="-3" y2="0" x2="-9" />
+        <input x="2.75" y="3" size="9" text="F_" />
-        <input x="2.75" y="3" size="9" text="F_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/relais_thermique/contact_relais_nf.elmt
+++ b/elements/contacts/relais_thermique/contact_relais_nf.elmt
@@ -1,19 +1,18 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Контакт теплового реле (НЗ)</name>
+        <name lang="en" >Contact relais thermique (NC)</name>
-        <name lang="en" >Contact relais thermique (NC)</name>
+        <name lang="fr" >Contact relais thermique (NF)</name>
-        <name lang="fr" >Contact relais thermique (NF)</name>
+        <name lang="es" >Contacto relé térmico (NC)</name>
-        <name lang="es" >Contacto relé térmico (NC)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-4" y2="4" 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="-4" y2="4" x2="-4" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-2" y2="2" 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="0" x1="-2" y2="2" x2="-2" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="2" 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="2" y2="0" x2="-4" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
+        <input x="5.75" y="3" size="9" text="F_" />
-        <input x="5.75" y="3" size="9" text="F_" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/relais_thermique/qet_directory
+++ b/elements/contacts/relais_thermique/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >теплового реле</name>
+        <name lang="fr">Relais thermiques</name>
-        <name lang="en" >Thermal relays</name>
+        <name lang="en">Thermal relays</name>
-        <name lang="fr" >Relais thermiques</name>
+        <name lang="es">Relés térmicos</name>
-        <name lang="es" >Relés térmicos</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/simples/con_simple.elmt
+++ b/elements/contacts/simples/con_simple.elmt
@@ -1,15 +1,14 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Проктой контакт (НР)</name>
+        <name lang="en" >Simple contact</name>
-        <name lang="en" >Simple contact</name>
+        <name lang="fr" >Contact simple</name>
-        <name lang="fr" >Contact simple</name>
+        <name lang="es" >Contacto simple</name>
-        <name lang="es" >Contacto simple</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <input x="2.75" y="3" size="9" text="_" />
-        <input x="2.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/simples/con_simple_nf.elmt
+++ b/elements/contacts/simples/con_simple_nf.elmt
@@ -1,16 +1,15 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Проктой контакт (НЗ)</name>
+        <name lang="en" >Simple contact (NC)</name>
-        <name lang="en" >Simple contact (NC)</name>
+        <name lang="fr" >Contact simple (NF)</name>
-        <name lang="fr" >Contact simple (NF)</name>
+        <name lang="es" >Contacto simple (NC)</name>
-        <name lang="es" >Contacto simple (NC)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
+        <input x="5.75" y="3" size="9" text="_" />
-        <input x="5.75" y="3" size="9" text="_" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/simples/qet_directory
+++ b/elements/contacts/simples/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >простые</name>
+        <name lang="en" >Simple</name>
-        <name lang="en" >Simple</name>
+        <name lang="fr" >Simples</name>
-        <name lang="fr" >Simples</name>
+        <name lang="es" >Simples</name>
-        <name lang="es" >Simples</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/temporises/qet_directory
+++ b/elements/contacts/temporises/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >с задержкой</name>
+        <name lang="en" >Switch Delay</name>
-        <name lang="en" >Switch Delay</name>
+        <name lang="fr" >Temporisés</name>
-        <name lang="fr" >Temporisés</name>
+        <name lang="es" >Temporizadores</name>
-        <name lang="es" >Temporizadores</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/temporises/repos/con_simple_nf_tmp_r.elmt
+++ b/elements/contacts/temporises/repos/con_simple_nf_tmp_r.elmt
@@ -1,19 +1,18 @@
-<definition width="40" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="40" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Контакт с задержкой при возврате (НЗ)</name>
+        <name lang="en" >Simple contact (NC / switch-off delay timer)</name>
-        <name lang="en" >Simple contact (NC / switch-off delay timer)</name>
+        <name lang="fr" >Contact simple (NF / tempo repos)</name>
-        <name lang="fr" >Contact simple (NF / tempo repos)</name>
+        <name lang="es" >Contacto simple (NC / temporizador a la deconexión)</name>
-        <name lang="es" >Contacto simple (NC / temporizador a la deconexión)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.5" x1="14" y2="1.5" x2="2.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="1.5" x1="14" y2="1.5" x2="2.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.5" x1="14" y2="-1.5" 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.5" x1="14" y2="-1.5" x2="3" />
+        <arc width="10" x="5" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
-        <arc width="10" x="5" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
+        <input x="17.75" y="3" size="9" text="_" />
-        <input x="17.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/temporises/repos/con_simple_tmp_r.elmt
+++ b/elements/contacts/temporises/repos/con_simple_tmp_r.elmt
@@ -1,18 +1,17 @@
-<definition width="40" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="40" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Контакт с задержкой при возврате (НР)</name>
+        <name lang="en" >Simple contact (switch-off delay timer)</name>
-        <name lang="en" >Simple contact (switch-off delay timer)</name>
+        <name lang="fr" >Contact simple (tempo repos)</name>
-        <name lang="fr" >Contact simple (tempo repos)</name>
+        <name lang="es" >Contacto simple (temporizador a la deconexión)</name>
-        <name lang="es" >Contacto simple (temporizador a la deconexión)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.5" x1="14" y2="1.5" 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.5" x1="14" y2="1.5" x2="-2" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.5" x1="14" y2="-1.5" x2="-2.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="-1.5" x1="14" y2="-1.5" x2="-2.5" />
+        <arc width="10" x="5" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
-        <arc width="10" x="5" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
+        <input x="17.75" y="3" size="9" text="_" />
-        <input x="17.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/temporises/repos/qet_directory
+++ b/elements/contacts/temporises/repos/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >при возврате</name>
+        <name lang="en" >Switch-off delay</name>
-        <name lang="en" >Switch-off delay</name>
+        <name lang="fr" >Repos</name>
-        <name lang="fr" >Repos</name>
+        <name lang="es" >Temporizadores a la deconexión</name>
-        <name lang="es" >Temporizadores a la deconexión</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/contacts/temporises/travail/con_simple_nf_tmp_t.elmt
+++ b/elements/contacts/temporises/travail/con_simple_nf_tmp_t.elmt
@@ -1,19 +1,18 @@
-<definition width="40" version="0.2" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="40" version="0.1" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Контакт с задержкой при срабатывании (НЗ)</name>
+        <name lang="en" >Simple contact (NC / switch-on delay timer)</name>
-        <name lang="en" >Simple contact (NC / switch-on delay timer)</name>
+        <name lang="fr" >Contact simple (NF / tempo travail)</name>
-        <name lang="fr" >Contact simple (NF / tempo travail)</name>
+        <name lang="es" >Contacto simple (NC / temporizador a la conexión)</name>
-        <name lang="es" >Contacto simple (NC / temporizador a la conexión)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.5" x1="-14" y2="1.5" 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.5" x1="-14" y2="1.5" x2="2" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.5" x1="-14" y2="-1.5" x2="2.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="-1.5" x1="-14" y2="-1.5" x2="2.5" />
+        <arc width="10" x="-15" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
-        <arc width="10" x="-15" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
+        <input x="7.75" y="3" size="9" text="_" />
-        <input x="7.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/temporises/travail/con_simple_tmp_t.elmt
+++ b/elements/contacts/temporises/travail/con_simple_tmp_t.elmt
@@ -1,18 +1,17 @@
-<definition width="40" version="0.2" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="40" version="0.1" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Контакт с задержкой при срабатывании (НР)</name>
+        <name lang="en" >Simple contact (switch-on delay timer)</name>
-        <name lang="en" >Simple contact (switch-on delay timer)</name>
+        <name lang="fr" >Contact simple (tempo travail)</name>
-        <name lang="fr" >Contact simple (tempo travail)</name>
+        <name lang="es" >Contacto simple (temporizador a la conexión)</name>
-        <name lang="es" >Contacto simple (temporizador a la conexión)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.5" x1="-14" y2="1.5" 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.5" x1="-14" y2="1.5" x2="-3" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.5" x1="-14" y2="-1.5" 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.5" x1="-14" y2="-1.5" x2="-3" />
+        <arc width="10" x="-15" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
-        <arc width="10" x="-15" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
+        <input x="2.75" y="3" size="9" text="_" />
-        <input x="2.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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="-20" x1="0" y2="-10" x2="0" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/contacts/temporises/travail/qet_directory
+++ b/elements/contacts/temporises/travail/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >при срабатывании</name>
+        <name lang="en" >Switch-on delay</name>
-        <name lang="en" >Switch-on delay</name>
+        <name lang="fr" >Travail</name>
-        <name lang="fr" >Travail</name>
+        <name lang="es" >Temporizadores a la conexión</name>
-        <name lang="es" >Temporizadores a la conexión</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/convertisseurs/blocs/ac1_ac1.elmt
+++ b/elements/convertisseurs/blocs/ac1_ac1.elmt
@@ -1,24 +1,23 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Однофазный перем. ток > Однофазный перем. ток</name>
+        <name lang="fr" >Alternatif monophasé > Alternatif monophasé</name>
-        <name lang="en" >One-phase alternating > One-phase alternating</name>
+        <name lang="en" >One-phase alternating > One-phase alternating</name>
-        <name lang="fr" >Alternatif monophasé > Alternatif monophasé</name>
+        <name lang="es" >Alterna monofásica > Alterna monofásica</name>
-        <name lang="es" >Alterna monofásica > Alterna monofásica</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" 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="-10" x1="-15" y2="-10" x2="-20" />
+        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
+        <arc width="5" x="-7.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
-        <arc width="5" x="-7.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
+        <arc width="5" x="7.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
-        <arc width="5" x="7.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" 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="0" x1="20" y2="0" x2="15" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="-10" 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="-10" x1="15" y2="-10" x2="20" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" 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="0" x1="-20" y2="0" x2="-15" />
+        <arc width="5" x="-12.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
-        <arc width="5" x="-12.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
+        <arc width="5" x="2.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
-        <arc width="5" x="2.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.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="-19.5" x1="14.5" y2="9.5" x2="-14.5" />
+        <terminal x="-21" y="-10" orientation="w" />
-        <terminal x="-21" y="-10" orientation="w" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="-10" orientation="e" />
-        <terminal x="21" y="-10" orientation="e" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/convertisseurs/blocs/ac1_dc.elmt
+++ b/elements/convertisseurs/blocs/ac1_dc.elmt
@@ -1,26 +1,25 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Однофазный перем. ток > Пост. ток</name>
+        <name lang="fr" >Alternatif monophasé > Continu</name>
-        <name lang="en" >One-phase alternating > Direct</name>
+        <name lang="en" >One-phase alternating > Direct</name>
-        <name lang="fr" >Alternatif monophasé > Continu</name>
+        <name lang="es" >Alterna monofásica > Continua</name>
-        <name lang="es" >Alterna monofásica > Continua</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" 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="-10" x1="-15" y2="-10" x2="-20" />
+        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
+        <arc width="5" x="-7.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
-        <arc width="5" x="-7.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" 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="0" x1="20" y2="0" x2="15" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="-10" 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="-10" x1="15" y2="-10" x2="20" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" 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="0" x1="-20" y2="0" x2="-15" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="11" y2="4" x2="12.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="4" x1="11" y2="4" x2="12.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="8" y2="4" x2="9.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="4" x1="8" y2="4" x2="9.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="5" y2="4" x2="6.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="4" x1="5" y2="4" x2="6.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="5" y2="6" x2="12.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="6" x1="5" y2="6" x2="12.5" />
+        <arc width="5" x="-12.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
-        <arc width="5" x="-12.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.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="-19.5" x1="14.5" y2="9.5" x2="-14.5" />
+        <terminal x="-21" y="-10" orientation="w" />
-        <terminal x="-21" y="-10" orientation="w" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="-10" orientation="e" />
-        <terminal x="21" y="-10" orientation="e" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/convertisseurs/blocs/dc_ac1.elmt
+++ b/elements/convertisseurs/blocs/dc_ac1.elmt
@@ -1,26 +1,25 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Пост. ток > Однофазный перем. ток</name>
+        <name lang="fr" >Continu > Alternatif monophasé</name>
-        <name lang="en" >Direct > One-phase alternating</name>
+        <name lang="en" >Direct > One-phase alternating</name>
-        <name lang="fr" >Continu > Alternatif monophasé</name>
+        <name lang="es" >Continua > Alterna monofásica</name>
-        <name lang="es" >Continua > Alterna monofásica</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" 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="-10" x1="-15" y2="-10" x2="-20" />
+        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
+        <arc width="5" x="7.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
-        <arc width="5" x="7.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" 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="0" x1="20" y2="0" x2="15" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="-10" 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="-10" x1="15" y2="-10" x2="20" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" 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="0" x1="-20" y2="0" x2="-15" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-11" y2="-17" x2="-12.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="-11" y2="-17" x2="-12.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-8" y2="-17" x2="-9.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="-8" y2="-17" x2="-9.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-5" y2="-17" x2="-6.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="-5" y2="-17" x2="-6.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-5" y2="-15" x2="-12.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="-15" x1="-5" y2="-15" x2="-12.5" />
+        <arc width="5" x="2.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
-        <arc width="5" x="2.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.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="-19.5" x1="14.5" y2="9.5" x2="-14.5" />
+        <terminal x="-21" y="-10" orientation="w" />
-        <terminal x="-21" y="-10" orientation="w" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="-10" orientation="e" />
-        <terminal x="21" y="-10" orientation="e" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/convertisseurs/blocs/dc_dc.elmt
+++ b/elements/convertisseurs/blocs/dc_dc.elmt
@@ -1,28 +1,27 @@
-<definition width="50" version="0.2" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
+<definition width="50" version="0.1" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn" >
-    <names>
+    <names>
-        <name lang="ru" >Пост. ток > Пост. ток</name>
+        <name lang="fr" >Continu > Continu</name>
-        <name lang="en" >Direct > Direct</name>
+        <name lang="en" >Direct > Direct</name>
-        <name lang="fr" >Continu > Continu</name>
+        <name lang="es" >Continua > Continua</name>
-        <name lang="es" >Continua > Continua</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" 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="-10" x1="-15" y2="-10" x2="-20" />
+        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" 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="0" x1="20" y2="0" x2="15" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="-10" 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="-10" x1="15" y2="-10" x2="20" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" 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="0" x1="-20" y2="0" x2="-15" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="11" y2="4" x2="12.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="4" x1="11" y2="4" x2="12.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="8" y2="4" x2="9.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="4" x1="8" y2="4" x2="9.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="5" y2="4" x2="6.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="4" x1="5" y2="4" x2="6.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="5" y2="6" x2="12.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="6" x1="5" y2="6" x2="12.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-11" y2="-17" x2="-12.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="-11" y2="-17" x2="-12.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-8" y2="-17" x2="-9.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="-8" y2="-17" x2="-9.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-5" y2="-17" x2="-6.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="-5" y2="-17" x2="-6.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-5" y2="-15" x2="-12.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="-15" x1="-5" y2="-15" x2="-12.5" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.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="-19.5" x1="14.5" y2="9.5" x2="-14.5" />
+        <terminal x="-21" y="-10" orientation="w" />
-        <terminal x="-21" y="-10" orientation="w" />
+        <terminal x="-21" y="0" orientation="w" />
-        <terminal x="-21" y="0" orientation="w" />
+        <terminal x="21" y="-10" orientation="e" />
-        <terminal x="21" y="-10" orientation="e" />
+        <terminal x="21" y="0" orientation="e" />
-        <terminal x="21" y="0" orientation="e" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/haute_tension/qet_directory
+++ b/elements/haute_tension/qet_directory
@@ -2,7 +2,6 @@
    <names>
        <name lang="ru" >Высокое напряжение</name>
        <name lang="en" >High voltage</name>
-        <name lang="fr" >Haute tension</name>
+        <name lang="fr" >Haute tension</name>
        <name lang="es" >Alta tensión</name>
    </names>
 </qet-directory>
--- a/elements/protections/au.elmt
+++ b/elements/protections/au.elmt
@@ -1,21 +1,20 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Аварийный стоп</name>
+        <name lang="en" >Emergency stop (NC)</name>
-        <name lang="en" >Emergency stop (NC)</name>
+        <name lang="fr" >Arrêt d'urgence (NF)</name>
-        <name lang="fr" >Arrêt d'urgence (NF)</name>
+        <name lang="es" >Parada de emergencia (NC)</name>
-        <name lang="es" >Parada de emergencia (NC)</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="true" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-4" y2="0" x2="-1" />
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-4" y2="0" x2="-1" />
+        <arc width="8" x="-11" y="-5" antialias="true" height="10" style="line-style:dashed;line-weight:thin;filling:none;color:black" start="-90" angle="-180" />
-        <arc width="8" x="-11" y="-5" antialias="true" height="10" style="line-style:dashed;line-weight:thin;filling:none;color:black" start="-90" angle="-180" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-4" y2="0" 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="-2" x1="-4" y2="0" x2="-4" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" 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:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
+        <input x="5.75" y="3" size="9" text="_" />
-        <input x="5.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-7" y2="5" 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="-5" x1="-7" y2="5" x2="-7" />
+        <line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-7" y2="0" x2="3" />
-        <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="-7" y2="0" x2="3" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/protections/disjoncteurs/disjoncteur1.elmt
+++ b/elements/protections/disjoncteurs/disjoncteur1.elmt
@@ -1,6 +1,5 @@
 <definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Выключатель</name>
        <name lang="en" >Circuit-breaker</name>
        <name lang="fr" >Disjoncteur</name>
        <name lang="es" >Interruptor magnetotérmico</name>
--- a/elements/protections/disjoncteurs/disjoncteur2.elmt
+++ b/elements/protections/disjoncteurs/disjoncteur2.elmt
@@ -1,6 +1,5 @@
 <definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Выключатель</name>
        <name lang="en" >Circuit-breaker</name>
        <name lang="fr" >Disjoncteur</name>
        <name lang="es" >Interruptor magnetotérmico</name>
--- a/elements/protections/disjoncteurs/disjoncteur3.elmt
+++ b/elements/protections/disjoncteurs/disjoncteur3.elmt
@@ -1,6 +1,5 @@
 <definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Выключатель</name>
        <name lang="en" >Circuit-breaker</name>
        <name lang="fr" >Disjoncteur</name>
        <name lang="es" >Interruptor magnetotérmico</name>
--- a/elements/protections/disjoncteurs/disjoncteur4.elmt
+++ b/elements/protections/disjoncteurs/disjoncteur4.elmt
@@ -1,6 +1,5 @@
 <definition width="50" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Выключатель</name>
        <name lang="en" >Circuit-breaker</name>
        <name lang="fr" >Disjoncteur</name>
        <name lang="es" >Interruptor magnetotérmico</name>
--- a/elements/protections/disjoncteurs/disjoncteur5.elmt
+++ b/elements/protections/disjoncteurs/disjoncteur5.elmt
@@ -1,6 +1,5 @@
 <definition width="50" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Выключатель</name>
        <name lang="en" >Circuit-breaker</name>
        <name lang="fr" >Disjoncteur</name>
        <name lang="es" >Interruptor magnetotérmico</name>
--- a/elements/protections/disjoncteurs/disjoncteur6.elmt
+++ b/elements/protections/disjoncteurs/disjoncteur6.elmt
@@ -1,6 +1,5 @@
 <definition width="50" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Выключатель</name>
        <name lang="en" >Circuit-breaker</name>
        <name lang="fr" >Disjoncteur</name>
        <name lang="es" >Interruptor magnetotérmico</name>
--- a/elements/protections/disjoncteurs/qet_directory
+++ b/elements/protections/disjoncteurs/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Выключатели</name>
+        <name lang="en" >Circuit-breakers</name>
-        <name lang="en" >Circuit-breakers</name>
+        <name lang="fr" >Disjoncteurs</name>
-        <name lang="fr" >Disjoncteurs</name>
+        <name lang="es" >Interruptores magnetotérmicos</name>
-        <name lang="es" >Interruptores magnetotérmicos</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/protections/disjoncteurs_differentiels/ddr1.elmt
+++ b/elements/protections/disjoncteurs_differentiels/ddr1.elmt
@@ -1,6 +1,5 @@
 <definition width="50" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Дифавтомат</name>
        <name lang="en" >Differential circuit-breaker</name>
        <name lang="fr" >Disjoncteur différentiel</name>
        <name lang="es" >Dispositivo diferenciale residual</name>
--- a/elements/protections/disjoncteurs_differentiels/ddr2.elmt
+++ b/elements/protections/disjoncteurs_differentiels/ddr2.elmt
@@ -1,6 +1,5 @@
 <definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Дифавтомат</name>
        <name lang="en" >Differential circuit-breaker</name>
        <name lang="fr" >Disjoncteur différentiel</name>
        <name lang="es" >Dispositivo diferenciale residual</name>
--- a/elements/protections/disjoncteurs_differentiels/ddr3.elmt
+++ b/elements/protections/disjoncteurs_differentiels/ddr3.elmt
@@ -1,6 +1,5 @@
 <definition width="60" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Дифавтомат</name>
        <name lang="en" >Differential circuit-breaker</name>
        <name lang="fr" >Disjoncteur différentiel</name>
        <name lang="es" >Dispositivo diferenciale residual</name>
--- a/elements/protections/disjoncteurs_differentiels/ddr4.elmt
+++ b/elements/protections/disjoncteurs_differentiels/ddr4.elmt
@@ -1,6 +1,5 @@
 <definition width="70" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Дифавтомат</name>
        <name lang="en" >Differential circuit-breaker</name>
        <name lang="fr" >Disjoncteur différentiel</name>
        <name lang="es" >Dispositivo diferenciale residual</name>
--- a/elements/protections/disjoncteurs_differentiels/ddr5.elmt
+++ b/elements/protections/disjoncteurs_differentiels/ddr5.elmt
@@ -1,6 +1,5 @@
 <definition width="80" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Дифавтомат</name>
        <name lang="en" >Differential circuit-breaker</name>
        <name lang="fr" >Disjoncteur différentiel</name>
        <name lang="es" >Dispositivo diferenciale residual</name>
--- a/elements/protections/disjoncteurs_differentiels/ddr6.elmt
+++ b/elements/protections/disjoncteurs_differentiels/ddr6.elmt
@@ -1,6 +1,5 @@
 <definition width="80" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >Дифавтомат</name>
        <name lang="en" >Differential circuit-breaker</name>
        <name lang="fr" >Disjoncteur différentiel</name>
        <name lang="es" >Dispositivo diferenciale residual</name>
--- a/elements/protections/disjoncteurs_differentiels/qet_directory
+++ b/elements/protections/disjoncteurs_differentiels/qet_directory
@@ -1,8 +1,7 @@
-<qet-directory>
+<qet-directory>
-    <names>
+    <names>
-        <name lang="ru" >Дифавтоматы</name>
+        <name lang="en" >Differential circuit-breakers</name>
-        <name lang="en" >Differential circuit-breakers</name>
+        <name lang="fr" >Disjoncteurs différentiels</name>
-        <name lang="fr" >Disjoncteurs différentiels</name>
+        <name lang="es" >Dispositivos diferenciales residuales</name>
-        <name lang="es" >Dispositivos diferenciales residuales</name>
+    </names>
-    </names>
+</qet-directory>
 </qet-directory>
--- a/elements/protections/int_sect.elmt
+++ b/elements/protections/int_sect.elmt
@@ -1,17 +1,16 @@
-<definition width="30" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
-    <names>
+    <names>
-        <name lang="ru" >Выключатель-разъеденитель</name>
+        <name lang="en" >Switch disconnector</name>
-        <name lang="en" >Switch disconnector</name>
+        <name lang="fr" >Interrupteur sectionneur</name>
-        <name lang="fr" >Interrupteur sectionneur</name>
+        <name lang="es" >Interruptor seccionador</name>
-        <name lang="es" >Interruptor seccionador</name>
+    </names>
-    </names>
+    <description>
-    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-12.5" 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="-20" x1="0" y2="-12.5" x2="0" />
+        <input x="2.75" y="3" size="9" text="_" />
-        <input x="2.75" y="3" size="9" text="_" />
+        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.5" x1="2" y2="-12.5" 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="-12.5" x1="2" y2="-12.5" x2="-2" />
+        <circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
-        <circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
+        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="-21" orientation="n" />
+        <terminal x="0" y="21" orientation="s" />
-        <terminal x="0" y="21" orientation="s" />
+    </description>
-    </description>
+</definition>
 </definition>
--- a/elements/protections/interrupteurs_differentiels/int_diff1.elmt
+++ b/elements/protections/interrupteurs_differentiels/int_diff1.elmt
@@ -1,6 +1,5 @@
 <definition width="50" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >УЗО</name>
        <name lang="en" >Differential switch</name>
        <name lang="fr" >Interrupteur différentiel</name>
        <name lang="es" >Interruptor diferencial</name>
--- a/elements/protections/interrupteurs_differentiels/int_diff2.elmt
+++ b/elements/protections/interrupteurs_differentiels/int_diff2.elmt
@@ -1,6 +1,5 @@
 <definition width="60" version="0.2" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
    <names>
        <name lang="ru" >УЗО</name>
        <name lang="en" >Differential switch</name>
        <name lang="fr" >Interrupteur différentiel</name>
        <name lang="es" >Interruptor diferencial</name>
--- a/Show More
+++ b/Show More