do not save conductorproperties in own child, but as part of conductor

CMakeLists.txt

@@ -131,32 +131,3 @@ target_include_directories(
   ${QET_DIR}/sources/factory/ui
   ${QET_DIR}/sources/print
   )
-
-install(TARGETS ${PROJECT_NAME})
-if (NOT MINGW)
-
-install(DIRECTORY ico/breeze-icons/16x16 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/22x22 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/32x32 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/48x48 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/64x64 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY elements DESTINATION share/qelectrotech)
-install(DIRECTORY examples DESTINATION share/qelectrotech)
-install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
-install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
-install(FILES misc/qelectrotech.desktop DESTINATION share/applications)
-install(FILES misc/x-qet-element.xml
-              misc/x-qet-project.xml
-              misc/x-qet-titleblock.xml
-              DESTINATION share/mime/application)
-install(FILES misc/x-qet-element.desktop
-              misc/x-qet-project.desktop
-              misc/x-qet-titleblock.desktop
-              DESTINATION share/mimelnk/application)
-install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
-install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
-install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
-
-endif()

README.md

@@ -15,10 +15,10 @@ The main goal of the developers is to provide a libre, easy to use and effective
 
 ### Version
 
-The current stable version is 0.80 and was released on 2021.02.21.  
+The current stable version is 0.70 and was released on 2019.07.13.  
 Once it has been officialy released, the stable version is always frozen and is no longer developed.
 
-New functionalities, bug and issue fixings are further made in the development version (currently 0.9), which can also be [downloaded](https://qelectrotech.org/download.html).
+New functionalities, bug and issue fixings are further made in the development version (currently 0.8), which can also be [downloaded](https://qelectrotech.org/download.html).
 
 Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partialy implemented until they are done!
 
@@ -33,7 +33,6 @@ Like many other open source softwares, QElectroTech is provided as it is, withou
 ### Development / technical choices
 
 The development follows the classical way of free and open source software: the source code, written by a community of users, is freely accessible.
-If you are reading this on Github, be aware that this is an hourly synced mirror. Our real code repository [is located here](https://git.tuxfamily.org/qet/qet.git/).
 
 Here are the technical choices made for the software development:
 
@@ -154,52 +153,6 @@ Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format im
 *   conductors num can be exported to csv file.
 *   ***
 
-Nomenclature
-
-A new nomenclature tool appears in the menu: project -> Add a nomenclature.
-The nomenclature is presented in the form of a configurable table separated into two parts: the display (the form) and the content (the background).  
-- Display: the size and position of the table, the margins between text and the table cell, the alignment of the text in the cells and the font. The configuration of the table headers and the table itself are separate.  
-- Content: the information to display in the table and the order in which it should be displayed.  
-
-![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
-
-In order to speed up the establishment of a nomenclature, it is possible to export / import the display and content configurations separately. This is the "Configuration" part that can be seen in the photos above.  
-
-Behind the scenes, an SQLite database does the work, so setting up the content is nothing more or less than an SQL query created using a dialog (screenshot by right).  
-The SQL query is configured as follows (from top to bottom in the screenshot):  
-- “Available information”: the information to display;  
-- "Filter": filter the information (is not empty, is empty, contains, does not contain, is equal to, is not equal to) only one filter can be applied per information, it is not possible combine several;  
-- "Type of elements": allows you to filter on what type of element you want to obtain information.  
-
-At the bottom, a checkmark "SQL query" allows you to edit a personalized query, if the basic options are not sufficient.  
-
-When a nomenclature is too large to be contained in a single folio, it is possible to separate it on several folios, the tables of each folio are then linked together. When creating a nomenclature, this option is activated by default, which has the effect of adding the necessary number of folios, adding a table in each of them and linking them together.  
-
-Finally two buttons are available in the property panel:    
-- "Fit the table to the folio": positions and adjusts the size and determines the number of rows in the table in relation to the folio;  
-- "Apply geometry to all tables linked to this one": applies the three properties mentioned above to all linked tables in order to save time and maintain aesthetic consistency.  
-
-And to finish a table   
-![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/tableau.png "table")
-
-
-Summary
-
-The old summary has been completely removed from the code in order to make room for the new one which is exactly the same as the nomenclature (a large amount of the code is common), with the exception of the SQL query (and its dialog to configure it) which offers specific information for editing a summary.  
-
-Export of the internal database  
-
-The database used by the nomenclature and the summary can be exported in a “.sqlite” file.  
-Currently this is irrelevant, as the function was created during development for debugging purposes, we left it.  
-Note that the database will become increasingly important in the future of Qet.  
-
-
-Export of the wiring list  
-
-In order to be able to use the wiring number printers more easily, the names of conductors can be exported in CSV format, the export respects the quantity of conductors in order to print the right quantity of numbers, for example a potential numbered 240 composed of 3 wires will give 6 × 240 (2 numbers per wire × 3 wires) in the CSV. 
-
-
-
 ### Story
 
 The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.  
@@ -220,6 +173,6 @@ If you love QElectroTech, you can help developers to buy new hardware to test
 and implement new features. Thanks in advance for your generous donations.
 
 For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)  
-
+or at [leetchi.com](https://www.leetchi.com/c/qelectroteck)
 
 

build-aux/flatpak/org.qelectrotech.QElectroTech.json

@@ -10,61 +10,17 @@
   "copy-icon": true,
   "finish-args": [
     "--socket=wayland",
-    "--socket=fallback-x11",
+    "--socket=x11",
     "--device=dri",
     "--share=ipc",
     "--filesystem=host"
   ],
   "modules": [
-    {
-      "name": "tkinter",
-      "buildsystem": "simple",
-      "build-commands": [
-         "pip3 install --prefix=${FLATPAK_DEST} ."
-            ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/iwalton3/tkinter-standalone",
-          "commit": "2301112d142ebaf7532b25600c77d1a2edc9ef04"
-        }
-            ],
-      "modules": [
-                {
-          "name": "tcl",
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tcl8.6.11-src.tar.gz",
-              "sha256": "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258"
-            }
-          ],
-          "subdir": "unix",
-          "post-install": [
-              "chmod +w ${FLATPAK_DEST}/lib/libtcl8.6.so"
-          ]
-                },
-                {
-          "name": "tk",
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tk8.6.11-src.tar.gz",
-              "sha256": "5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282"
-            }
-          ],
-          "subdir": "unix",
-          "post-install": [
-              "chmod +w ${FLATPAK_DEST}/lib/libtk8.6.so"
-          ]
-                }
-      ]
-    },
     {
       "name": "qelectrotech",
       "buildsystem": "qmake",
       "post-install": [
-        "mv ${FLATPAK_DEST}/share/mime/packages/qelectrotech.xml ${FLATPAK_DEST}/share/mime/packages/org.qelectrotech.QElectroTech.xml"
+        "mv /app/share/mime/packages/qelectrotech.xml /app/share/mime/packages/org.qelectrotech.QElectroTech.xml"
       ],
       "sources": [
         {
@@ -76,34 +32,6 @@
           "path": "patches/0001-build-Fix-the-installation-paths.patch"
         }
       ]
-    },
-    {
-    "name": "python3-PySimpleGUI",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
-            "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
-        }
-    ]
-},
-    {
-    "name": "python3-qet-tb-generator",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} qet-tb-generator"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/45/be/d5940d365ebf256e490bc6c10837244e0b8dda08a7d790691767263c318d/qet_tb_generator-1.2.5.tar.gz",
-            "sha256": "37c3298602244f3152fbb7601caba9b4862bac782991fbb472eab91afb70d09c"
     }
   ]
-}
-  ]
 }

build-aux/snap/snapcraft.yaml

@@ -60,7 +60,6 @@ parts:
     plugin: python
     python-version: python3
     source: https://github.com/qelectrotech/qet_tb_generator.git
-    python-packages: [PySimpleGUI]
     stage-packages: 
       - python3-lxml
       - python3-tk

cmake/define_definitions.cmake

@@ -39,12 +39,10 @@ if(${QET_LANG_PATH} STRGREATER "")
   message("QET_LANG_PATH              " ${INSTALL_PREFIX}${QET_LANG_PATH})
   add_definitions(-DQET_LANG_PATH=${INSTALL_PREFIX}${QET_LANG_PATH})
 endif()
-if (NOT MINGW)
 if(${QET_EXAMPLES_PATH} STRGREATER "")
   message("QET_EXAMPLES_PATH          " ${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
   add_definitions(-DQET_EXAMPLES_PATH=${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
 endif()
-endif()
 
 message("QET_LICENSE_PATH           " ${QET_LICENSE_PATH})
 message("QET_MIME_XML_PATH          " ${QET_MIME_XML_PATH})

cmake/fetch_kdeaddons.cmake

@@ -19,9 +19,9 @@ message(" - fetch_kdeaddons")
 if(DEFINED BUILD_WITH_KF5)
   Include(FetchContent)
 
-  option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES)
+  set(BUILD_KF5_YES "YES")
 
-  if(BUILD_KF5)
+  if(DEFINED BUILD_KF5_YES)
 
     if(NOT DEFINED KF5_GIT_TAG)
       #https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924

cmake/fetch_pugixml.cmake

@@ -18,16 +18,9 @@ message(" - fetch_pugixml")
 
 Include(FetchContent)
 
-option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
+FetchContent_Declare(
-
-if(BUILD_PUGIXML)
-
-  FetchContent_Declare(
   pugixml
   GIT_REPOSITORY https://github.com/zeux/pugixml.git
   GIT_TAG        v1.11.4)
 
-  FetchContent_MakeAvailable(pugixml)
+FetchContent_MakeAvailable(pugixml)
-else()
-  find_package(pugixml REQUIRED)
-endif()

cmake/git_last_commit_sha.cmake

@@ -28,6 +28,9 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
   # This strips terminating newline in the variable
   string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}")
 
+  # This adds to definitions => .cpp
+  add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")
+
   if(NOT GIT_COMMIT_RESULT EQUAL "0")
     message(
       FATAL_ERROR
@@ -36,6 +39,3 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
       ", please check")
   endif()
 endif()
-
-# This adds to definitions => .cpp
-add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")

cmake/qet_compilation_vars.cmake

@@ -113,6 +113,9 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/conductorsegmentprofile.h
   ${QET_DIR}/sources/configdialog.cpp
   ${QET_DIR}/sources/configdialog.h
+  ${QET_DIR}/sources/configpage.h
+  ${QET_DIR}/sources/configpages.cpp
+  ${QET_DIR}/sources/configpages.h
   ${QET_DIR}/sources/createdxf.cpp
   ${QET_DIR}/sources/createdxf.h
   ${QET_DIR}/sources/diagramcommands.cpp
@@ -158,6 +161,8 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/main.cpp
   ${QET_DIR}/sources/newelementwizard.cpp
   ${QET_DIR}/sources/newelementwizard.h
+  ${QET_DIR}/sources/projectconfigpages.cpp
+  ${QET_DIR}/sources/projectconfigpages.h
   ${QET_DIR}/sources/projectview.cpp
   ${QET_DIR}/sources/projectview.h
   ${QET_DIR}/sources/qetapp.cpp
@@ -378,8 +383,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/properties/terminaldata.h
   ${QET_DIR}/sources/properties/xrefproperties.cpp
   ${QET_DIR}/sources/properties/xrefproperties.h
-  ${QET_DIR}/sources/properties/userproperties.cpp
-  ${QET_DIR}/sources/properties/userproperties.h
 
   ${QET_DIR}/sources/PropertiesEditor/propertieseditordialog.h
   ${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.cpp
@@ -576,13 +579,9 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/ui/titleblockpropertieswidget.h
   ${QET_DIR}/sources/ui/xrefpropertieswidget.cpp
   ${QET_DIR}/sources/ui/xrefpropertieswidget.h
-  ${QET_DIR}/sources/ui/configpage/configpage.h
-  ${QET_DIR}/sources/ui/configpage/configpages.cpp
-  ${QET_DIR}/sources/ui/configpage/configpages.h
   ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.cpp
+
   ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.h
-  ${QET_DIR}/sources/ui/configpage/projectconfigpages.cpp
-  ${QET_DIR}/sources/ui/configpage/projectconfigpages.h
 
   ${QET_DIR}/sources/undocommand/addelementtextcommand.cpp
   ${QET_DIR}/sources/undocommand/addelementtextcommand.h

elements/10_electric/10_allpole/100_folio_referencing/01coming_arrow.elmt

@@ -14,7 +14,7 @@
         <name lang="hu">Beérkező hivatkozás</name>
         <name lang="nl">Referentie Vorig</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon x2="-1" y2="4" y4="-4" x1="-1" x3="9" y3="0" closed="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" x4="-1" antialias="true"/>

elements/10_electric/10_allpole/100_folio_referencing/02going_arrow.elmt

@@ -14,7 +14,7 @@
         <name lang="ru">Следующая страница</name>
         <name lang="cs">Další list</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon y3="0" y2="4" x4="-9" x3="2" x1="-9" x2="-9" y4="-4" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" closed="false" antialias="true"/>

elements/10_electric/10_allpole/110_network_supplies/ground1.elmt

@@ -29,7 +29,7 @@
         <elementInformation name="plant" show="1"></elementInformation>
         <elementInformation name="label" show="1"></elementInformation>
     </elementInformations>
-    <informations>titus
+    <informations>titus&#xd;
 titus0818@yahoo.com</informations>
     <description>
         <line y1="-16" x1="0" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="13" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>

elements/10_electric/10_allpole/110_network_supplies/src_1pn.elmt

@@ -15,7 +15,7 @@
         <name lang="ru">Однополюсный + нейтраль</name>
 	<name lang="hu">F + N</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-5" y="-25.45" tagg="label" size="9" rotate="true" text="_"/>

elements/10_electric/10_allpole/110_network_supplies/src_3p.elmt

@@ -15,7 +15,7 @@
         <name lang="ru">Трёхполюсный</name>
 	<name lang="hu">3F</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-2" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>

elements/10_electric/10_allpole/110_network_supplies/src_3pn.elmt

@@ -15,7 +15,7 @@
         <name lang="ru">Трёхполюсный + нейтраль</name>
 	<name lang="hu">3F + N</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-7" y="-44.45" tagg="label" size="9" rotate="true" text="_"/>

elements/10_electric/10_allpole/110_network_supplies/src_p.elmt

@@ -15,7 +15,7 @@
         <name lang="ru">Фаза</name>
 	<name lang="hu">F</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="-6" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>

elements/10_electric/10_allpole/110_network_supplies/terre.elmt

@@ -28,7 +28,7 @@
         <elementInformation name="plant" show="1"></elementInformation>
         <elementInformation name="label" show="1"></elementInformation>
     </elementInformations>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <dynamic_text uuid="{0af57a27-1887-4576-8b51-200ca996e582}" Halignment="AlignLeft" frame="false" x="2" Valignment="AlignTop" text_from="ElementInfo" y="-22.5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="1" rotation="0" text_width="-1">

elements/10_electric/10_allpole/114_connections/bod.elmt

@@ -1,23 +1,17 @@
-<definition width="20" version="0.90" type="element" height="20" hotspot_y="9" link_type="simple" hotspot_x="9">
+<definition width="20" height="20" hotspot_y="9" type="element" link_type="simple" hotspot_x="9" version="0.60">
-    <uuid uuid="{1eefef79-1c23-413b-873a-3d84f4aa5c25}"/>
+    <uuid uuid="{079913f8-18b5-4524-84bd-aadf75dfefbf}"/>
     <names>
-        <name lang="fr">connexion</name>
-        <name lang="en">connection</name>
         <name lang="cs">Bod</name>
         <name lang="de">Verbindung</name>
         <name lang="hu">Keresztezés pont alakzatban</name>
     </names>
-    <elementInformations/>
     <informations></informations>
     <description>
-        <circle y="-2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" diameter="4" x="-2"/>
+        <circle diameter="4" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-2" x="-2"/>
-        <dynamic_text y="-14.5" Valignment="AlignTop" keep_visual_rotation="false" text_from="ElementInfo" uuid="{2aef950d-c62d-4d3c-939b-3e81653d5244}" Halignment="AlignLeft" x="-11" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" z="2" text_width="-1" frame="false">
+        <input rotate="true" text=" " tagg="label" size="9" y="-3" x="-11"/>
-            <text></text>
+        <terminal orientation="e" y="0" x="2"/>
-            <info_name>label</info_name>
+        <terminal orientation="w" y="0" x="-2"/>
-        </dynamic_text>
+        <terminal orientation="s" y="2" x="0"/>
-        <terminal y="0" type="Generic" uuid="{9cc2fc56-976f-49ac-a0f8-63eb85f716c2}" orientation="e" x="2" name=""/>
+        <terminal orientation="n" y="-2" x="0"/>
-        <terminal y="0" type="Generic" uuid="{3c4b4f5e-98a2-4daa-9a47-40b8e018166e}" orientation="w" x="-2" name=""/>
-        <terminal y="2" type="Generic" uuid="{8d99aa04-def0-4573-a0e8-41229ed2f1dc}" orientation="s" x="0" name=""/>
-        <terminal y="-2" type="Generic" uuid="{f2e49ff6-ee59-492e-a6ad-82708479afd6}" orientation="n" x="0" name=""/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/lphd.elmt

@@ -1,24 +1,22 @@
-<definition type="element" width="30" hotspot_y="12" version="0.90" height="30" link_type="simple" hotspot_x="14">
+<definition hotspot_x="14" height="30" link_type="simple" width="30" version="0.80" type="element" hotspot_y="12">
-    <uuid uuid="{9b3513fd-694f-4fc7-8b7e-66b733b9b4e1}"/>
+    <uuid uuid="{0b6817fe-dd44-42a8-8e7c-3c110d13b8a2}"/>
     <names>
+        <name lang="hu">Egyesítő négy vezetékhez</name>
         <name lang="de">Klemmstelle (3)</name>
         <name lang="cs">Všestranný spoj</name>
-        <name lang="hu">Egyesítő négy vezetékhez</name>
-        <name lang="fr">
-Connecteur pour quatre fils</name>
     </names>
     <elementInformations/>
     <informations></informations>
     <description>
-        <dynamic_text frame="false" text_width="-1" rotation="0" Halignment="AlignLeft" y="-12" x="-13" keep_visual_rotation="true" uuid="{14c0b70c-c028-49ef-bf72-3c3c9cd64669}" Valignment="AlignTop" z="2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo">
+        <dynamic_text Valignment="AlignTop" x="-13" text_from="ElementInfo" text_width="-1" z="2" uuid="{14c0b70c-c028-49ef-bf72-3c3c9cd64669}" y="-12" rotation="0" frame="false" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <polygon x1="-10" y2="0" x4="5" y3="5" x3="0" x5="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y4="0" antialias="false" x2="-5" y5="0" closed="false"/>
+        <polygon x1="-10" y5="0" x3="0" x5="10" y2="0" y3="5" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="5" x2="-5" antialias="false" y4="0" y1="0"/>
-        <line x1="0" y2="10" length2="1.5" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y1="-5" antialias="false" x2="0"/>
+        <line x1="0" end1="none" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" length1="1.5" antialias="false" end2="none" y1="-5" length2="1.5"/>
-        <terminal type="Generic" name="" y="0" x="10" uuid="{06bf5c9f-6986-45bf-b11f-02e876abc4b8}" orientation="e"/>
+        <terminal x="10" orientation="e" uuid="{06bf5c9f-6986-45bf-b11f-02e876abc4b8}" y="0" name=""/>
-        <terminal type="Generic" name="" y="-5" x="0" uuid="{33c03677-8555-4b42-ae2c-4b4308978086}" orientation="n"/>
+        <terminal x="0" orientation="n" uuid="{33c03677-8555-4b42-ae2c-4b4308978086}" y="-5" name=""/>
-        <terminal type="Generic" name="" y="0" x="-10" uuid="{95bef6e9-343e-45d7-9705-4aa81f62bed0}" orientation="w"/>
+        <terminal x="-10" orientation="w" uuid="{95bef6e9-343e-45d7-9705-4aa81f62bed0}" y="0" name=""/>
-        <terminal type="Generic" name="" y="10" x="0" uuid="{e9329e22-255b-4763-9dc6-65da277e1ac7}" orientation="s"/>
+        <terminal x="0" orientation="s" uuid="{e9329e22-255b-4763-9dc6-65da277e1ac7}" y="10" name=""/>
     </description>
 </definition>

elements/10_electric/10_allpole/120_cables&wiring/cable.elmt

@@ -10,7 +10,7 @@
         <name lang="cs">Kabel 3G</name>
         <name lang="hu">Kábel 2 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <text x="12" y="9" size="4" text="2"/>

elements/10_electric/10_allpole/120_cables&wiring/cable1.elmt

@@ -10,7 +10,7 @@
         <name lang="cs">Kabel 4G</name>
         <name lang="hu">Kábel 3 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-12.05" y2="11.95" x2="-8.05"/>

elements/10_electric/10_allpole/120_cables&wiring/cable2.elmt

@@ -10,7 +10,7 @@
         <name lang="cs">Kabel 3G</name>
         <name lang="hu">Kábel 2 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="17.95" y2="11.95" x2="21.95"/>

elements/10_electric/10_allpole/120_cables&wiring/cable3.elmt

@@ -8,7 +8,7 @@
         <name lang="cs">Kabel 4G</name>
         <name lang="hu">Kábel 3 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-33.05" y2="11.95" x2="-29.05"/>

elements/10_electric/10_allpole/120_cables&wiring/cable5.elmt

@@ -8,7 +8,7 @@
         <name lang="cs">Kabel 5G</name>
         <name lang="hu">Kábel 4 + N + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line end1="none" x1="-42.05" y1="7.95" x2="-38.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

elements/10_electric/10_allpole/120_cables&wiring/cable6.elmt

@@ -8,7 +8,7 @@
         <name lang="cs">Kabel 3G</name>
         <name lang="hu">Kábel 2 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line end1="none" x1="-23.05" y1="7.95" x2="-19.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>

elements/10_electric/10_allpole/120_cables&wiring/kabel3g.elmt

@@ -7,7 +7,7 @@
         <name lang="hu">Kábel 2 + PE</name>
     </names>
     <elementInformations/>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line x2="1.95" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05" length2="1.5" antialias="true" y2="1.95" end2="none" x1="-2.05" length1="1.5"/>

elements/10_electric/10_allpole/120_cables&wiring/kabel4g.elmt

@@ -10,7 +10,7 @@
         <name lang="fr">Cable 3 phases+terre</name>
         <name lang="hu">Kábel 3 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line x1="-2.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="1.95" y2="1.95" antialias="true"/>

elements/10_electric/10_allpole/120_cables&wiring/kabel7g.elmt

@@ -10,7 +10,7 @@
         <name lang="fr">Cable 6 phases+terre</name>
         <name lang="hu">Kábel 6 + PE</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input size="4" tagg="none" rotate="true" x="38" y="-4" text="6"/>

elements/10_electric/10_allpole/120_cables&wiring/section1conducteur.elmt

@@ -9,7 +9,7 @@
         <name lang="es">Sección 1 conductor</name>
         <name lang="hu">1 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="false" length1="1.5" x2="9.91885" end2="none" x1="-10.8483" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>

elements/10_electric/10_allpole/120_cables&wiring/section2-1conducteurs.elmt

@@ -9,7 +9,7 @@
         <name lang="es">Sección 2 conductores</name>
         <name lang="hu">2 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>

elements/10_electric/10_allpole/120_cables&wiring/section2conducteurs.elmt

@@ -9,7 +9,7 @@
         <name lang="es">Sección 2 conductores</name>
         <name lang="hu">2 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="true" length1="1.5" x2="21.95" end2="none" x1="17.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>

elements/10_electric/10_allpole/120_cables&wiring/section3.elmt

@@ -9,7 +9,7 @@
         <name lang="es">Sección 3 conductores</name>
         <name lang="hu">3 ér keresztmetszet</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/porte_fusible_bi.elmt

@@ -14,7 +14,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-15" y2="10" x2="-10" y3="20" x3="-10"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/sectionneur_3_fusibles+neutre.elmt

@@ -15,7 +15,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="30" y3="20" x3="30"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/sectionneur_3_fusibles.elmt

@@ -15,7 +15,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-33" y2="0" x2="-26"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/sectionneur_fusible_bi.elmt

@@ -15,7 +15,7 @@
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>
     </kindInformations>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-15" y2="10" x2="-10" y3="20" x3="-10"/>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/eclateur.elmt

@@ -12,7 +12,6 @@
         <name lang="pt">Descarregador de faísca</name>
         <name lang="fr">Éclateur</name>
         <name lang="nl">Vonkbrug</name>
-        <name lang="hu">Szikraköz</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/mov.elmt

@@ -8,7 +8,6 @@
         <name lang="cs">Varistor</name>
         <name lang="it">Varistore Metal-oxide</name>
         <name lang="nl">Varistor Metal-oxide</name>
-        <name lang="hu">Fém-oxid varisztor</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre-2.elmt

@@ -10,11 +10,10 @@
         <name lang="el">Προστασία από υπέρταση</name>
         <name lang="fr">Parafoudre</name>
         <name lang="en">Surge protection</name>
-        <name lang="hu">Túlfeszültség védő</name>
         <name lang="es">Protección contra descargas 2</name>
     </names>
     <elementInformations/>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <dynamic_text z="1" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="18" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-15.45" uuid="{daef117a-d243-49f7-b089-6a8ffe076f69}" Halignment="AlignLeft">

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre.elmt

@@ -2,7 +2,6 @@
 <uuid uuid="{5FC5912D-A466-4E02-8051-7F08868D3FB5}"/><names>
         <name lang="de">Blitzschutz</name>
         <name lang="en">Surge protector</name>
-        <name lang="hu">Túlfeszültség védő</name>
         <name lang="es">Protección contra descargas</name>
         <name lang="it">Scaricatore</name>
         <name lang="fr">Parafoudre</name>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre4.elmt

@@ -11,7 +11,6 @@
         <name lang="pl">Ogranicznik przepięć</name>
         <name lang="ar">حامي من الصواعق</name>
         <name lang="en">Surge protection</name>
-        <name lang="hu">Túlfeszültség védő</name>
     </names>
     <elementInformations>
         <elementInformation show="1" name="unity"></elementInformation>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre_3.elmt

@@ -8,7 +8,6 @@
         <name lang="cs">Bleskojistka, ochrana proti přepětí</name>
         <name lang="fr">Parafoudre</name>
         <name lang="en">Surge protector</name>
-        <name lang="hu">Túlfeszültség védő</name>
         <name lang="es">Protección contra descargas</name>
     </names>
     <elementInformations>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/qet_directory

@@ -11,6 +11,5 @@
         <name lang="el">Προστασία από υπέρταση</name>
         <name lang="nl">Overspanningsbeveiliging</name>
         <name lang="da">Overspændingsbeskyttelse</name>
-        <name lang="hu">Túlfeszültség védelem</name>
     </names>
 </qet-directory>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/tube_a_gaz.elmt

@@ -8,7 +8,6 @@
         <name lang="pl">Odgromnik gazowyładowczy dwuelektrodowy</name>
         <name lang="cs">Plynová bleskojistka</name>
         <name lang="nl">gasontladingsbuis</name>
-        <name lang="hu">Védőgázas szimetrikus kisülőcső</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>

elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/tube_a_gaz_limiteur_de_tension.elmt

@@ -8,7 +8,6 @@
         <name lang="pl">Odgromnik gazowyładowczy trójelektrodowy</name>
         <name lang="cs">Dvojitá plynová bleskojistka</name>
         <name lang="nl">Symmetrische gasontlading buis</name>
-        <name lang="hu">Védőgázas kisülőcső</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">protection</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine3.elmt

@@ -11,7 +11,6 @@
         <name lang="es">Bobina</name>
         <name lang="cs">Cívka relé</name>
         <name lang="nl">Spoel</name>
-        <name lang="hu">Tekercs</name>
         <name lang="be">Relais spoel (algemeen)</name> 
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_ka_a_remanence.elmt

@@ -12,7 +12,6 @@
         <name lang="cs">Bistabilní remanentní relé</name>
         <name lang="nl">spoel remanent</name>
         <name lang="be">Spoel KA remanent</name>
-        <name lang="hu">Tekercs</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_ka_a_verrouillage_mecanique.elmt

@@ -11,7 +11,6 @@
         <name lang="es">Bobina KA con enclavamiento mecánico</name>
         <name lang="cs">Mechanické blokovací relé</name>
         <name lang="nl">spoel met vergrendeling</name>
-        <name lang="hu">Tekercs</name>
         <name lang="be">Spoel KA met mechanische vergrendeling</name>
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_tempo_repos-travail.elmt

@@ -9,7 +9,6 @@
         <name lang="cs">Relé se zpožděným zapnutím a vypnutím</name>
         <name lang="de">Relais ansprech- und rückfallverzögert</name>
         <name lang="it">Bobina di relè ritardato</name>
-        <name lang="hu">Tekercs be/ki késleltetéssel</name>
         <name lang="el">Πηνίο χρονικού, καθυστέρηση ενεργοποίησης-απενεργοποίησης</name>
         <name lang="ar">ملف مُؤقت مع تأخير الإستجابة و تأخير الإعتاق</name>
         <name lang="pl">Cewka przekaźnika działającego ze zwłoką przy wzbudzeniu i odwzbudzeniu</name>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_tempo_repos.elmt

@@ -2,7 +2,6 @@
 <uuid uuid="{7E996B1F-B537-44D9-A3E9-DB5F30487400}"/><names>
         <name lang="be">Spoel met uitschakel vertraging</name>
         <name lang="en">Coil with off delay</name>
-        <name lang="hu">Tekercs ki késleltetéssel</name>
         <name lang="fr">Bobine tempo repos</name>
         <name lang="ru">Обмотка</name>
         <name lang="es">Bobina de reposo temporizado</name>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/bobine_tempo_travail.elmt

@@ -2,7 +2,6 @@
 <uuid uuid="{14D69713-ADDE-4ACD-8654-50E3E60B61F7}"/><names>
         <name lang="be">Spoel met inschakel vertraging</name>
         <name lang="en">Coil with on delay</name>
-        <name lang="hu">Tekercs be késleltetéssel</name>
         <name lang="fr">Bobine tempo travail</name>
         <name lang="ru">Обмотка</name>
         <name lang="es">Bobina de trabajo temporizado</name>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/casak.elmt

@@ -1,34 +1,31 @@
-<definition height="50" hotspot_y="25" type="element" link_type="master" hotspot_x="23" version="0.90" width="40">
+<definition type="element" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
-    <uuid uuid="{b0c301a0-f0d5-4a66-888a-66e550fd63c9}"/>
+    <uuid uuid="{45a179e7-866e-4756-965f-d2445ced8dd2}"/>
     <names>
-        <name lang="hu">Időzítő relé</name>
         <name lang="cs">Časové relé</name>
-        <name lang="en">Timer</name>
-        <name lang="fr">Relais temporisé</name>
     </names>
     <kindInformations>
-        <kindInformation name="type">coil</kindInformation>
+        <kindInformation show="1" name="type">coil</kindInformation>
     </kindInformations>
     <elementInformations/>
     <informations></informations>
     <description>
-        <rect height="15" x="-14" y="-8" antialias="false" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0" width="28"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" height="15" rx="0" width="28" y="-8" ry="0" antialias="false"/>
-        <rect height="15" x="-20" y="-8" antialias="false" rx="0" style="line-style:normal;line-weight:normal;filling:black;color:black" ry="0" width="5"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" x="-20" height="15" rx="0" width="5" y="-8" ry="0" antialias="false"/>
-        <dynamic_text x="-45" y="-12" keep_visual_rotation="true" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" Halignment="AlignLeft" z="3" Valignment="AlignTop" text_width="-1" uuid="{bf273769-c856-4d5c-a56a-6a014b357999}" rotation="0" text_from="ElementInfo">
+        <dynamic_text z="3" Valignment="AlignTop" x="-45" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{bf273769-c856-4d5c-a56a-6a014b357999}" y="-12" Halignment="AlignLeft" frame="false" text_width="-1">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <text x="2" y="-10" color="#000000" text="A1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="A1" color="#000000"/>
-        <text x="1" y="15" color="#000000" text="A2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="A2" color="#000000"/>
-        <text x="-9" y="-10" color="#000000" text="S" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="S" color="#000000"/>
-        <line end1="none" end2="none" length2="1.5" antialias="false" x2="0" y2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y1="-8" length1="1.5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line end1="none" end2="none" length2="1.5" antialias="false" x2="0" y2="15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y1="7" length1="1.5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="15" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line end1="none" end2="none" length2="1.5" antialias="false" x2="-10" y2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="-8" length1="1.5"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
-        <dynamic_text x="-9" y="-9" keep_visual_rotation="true" font="Sans Serif,5,-1,5,50,0,0,0,0,0" frame="false" Halignment="AlignLeft" z="10" Valignment="AlignTop" text_width="-1" uuid="{02030033-c6b1-4a95-b990-74fa2f7d147d}" rotation="0" text_from="UserText">
+        <dynamic_text z="10" Valignment="AlignTop" x="-9" text_from="UserText" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" uuid="{02030033-c6b1-4a95-b990-74fa2f7d147d}" y="-9" Halignment="AlignLeft" frame="false" text_width="-1">
             <text>g</text>
         </dynamic_text>
-        <terminal x="0" y="15" type="Generic" orientation="s" uuid="{84fa8673-63b5-4398-a8ee-cb421df0aca5}" name=""/>
+        <terminal orientation="s" x="0" y="15"/>
-        <terminal x="0" y="-15" type="Generic" orientation="n" uuid="{d0ca8801-050e-4160-abd8-eee62c44e9bf}" name=""/>
+        <terminal orientation="n" x="0" y="-15"/>
-        <terminal x="-10" y="-15" type="Generic" orientation="n" uuid="{ea11c065-8d86-4041-b907-2cd28b877069}" name=""/>
+        <terminal orientation="n" x="-10" y="-15"/>
     </description>
 </definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_courant_alter.elmt

@@ -8,7 +8,6 @@
         <name lang="pl">Przekaźnik prądu przemiennego</name>
         <name lang="cs">Cívka relé pro AC napájení</name>
         <name lang="es">Relé de CA</name>
-        <name lang="hu">Tekercs AC</name>
         <name lang="nl">Relais voor wisselspanning</name>
         <name lang="be">Relais AC (wisselspanning)</name>
     </names>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_courant_continue.elmt

@@ -8,7 +8,6 @@
         <name lang="cs">Cívka relé pro DC napájení</name>
         <name lang="de">Spule mit Gleichstrombetätigung</name>
         <name lang="it">Relè DC</name>
-        <name lang="hu">Tekercs DC</name>
         <name lang="el">Πηνίο συνεχούς</name>
         <name lang="pl">Przekaźnik prądu przemiennego</name>
     </names>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_electronique.elmt

@@ -10,7 +10,6 @@
         <name lang="nl">relais electronisch</name>
         <name lang="es">Relé electrónico</name>
         <name lang="be">Electronisch relais</name> 
-        <name lang="hu">Tranzisztoros működtetés</name> 
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_insens_au_courant_alter.elmt

@@ -9,7 +9,6 @@
         <name lang="es"> Relé insensible a la CA</name>
         <name lang="nl">relais ongevoelig voor wisselspanning</name>
         <name lang="el">Ρελέ με αντοχή σε AC</name>
-        <name lang="hu">AC-ra érzéketlen relé</name>
         <name lang="be">Relais ongevoelig voor AC (wisselspanning)</name>
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_polarise.elmt

@@ -10,7 +10,6 @@
         <name lang="cs">Polarizované relé</name>
         <name lang="es">Relé polarizado</name>
         <name lang="nl">relay polair</name>
-        <name lang="hu">Polarizált relé</name>
         <name lang="be">Relais gepolariseerd</name>
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_rapides.elmt

@@ -9,7 +9,6 @@
         <name lang="cs">Rychlé relé</name>
         <name lang="es">Relé rapido</name>
         <name lang="nl">relais snel</name>
-        <name lang="hu">Gyors működésű relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_remanence.elmt

@@ -8,7 +8,6 @@
         <name lang="es">Relé de remanencia</name>
         <name lang="cs">Bistabilní remanentní relé</name>
         <name lang="nl">remanent relais</name>
-        <name lang="hu">Remanencia relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_repos_retardee.elmt

@@ -4,7 +4,6 @@
         <name lang="fr">Relais à mise au repos retardée</name>
         <name lang="es">Relé con retardo de apertura</name>
         <name lang="nl">spoel afvalvertraagd</name>
-        <name lang="hu">Nyugvó (elejtés) késleltetésű relé</name>
         <name lang="cs">Relé se zpožděným vypnutím</name>
         <name lang="de">Relais rückfallverzögert</name>
         <name lang="it">Relè ritardato all'apertura</name>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_repos_travail_retardee.elmt

@@ -9,7 +9,6 @@
         <name lang="es">Relé de trabajo y reposo retardado</name>
         <name lang="cs">Relé se zpožděným zapnutím a vypnutím</name>
         <name lang="nl">spoel opkom en afval vertraagd</name>
-        <name lang="hu">Meghúzás és elengedés késleltetésű relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_thermique.elmt

@@ -9,7 +9,6 @@
         <name lang="es">Relé de sobrecarga termica</name>
         <name lang="cs">Tepelné relé</name>
         <name lang="nl">Thermisch relais</name>
-        <name lang="hu">Thermikus túlterhelés védelmi relé</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_travail_retardee.elmt

@@ -7,7 +7,6 @@
         <name lang="cs">Relé se zpožděným zapnutím</name>
         <name lang="de">Relais ansprechverzögert</name>
         <name lang="it">Relè ritardato alla chiusura</name>
-        <name lang="hu">Meghúzás késleltetésű relé</name>
         <name lang="el">Πηνίο χρονικού, καθυστέρηση ενεργοποίησης</name>
         <name lang="pl">Przekaźnik działający ze zwłoką przy wzbudzeniu</name>
     </names>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/comm_verr_mecanique.elmt

@@ -8,7 +8,6 @@
         <name lang="pl">Przekaźnik z blokadą mechaniczną</name>
         <name lang="es">Relé con enclavamiento mecánico</name>
         <name lang="cs">Mechanické blokovací relé</name>
-        <name lang="hu">Relé mechanikus retesszel</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/qet_directory

@@ -14,6 +14,5 @@
         <name lang="nl">Spoelen</name>
         <name lang="be">Spoelen</name>
         <name lang="da">Spoler</name>
-        <name lang="hu">Tekercsek/relék</name>
     </names>
 </qet-directory>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/relais_clignoteur.elmt

@@ -7,7 +7,6 @@
         <name lang="de">Blinkrelais</name>
         <name lang="it">Relè ciclico</name>
         <name lang="el">Πηνίο ρελέ παλμού</name>
-        <name lang="hu">"Villogó" relé</name>
         <name lang="pl">Przekaźnik migowy (cykliczny)</name>
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/relais_polarise_retournant.elmt

@@ -1,48 +1,39 @@
-<definition hotspot_x="47" type="element" width="90" link_type="simple" height="50" version="0.90" hotspot_y="24">
+<definition width="100" version="0.3" hotspot_x="48" hotspot_y="30" height="60" type="element" ic="true" orientation="dnny">
-    <uuid uuid="{b421e3a2-41bb-41a0-8600-efc75811e20a}"/>
+<uuid uuid="{9EC34531-9367-4401-ADFE-7FB65430ED6D}"/><names>
-    <names>
+        <name lang="el">Πηνίο ρελέ με πολικότητα</name>
-        <name lang="de">Relais polarisiert mit Wechsler</name>
         <name lang="en">Polarized relay</name>
+        <name lang="de">Relais polarisiert mit Wechsler</name>
         <name lang="it">Relè polarizzato</name>
         <name lang="fr">Relais polarisé fonctionnant pour un seul sens du courant et retournant en position de repos après coupure</name>
-        <name lang="nl">Polair relais</name>
-        <name lang="el">Πηνίο ρελέ με πολικότητα</name>
-        <name lang="es">Relé polarizado, de trabajo en una dirección de la corriente en la bobina</name>
         <name lang="pl">Przekaźnik spolaryzowany, działający przy jednym kierunku prądu w cewce</name>
+        <name lang="es">Relé polarizado, de trabajo en una dirección de la corriente en la bobina</name>
         <name lang="cs">Polarizované monostabilní relé</name>
+        <name lang="nl">Polair relais</name>
     </names>
-    <elementInformations/>
     <informations>License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle diameter="3" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-16.5" antialias="true" x="34.5"/>
+        <circle x="34.5" y="-16.5" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3"/>
-        <text text="A2" font="Sans Serif,4,-1,5,50,0,0,0,0,0" y="19" rotation="0" x="-30" color="#000000"/>
+        <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="-5" y2="0" x2="25"/>
-        <line style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" x1="-5" x2="16" antialias="false" y2="0" end2="none" y1="0" length2="1.5" end1="none"/>
+        <circle x="-13.5" y="13.5" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3"/>
-        <circle diameter="3" style="line-style:normal;line-weight:normal;filling:black;color:black" y="13.5" antialias="true" x="-13.5"/>
+        <input x="19.5" y="-15.45" size="4" text="2"/>
-        <dynamic_text text_width="-1" keep_visual_rotation="false" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" y="-22.95" z="4" rotation="0" frame="false" x="19.5" text_from="UserText" uuid="{b78642aa-b230-4912-906b-6cbb070a3151}" Halignment="AlignLeft">
+        <input x="20" y="16" size="4" text="3"/>
-            <text>2</text>
+        <input x="0" y="-16" size="4" text="1"/>
-        </dynamic_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="-9" x1="10" y2="-9" x2="23"/>
-        <dynamic_text text_width="-1" keep_visual_rotation="false" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" y="8.5" z="5" rotation="0" frame="false" x="10" text_from="UserText" uuid="{94edcc6b-71b0-4d35-ad29-3a4e09592ebe}" Halignment="AlignLeft">
+        <polygon style="line-style:normal;line-weight:normal;filling:black;color:black" x1="-42" x2="-42" x3="-38" x4="-38" antialias="false" x5="-42" x6="-42" x7="-35" x8="-35" x9="-42" y1="-10" y10="-7" y2="-7" y3="-7" y4="7" y5="7" x10="-42" y6="10" y7="10" y8="-10" y9="-10"/>
-            <text>3</text>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="30" y2="10" x2="30" y3="-10" x3="20"/>
-        </dynamic_text>
+        <rect width="7" x="-42" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text text_width="-1" keep_visual_rotation="false" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" y="-23.5" z="6" rotation="0" frame="false" x="0" text_from="UserText" uuid="{6ac8e0a6-c562-42f3-bb0e-2eaf7726ed93}" Halignment="AlignLeft">
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10"/>
-            <text>1</text>
+        <rect width="30" x="-35" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        </dynamic_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="30" y2="-10" x2="30"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" x2="20" y3="-10" antialias="true" x3="12" y2="10" closed="false" y1="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="20" x1="-20" y2="10" x2="-20"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-20" x2="-20" antialias="false" y2="-20" end2="none" y1="20" length2="1.5" end1="none"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-20" y2="-10" x2="-20"/>
-        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-10" width="7" ry="0" antialias="false" height="20" x="-42" rx="0"/>
+        <input x="-34" y="18" size="4" text="A2"/>
-        <rect style="line-style:normal;line-weight:normal;filling:white;color:black" y="-10" width="30" ry="0" antialias="false" height="20" x="-35" rx="0"/>
+        <input x="-34" y="-17" size="4" text="A1"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="30" x2="30" antialias="false" y2="-10" end2="none" y1="-20" length2="1.5" end1="none"/>
+        <input x="31" y="0.5" size="9" text="_" tagg="label"/>
-        <dynamic_text text_width="-1" keep_visual_rotation="false" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-11" z="14" rotation="0" frame="false" x="31" text_from="ElementInfo" uuid="{bb4158fb-c7dd-4a99-a8e9-1e640ae795f2}" Halignment="AlignLeft">
+        <terminal x="-20" y="-20" orientation="n"/>
-            <text></text>
+        <terminal x="-20" y="20" orientation="s"/>
-            <info_name>label</info_name>
+        <terminal x="10" y="-20" orientation="n"/>
-        </dynamic_text>
+        <terminal x="30" y="-20" orientation="n"/>
-        <rect style="line-style:normal;line-weight:normal;filling:white;color:black" y="-7" width="4" ry="0" antialias="false" height="14" x="-42" rx="0"/>
+        <terminal x="30" y="20" orientation="s"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" x2="10" y3="-9" antialias="false" x3="15" y2="-9" closed="false" y1="-20"/>
-        <text text="A1" font="Sans Serif,4,-1,5,50,0,0,0,0,0" y="-15" rotation="0" x="-30" color="#000000"/>
-        <terminal y="-20" x="30" orientation="n"/>
-        <terminal y="-20" x="-20" orientation="n"/>
-        <terminal y="20" x="20" orientation="s"/>
-        <terminal y="20" x="-20" orientation="s"/>
-        <terminal y="-20" x="10" orientation="n"/>
     </description>
 </definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/relais_statique.elmt

@@ -10,7 +10,6 @@
         <name lang="el">Ηλεκτρονικό ρελέ</name>
         <name lang="ar">مُرحّل استاتيكي</name>
         <name lang="pl">Przekaźnik statyczny</name>
-        <name lang="hu">Szilárd test relé</name>
     </names>
     <kindInformations/>
     <informations>Author: The QElectroTech team

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/relais_tempo_retard_commande_externe.elmt

@@ -6,7 +6,6 @@
         <name lang="fr">Relais temporisé repos à commande externe</name>
         <name lang="pl">Przekaźnik z opuźnionym powrotem, z wejściem sterującym</name>
         <name lang="cs">Zpožděné relé s externím ovládáním</name>
-        <name lang="hu">Elengedeés késleltetésű relé külső paranccsal</name>
         <name lang="el">Πηνίο καθυστέρησης απενεργοποίησης με εξωτερική εντολή</name>
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/relbistable.elmt

@@ -1,37 +1,34 @@
-<definition link_type="master" width="40" height="50" version="0.90" hotspot_x="20" type="element" hotspot_y="24">
+<definition width="60" version="0.3" hotspot_x="19" hotspot_y="37" height="70" type="element" link_type="master">
-    <uuid uuid="{fbebf37a-b316-447b-9f4d-16e87e2066a0}"/>
+<uuid uuid="{1CF30813-0219-4625-B019-A00A318ED8F9}"/><names>
-    <names>
-        <name lang="pl">Cewka</name>
-        <name lang="cs">Bistabilní relé</name>
         <name lang="ar">مُرحّل ثنائي الإستقرار</name>
-        <name lang="de">Relais bistabil</name>
         <name lang="ru">Обмотка</name>
         <name lang="en">Coil</name>
+        <name lang="de">Relais bistabil</name>
         <name lang="it">Relè bistabile</name>
         <name lang="fr">Relais bistable</name>
+        <name lang="pl">Cewka</name>
         <name lang="es">Relé biestable</name>
+        <name lang="cs">Bistabilní relé</name>
     </names>
     <kindInformations>
-        <kindInformation name="type">coil</kindInformation>
+        <kindInformation name="type" show="1">coil</kindInformation>
     </kindInformations>
-    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <dynamic_text rotation="0" keep_visual_rotation="false" frame="false" x="4" text_from="UserText" font="Sans Serif,6,-1,5,50,0,0,0,0,0" y="11" Halignment="AlignLeft" z="4" uuid="{35e96436-b756-490c-95e4-87ddfc82d137}" text_width="-1" Valignment="AlignTop">
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="8" y2="4" x2="8"/>
-            <text>_</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="-8" y2="0" x2="8"/>
-        </dynamic_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="-4" x1="-8" y2="0" x2="-8"/>
-        <dynamic_text rotation="0" keep_visual_rotation="false" frame="false" x="4" text_from="UserText" font="Sans Serif,6,-1,5,50,0,0,0,0,0" y="-31" Halignment="AlignLeft" z="5" uuid="{6f5de7cf-5691-4dd4-b659-0dde11e9f9ca}" text_width="-1" Valignment="AlignTop">
+        <input x="4" y="20" size="6" rotate="true" text="_"/>
-            <text>_</text>
+        <input x="4" y="-22" size="6" rotate="true" text="_"/>
-        </dynamic_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="-21" x1="0" y2="-8" x2="0"/>
-        <line end1="none" end2="none" length2="1.5" y2="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" length1="1.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="9" x1="0" y2="21" x2="0"/>
-        <dynamic_text rotation="0" keep_visual_rotation="false" frame="false" x="20" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-8.8" Halignment="AlignLeft" z="10" uuid="{801ccb33-f4f0-4d97-929d-c9b2a1725bb2}" text_width="-1" Valignment="AlignTop">
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="14" y2="-8" x2="14"/>
-            <text></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="8" x1="-14" y2="8" x2="14"/>
-            <info_name>label</info_name>
+        <input x="20" y="2.6666" size="9" text="_" tagg="label"/>
-        </dynamic_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="-8" x1="14" y2="-8" x2="-14"/>
-        <rect width="28" rx="0" x="-14" height="16" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-8" ry="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-14" y2="8" x2="-14"/>
-        <polygon y3="0" closed="false" x4="8" x3="8" y2="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" y4="4" x1="-8" x2="-8"/>
+        <terminal x="0" y="-20" orientation="n"/>
-        <terminal orientation="n" x="0" name="A1" y="-20" type="Generic"/>
+        <terminal x="0" y="21" orientation="s"/>
-        <terminal orientation="s" x="0" name="A2" y="20" type="Generic"/>
     </description>
 </definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/telerupteur.elmt

@@ -8,7 +8,6 @@
         <name lang="pl">Łącznik zdalnie sterowany</name>
         <name lang="es">Interruptor a control remoto 1P1T</name>
         <name lang="cs">Dálkově ovládaný spínač</name>
-        <name lang="hu">Távoli vezérlésű relé</name>
         <name lang="nl">Afstand bestuurbaar schakelaar</name>
     </names>
     <kindInformations>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/tempo_programmable.elmt

@@ -4,7 +4,6 @@
         <name lang="fr">Relais temporisé</name>
         <name lang="en">Timed relay</name>
         <name lang="cs">Časové relé</name>
-        <name lang="hu">Ütemadó relé</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/timer816.elmt

@@ -3,7 +3,6 @@
     <names>
         <name lang="en">Timer T 816</name>
         <name lang="cs">Timer T 816</name>
-        <name lang="hu">Időzítő relé T 816</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/tmr48.elmt

@@ -3,7 +3,6 @@
     <names>
         <name lang="en">Timer TMR48</name>
         <name lang="cs">Timer TMR48</name>
-        <name lang="hu">Időzítő relé TMR48</name>
     </names>
     <kindInformations>
         <kindInformation name="type" show="1">coil</kindInformation>

elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/zpozdeny_odpad.elmt

@@ -0,0 +1,31 @@
+<definition version="0.70" height="50" type="element" width="30" hotspot_x="12" link_type="slave" hotspot_y="24">
+    <uuid uuid="{90fe1aa6-d017-4064-8ce7-242a4b7b416a}"/>
+    <names>
+        <name lang="cs">Kontakt zpožděný odpad</name>
+    </names>
+    <kindInformations>
+        <kindInformation name="state" show="1">NO</kindInformation>
+        <kindInformation name="number" show="1">1</kindInformation>
+        <kindInformation name="type" show="1">delayOff</kindInformation>
+    </kindInformations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon x3="10" y1="-10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" antialias="true" y2="10" closed="false" x2="10"/>
+        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="10"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-23" text_from="ElementInfo" y="-12" z="3" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{87554fe0-c02a-4473-81d1-4cb89205402c}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="7" text_from="UserText" y="-26" z="4" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{07fe6bcb-92fd-4fef-bef4-595fab066fa2}" Halignment="AlignLeft">
+            <text>15</text>
+        </dynamic_text>
+        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="7" text_from="UserText" y="9" z="5" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{bbc34c0f-1331-4499-8663-978b944c8287}" Halignment="AlignLeft">
+            <text>18</text>
+        </dynamic_text>
+        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="3"/>
+        <arc height="10" x="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" y="-5" width="10" start="270" antialias="true"/>
+        <terminal x="10" y="20" orientation="s"/>
+        <terminal x="10" y="-20" orientation="n"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/zpozdeny_odpad.elmt

@@ -1,33 +0,0 @@
-<definition height="50" hotspot_y="24" type="element" link_type="slave" hotspot_x="5" version="0.90" width="20">
-    <uuid uuid="{ee2be6e2-521c-4129-a0ca-a266db12e1ce}"/>
-    <names>
-        <name lang="hu">Késleltetett működésű záróérintkező</name>
-        <name lang="cs">Kontakt zpožděný odpad</name>
-        <name lang="fr">Contact temporisé</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type">delayOff</kindInformation>
-        <kindInformation name="state">NO</kindInformation>
-        <kindInformation name="number">1</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon closed="false" antialias="true" x2="10" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" y3="20" y1="-10" x3="10"/>
-        <line end1="none" end2="none" length2="1.5" antialias="false" x2="10" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y1="-20" length1="1.5"/>
-        <dynamic_text x="-23" y="-12" keep_visual_rotation="true" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" Halignment="AlignLeft" z="3" Valignment="AlignTop" text_width="-1" uuid="{87554fe0-c02a-4473-81d1-4cb89205402c}" rotation="0" text_from="ElementInfo">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text x="7" y="-26" keep_visual_rotation="true" font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" Halignment="AlignLeft" z="4" Valignment="AlignTop" text_width="-1" uuid="{07fe6bcb-92fd-4fef-bef4-595fab066fa2}" rotation="0" text_from="UserText">
-            <text>15</text>
-        </dynamic_text>
-        <dynamic_text x="7" y="9" keep_visual_rotation="true" font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" Halignment="AlignLeft" z="5" Valignment="AlignTop" text_width="-1" uuid="{bbc34c0f-1331-4499-8663-978b944c8287}" rotation="0" text_from="UserText">
-            <text>18</text>
-        </dynamic_text>
-        <line end1="none" end2="none" length2="1.5" antialias="false" x2="3" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" y1="0" length1="1.5"/>
-        <arc height="10" start="270" x="-7" y="-5" antialias="true" angle="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="10"/>
-        <terminal x="10" y="20" type="Generic" orientation="s" uuid="{03048908-f3d8-4897-9742-6b3e2b4c7a62}" name="18"/>
-        <terminal x="10" y="-20" type="Generic" orientation="n" uuid="{0f9ebcab-1d47-4815-a390-e290573172b7}" name="15"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais.elmt

@@ -7,7 +7,7 @@
         <name lang="es">Contacto relé térmico (NA)</name>
         <name lang="cs">Kontakt (NO) tepelného jističe</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-12.6286" y2="3" x2="-16.1714"/>

elements/10_electric/10_allpole/310_relays_contactors&contacts/03_contacts/contact_relais_nf.elmt

@@ -7,7 +7,7 @@
         <name lang="es">Contacto relé térmico (NC)</name>
         <name lang="cs">Kontakt (NC) tepelného jističe</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7.67895" y2="0" x2="-10.9053"/>

elements/10_electric/10_allpole/310_relays_contactors&contacts/qet_directory

@@ -13,6 +13,5 @@
         <name lang="cs">Relé, stykače a kontakty</name>
         <name lang="da">Relæer, kontaktorer og kontakter</name>
         <name lang="ja">継電器、接触器、接点</name>
-        <name lang="hu">Relék, kontaktorok és érintkezők</name>
     </names>
 </qet-directory>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_monophase.elmt

@@ -11,7 +11,7 @@
         <name lang="cs">Jednofázový autotransformátor</name>
         <name lang="nl">enkelfase autotransformator</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="8" y2="-35" x2="8"/>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_triphase.elmt

@@ -11,7 +11,7 @@
         <name lang="cs">Třífázový autotransformátor</name>
         <name lang="nl">driefase autotransformator</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="20" y="17.6667" size="5" text="___V"/>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformateur_triphase_neutre.elmt

@@ -11,7 +11,7 @@
         <name lang="cs">Třífázový autotransformátor + neutrál</name>
         <name lang="nl">driefase autotransformator + Nul</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="20" y="17.6667" size="5" text="___V"/>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/autotransformator_3f_2.elmt

@@ -1,58 +1,46 @@
-<definition height="50" version="0.90" type="element" hotspot_y="24" link_type="simple" width="60" hotspot_x="44">
+<definition width="80" version="0.4" hotspot_x="46" hotspot_y="25" height="50" type="element" ic="true">
-    <uuid uuid="{2caf7a54-cf3b-4724-8ad4-61691d6cfc18}"/>
+<uuid uuid="{6681E115-5D33-4F03-B6CC-3392357CD888}"/><names>
-    <names>
-        <name lang="fr">Autotransformateur étoile</name>
-        <name lang="nl">Autotransformator</name>
-        <name lang="el">Τριφασικός μετασχηματιστής, αστέρας</name>
-        <name lang="es">Autotransformador trifásico</name>
         <name lang="it">Autotrasformatore 3F a stella</name>
         <name lang="en">Three-phase Autotransformer Yd</name>
-        <name lang="de">Spartransformator 3ph. Stern</name>
+        <name lang="es">Autotransformador trifásico</name>
-        <name lang="cs">Třífázový autotransformátor Y, spojený do hvězdy</name>
+        <name lang="de">Spartransformator Stern</name>
+        <name lang="fr">Autotransformateur étoile</name>
         <name lang="pl">Autotransformator trójfazowy skojarzony w gwiazdę (forma 2)</name>
+        <name lang="cs">Třífázový autotransformátor Y, spojený do hvězdy</name>
+        <name lang="nl">Autotransformator</name>
+        <name lang="el">Τριφασικός μετασχηματιστής, αστέρας</name>
     </names>
-    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc height="5" x="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10" start="90" antialias="true" width="5" angle="-180"/>
+        <arc width="5" x="-12.5" y="-10" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <text text="C2" x="1.99995" rotation="0" y="19" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <arc width="5" x="-32.5" y="-10" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <text text="C1" x="0.17185" rotation="0" y="-15" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-40" y2="0" x2="-40" y3="0" x3="-30"/>
-        <text text="B1" x="-19.4219" rotation="0" y="-15" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-20" y2="0" x2="-20" y3="0" x3="-10"/>
-        <text text="B2" x="-17.5938" rotation="0" y="19" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <arc width="5" x="-12.5" y="-15" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc height="5" x="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10" start="90" antialias="true" width="5" angle="-180"/>
+        <arc width="5" x="-32.5" y="-15" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <polygon closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="0" x2="-40" y2="0" x3="-30" antialias="false" y1="20" x1="-40"/>
+        <arc width="5" x="-12.5" y="-5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <text text="A2" x="-38.1719" rotation="0" y="19" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <arc width="5" x="-32.5" y="-5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <polygon closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="0" x2="-20" y2="0" x3="-10" antialias="false" y1="20" x1="-20"/>
+        <arc width="5" x="7.5" y="-10" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc height="5" x="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15" start="90" antialias="true" width="5" angle="-180"/>
+        <arc width="5" x="-32.5" y="0" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc height="5" x="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15" start="90" antialias="true" width="5" angle="-180"/>
+        <arc width="5" x="-12.5" y="0" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc height="5" x="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5" start="90" antialias="true" width="5" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-10" y2="5" x2="-10"/>
-        <arc height="5" x="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5" start="90" antialias="true" width="5" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-30" y2="5" x2="-30"/>
-        <arc height="5" x="7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10" start="90" antialias="true" width="5" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10" y2="-20" x2="-10"/>
-        <arc height="5" x="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0" start="90" antialias="true" width="5" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-30" y2="-20" x2="-30"/>
-        <arc height="5" x="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0" start="90" antialias="true" width="5" angle="-180"/>
+        <arc width="5" x="7.5" y="-15" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-10" y2="5" length2="1.5" end2="none" antialias="false" y1="10" x1="-10"/>
+        <arc width="5" x="7.5" y="-5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-30" y2="5" length2="1.5" end2="none" antialias="false" y1="10" x1="-30"/>
+        <arc width="5" x="7.5" y="0" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-10" y2="-20" length2="1.5" end2="none" antialias="false" y1="-15" x1="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-30" y2="10" x2="10"/>
-        <line end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-30" y2="-20" length2="1.5" end2="none" antialias="false" y1="-15" x1="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="5" x2="10"/>
-        <arc height="5" x="7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15" start="90" antialias="true" width="5" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="10" y2="-20" x2="10"/>
-        <arc height="5" x="7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5" start="90" antialias="true" width="5" angle="-180"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="0" x2="0" y3="0" x3="10"/>
-        <arc height="5" x="7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0" start="90" antialias="true" width="5" angle="-180"/>
+        <input x="15" y="0" size="9" rotate="true" text="_" tagg="label"/>
-        <line end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="10" y2="10" length2="1.5" end2="none" antialias="false" y1="10" x1="-30"/>
+        <terminal x="10" y="-20" nameHidden="0" number="" name="" orientation="n"/>
-        <line end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="10" y2="5" length2="1.5" end2="none" antialias="false" y1="10" x1="10"/>
+        <terminal x="0" y="20" nameHidden="0" number="" name="" orientation="s"/>
-        <line end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="10" y2="-20" length2="1.5" end2="none" antialias="false" y1="-15" x1="10"/>
+        <terminal x="-10" y="-20" nameHidden="0" number="" name="" orientation="n"/>
-        <polygon closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="0" x2="0" y2="0" x3="10" antialias="false" y1="20" x1="0"/>
+        <terminal x="-30" y="-20" nameHidden="0" number="" name="" orientation="n"/>
-        <dynamic_text z="23" text_width="-1" text_from="ElementInfo" x="15" uuid="{13157601-1736-4a47-93de-3979ad823694}" Valignment="AlignTop" rotation="0" Halignment="AlignLeft" y="-11.5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" keep_visual_rotation="false">
+        <terminal x="-20" y="20" nameHidden="0" number="" name="" orientation="s"/>
-            <text></text>
+        <terminal x="-40" y="20" nameHidden="0" number="" name="" orientation="s"/>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <circle x="-11" style="line-style:normal;line-weight:normal;filling:black;color:black" y="9" diameter="2" antialias="false"/>
-        <text text="A1" x="-40" rotation="0" y="-15" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
-        <terminal x="-20" uuid="{e5a65158-9ec1-46d5-afdf-77fe1355d822}" type="Generic" y="20" orientation="s" name="B2"/>
-        <terminal x="-10" uuid="{0a9d1a4f-c241-4f7d-8f30-106b033ce002}" type="Generic" y="-20" orientation="n" name="B1"/>
-        <terminal x="-30" uuid="{f3e42421-3654-4b75-9a71-78281c1a9f34}" type="Generic" y="-20" orientation="n" name="A1"/>
-        <terminal x="0" uuid="{270baee5-af1c-42e6-a785-3206e3ee3dc9}" type="Generic" y="20" orientation="s" name="C2"/>
-        <terminal x="10" uuid="{205770ee-f53d-46fa-a0ef-921ceb0381e0}" type="Generic" y="-20" orientation="n" name="C1"/>
-        <terminal x="-40" uuid="{74208026-c026-4d3e-ae2c-5f026bf68240}" type="Generic" y="20" orientation="s" name="A2"/>
     </description>
 </definition>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/tlumivka.elmt

@@ -1,7 +1,6 @@
 <definition link_type="simple" type="element" version="0.80" width="50" hotspot_y="16" hotspot_x="24" height="30">
     <uuid uuid="{3a401a8c-2087-4a75-b13b-ef6474f241c8}"/>
     <names>
-        <name lang="de">Spule mit Kern</name>
         <name lang="fr">Transformateur</name>
         <name lang="cs">Tlumivka s jádrem</name>
     </names>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/trafo1.elmt

@@ -1,8 +1,8 @@
 <definition link_type="simple" type="element" version="0.80" width="50" hotspot_y="19" hotspot_x="24" height="40">
     <uuid uuid="{a86902d2-4aae-4be5-a22a-c099817573fc}"/>
     <names>
-        <name lang="de">Transformator 1ph.</name>
+        <name lang="fr">
-        <name lang="fr">Transformateur à deux enroulements</name>
+Transformateur à deux enroulements</name>
         <name lang="cs">Trafo se dvěma vinutími</name>
     </names>
     <elementInformations/>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/transformateur_triphase.elmt

@@ -11,7 +11,7 @@
         <name lang="cs">Třífázový transformátor</name>
         <name lang="nl">Driefase transformator</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <text x="-16" y="-31.6667" size="4" text="A1"/>

elements/10_electric/10_allpole/330_transformers&power_supplies/10_transformers/transformateur_triphase_neutre.elmt

@@ -11,7 +11,7 @@
         <name lang="cs">Třífázový transformátor + neutrál</name>
         <name lang="nl">driefase transformator + Nul</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon x4="-12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="-34" y2="30" x2="-34" y3="19" x3="-27" y4="19"/>

elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/2080_ps120_240vac.elmt

@@ -1,7 +1,6 @@
 <definition type="element" link_type="simple" height="80" width="100" hotspot_y="39" hotspot_x="50" version="0.60">
     <uuid uuid="{2b1d409f-9a77-4321-9ffc-d5c472b21bbe}"/>
     <names>
-        <name lang="de">Allen Bradley AC/DC 2080-PS120-240VAC</name>
         <name lang="fr">Alimentation AC/DC 2080-PS120-240VAC</name>
         <name lang="cs">Napájecí zdroj AC/DC 2080-PS120-240VAC</name>
     </names>

elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/ac2_dc.elmt

@@ -1,46 +1,42 @@
-<definition type="element" link_type="simple" height="40" width="50" hotspot_x="24" hotspot_y="25" version="0.90">
+<definition type="element" hotspot_x="29" version="0.5" hotspot_y="25" link_type="simple" width="60" height="40">
-    <uuid uuid="{e67588a1-0339-4637-878a-22391aab7764}"/>
+    <uuid uuid="{3973dcdb-e383-4a83-adff-69061aa9fe78}"/>
     <names>
+        <name lang="el">Μονοφασικό εναλλασσόμενο > Συνεχές</name>
+        <name lang="de">Netzteil AC/DC</name>
         <name lang="fr">Alternatif monophasé > Continu</name>
         <name lang="cs">Napájecí zdroj AC/DC</name>
         <name lang="es">Alterna monofásica > Continua</name>
-        <name lang="en">One-phase alternating > Direct</name>
-        <name lang="it">AC monofase > DC</name>
-        <name lang="nl">Wisselspanning eenfase > gelijkspanning  AC1 > DC </name>
-        <name lang="el">Μονοφασικό εναλλασσόμενο > Συνεχές</name>
         <name lang="ar">موحد أحادي الوجه -2</name>
-        <name lang="be">Wisselspanning een fase > gelijkspanning  AC1 > DC </name>
-        <name lang="de">Netzteil AC/DC</name>
         <name lang="pl">Zasilacz jednofazowy</name>
+        <name lang="it">AC monofase > DC</name>
+        <name lang="en">One-phase alternating > Direct</name>
+        <name lang="be">Wisselspanning een fase > gelijkspanning  AC1 > DC </name>
+        <name lang="nl">Wisselspanning eenfase > gelijkspanning  AC1 > DC </name>
     </names>
-    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text y="2" x="-13" rotation="0" text="N" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <text text="N" x="-13" y="0" size="5"/>
-        <text y="-7.6666" x="-13" rotation="0" text="L" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <text text="L" x="-13" y="-7.6666" size="5"/>
-        <line end2="none" x1="9" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="13" length2="1.5" y1="0"/>
+        <line x1="9" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="0" length1="1.5" antialias="false" end1="none" x2="13"/>
-        <line end2="none" x1="11" y2="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="11" length2="1.5" y1="-12"/>
+        <line x1="11" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" y2="-8" length1="1.5" antialias="false" end1="none" x2="11"/>
-        <line end2="none" x1="9" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="13" length2="1.5" y1="-10"/>
+        <line x1="9" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-10" length1="1.5" antialias="false" end1="none" x2="13"/>
-        <dynamic_text y="-44.3333" x="-16" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" Halignment="AlignLeft" font="Sans Serif,8,-1,5,50,0,0,0,0,0" text_from="ElementInfo" uuid="{e8b12ed7-592b-4935-bc53-b4cc281432e9}" z="6" keep_visual_rotation="false">
+        <input text="T_ 230V/24VDC __W" x="-16" y="-33.3333" tagg="label" size="8" rotate="true"/>
-            <text></text>
+        <line x1="-15" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-10" length1="1.5" antialias="false" end1="none" x2="-20"/>
-            <info_name>label</info_name>
+        <polygon x1="-15" x4="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="-20" y4="10" antialias="false" y3="10" x2="15" x3="15"/>
-        </dynamic_text>
+        <arc start="0" x="-3.5" y="-17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-175" antialias="true" width="5" height="5"/>
-        <line end2="none" x1="-15" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="-20" length2="1.5" y1="-10"/>
+        <line x1="20" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="0" length1="1.5" antialias="false" end1="none" x2="15"/>
-        <polygon x4="-15" x3="15" x1="-15" y2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y4="10" x2="15" y1="-20" y3="10"/>
+        <line x1="15" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-10" length1="1.5" antialias="false" end1="none" x2="20"/>
-        <arc y="-17.5" x="-3.5" height="5" width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" angle="-175" start="0"/>
+        <line x1="-20" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="0" length1="1.5" antialias="false" end1="none" x2="-15"/>
-        <line end2="none" x1="20" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="15" length2="1.5" y1="0"/>
+        <line x1="8" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" y2="4" length1="1.5" antialias="false" end1="none" x2="9.5"/>
-        <line end2="none" x1="15" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="20" length2="1.5" y1="-10"/>
+        <line x1="5" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" y2="4" length1="1.5" antialias="false" end1="none" x2="6.5"/>
-        <line end2="none" x1="-20" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="-15" length2="1.5" y1="0"/>
+        <line x1="2" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" y2="4" length1="1.5" antialias="false" end1="none" x2="3.5"/>
-        <line end2="none" x1="8" y2="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="9.5" length2="1.5" y1="4"/>
+        <line x1="2" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" y2="6" length1="1.5" antialias="false" end1="none" x2="9.5"/>
-        <line end2="none" x1="5" y2="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="6.5" length2="1.5" y1="4"/>
+        <arc start="180" x="-8.5" y="-17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-175" antialias="true" width="5" height="5"/>
-        <line end2="none" x1="2" y2="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="3.5" length2="1.5" y1="4"/>
+        <line x1="14.5" length2="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" y2="9.5" length1="1.5" antialias="true" end1="none" x2="-14.5"/>
-        <line end2="none" x1="2" y2="6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" length1="1.5" x2="9.5" length2="1.5" y1="6"/>
+        <terminal x="-21" y="-10" orientation="w"/>
-        <arc y="-17.5" x="-8.5" height="5" width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" angle="-175" start="180"/>
+        <terminal x="-21" y="0" orientation="w"/>
-        <line end2="none" x1="14.5" y2="9.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" end1="none" length1="1.5" x2="-14.5" length2="1.5" y1="-19.5"/>
+        <terminal x="21" y="-10" orientation="e"/>
-        <terminal type="Generic" y="-10" name="L" orientation="w" x="-20" uuid="{1ea47dc7-4a51-40b8-9036-809b9cbb54ec}"/>
+        <terminal x="21" y="0" orientation="e"/>
-        <terminal type="Generic" y="0" name="N" orientation="w" x="-20" uuid="{e7236990-f185-431b-8046-b36f05fb72f0}"/>
-        <terminal type="Generic" y="-10" name="L+" orientation="e" x="20" uuid="{5a72408e-f4ce-4a2e-910a-cb6ac481b06b}"/>
-        <terminal type="Generic" y="0" name="L-" orientation="e" x="20" uuid="{2d1ce5eb-fefd-46d6-aae2-ce2f0ba85f15}"/>
     </description>
 </definition>

elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/qet_directory

@@ -3,7 +3,7 @@
         <name lang="ru">Источники питания</name>
         <name lang="en">Power supplies</name>
         <name lang="es">Fuentes de poder</name>
-        <name lang="de">Netzgeräte</name>
+        <name lang="de">Netzteile</name>
         <name lang="pl">Zasilacze</name>
         <name lang="fr">Alimentations</name>
         <name lang="it">Alimentatori</name>

elements/10_electric/10_allpole/330_transformers&power_supplies/40_uninterruptible_power_supply/ups.elmt

@@ -1,71 +1,57 @@
-<definition hotspot_x="94" height="70" width="190" link_type="master" version="0.90" type="element" hotspot_y="35">
+<definition width="220" version="0.4" hotspot_x="98" hotspot_y="43" height="80" type="element" ic="true" link_type="master">
-    <uuid uuid="{b79409e5-f665-40e9-84b3-5b07543c8466}"/>
+<uuid uuid="{F3049D0C-277C-43CA-A56C-0921EC69BF02}"/><names>
-    <names>
-        <name lang="fr">UPS</name>
-        <name lang="cs">UPS</name>
         <name lang="nl">UPS</name>
-        <name lang="it">UPS</name>
-        <name lang="en">UPS</name>
-        <name lang="pl">UPS</name>
-        <name lang="de">USV</name>
         <name lang="be">UPS</name>
+        <name lang="en">UPS</name>
+        <name lang="de">USV</name>
+        <name lang="fr">UPS</name>
+        <name lang="pl">UPS</name>
+        <name lang="it">UPS</name>
+        <name lang="cs">UPS</name>
     </names>
-    <kindInformations>
-        <kindInformation name="type">coil</kindInformation>
-    </kindInformations>
-    <elementInformations/>
     <informations>
 		Author: RDS for QelectroTech
     </informations>
     <description>
-        <rect height="60" width="180" x="-90" y="-30" style="line-style:dashed;line-weight:normal;filling:none;color:black" rx="0" antialias="false" ry="0"/>
+        <rect width="180" x="-90" y="-30" antialias="false" height="60" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <line end2="none" x1="79.5" y1="-19.5" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19.5" antialias="true" end1="none" x2="40.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:blue" y1="0" x1="28.96" y2="0" x2="10.96"/>
-        <line end2="none" x1="30" y1="0" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:blue" y2="0" antialias="false" end1="none" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="39.8671" y2="-10" x2="-38.9542"/>
-        <line end2="none" x1="40" y1="-10" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" end1="none" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-79.8583" y2="-10" x2="-89.2077"/>
-        <line end2="none" x1="-80" y1="-10" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" end1="none" x2="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="0" x1="3" y2="0" x2="-5"/>
-        <line end2="none" x1="3" y1="0" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="0" antialias="false" end1="none" x2="-5"/>
+        <polygon x4="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.9688" x1="40" y2="-19.9688" x2="79.675" y3="20.2453" x3="79.675" y4="20.2453"/>
-        <polygon x3="80" y4="20" x1="40" y3="20" y1="-20" x4="40" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="false" x2="80"/>
+        <polygon x4="-79.7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-79.7" y2="-20" x2="-40" y3="18.475" x3="-40" y4="18.475"/>
-        <polygon x3="-40" y4="20" x1="-80" y3="20" y1="-20" x4="-80" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="false" x2="-40"/>
+        <arc width="5" x="-72.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <arc height="5" width="5" x="-72.5" y="-17.5" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" angle="-175"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="0" x1="-11.04" y2="0" x2="-29.04"/>
-        <line end2="none" x1="-10" y1="0" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="0" antialias="false" end1="none" x2="-30"/>
+        <arc width="5" x="71.5" y="12.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <arc height="5" width="5" x="71.5" y="12.5" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" angle="-175"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-7.24511" x1="-10" y2="7.26554" x2="-10"/>
-        <line end2="none" x1="-10" y1="-7.24511" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="7.26554" antialias="false" end1="none" x2="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="89.2021" y2="10" x2="80.7365"/>
-        <line end2="none" x1="90" y1="10" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="false" end1="none" x2="80"/>
+        <rect width="3" x="-7" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
-        <rect height="10" width="3" x="-7" y="-5" style="line-style:normal;line-weight:normal;filling:blue;color:black" rx="0" antialias="false" ry="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="80.7179" y2="-10" x2="89.2223"/>
-        <line end2="none" x1="80" y1="-10" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" end1="none" x2="90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-89.184" y2="10" x2="-79.884"/>
-        <line end2="none" x1="-90" y1="10" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="false" end1="none" x2="-80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-7.24511" x1="3.7" y2="7.26554" x2="3.7"/>
-        <line end2="none" x1="3.7" y1="-7.24511" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="7.26554" antialias="false" end1="none" x2="3.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="10" x1="-39.2243" y2="10" x2="39.3264"/>
-        <line end2="none" x1="-40" y1="10" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="false" end1="none" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="-45" y2="13" x2="-43.5"/>
-        <line end2="none" x1="-45" y1="13" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="13" antialias="false" end1="none" x2="-43.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="44" y2="-17" x2="42.5"/>
-        <line end2="none" x1="44" y1="-17" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-17" antialias="false" end1="none" x2="42.5"/>
+        <text x="14" y="5.6666" size="6" text="-"/>
-        <text x="13" y="5.6666" text="-" rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <text x="-17" y="7" size="6" text="+"/>
-        <text x="-17" y="7" text="+" rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <line 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="47" y2="-17" x2="45.5"/>
-        <line end2="none" x1="47" y1="-17" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-17" antialias="false" end1="none" x2="45.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="13" x1="-48" y2="13" x2="-46.5"/>
-        <line end2="none" x1="-48" y1="13" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="13" antialias="false" end1="none" x2="-46.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="50" y2="-17" x2="48.5"/>
-        <line end2="none" x1="50" y1="-17" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-17" antialias="false" end1="none" x2="48.5"/>
+        <rect width="3" x="6.7" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
-        <rect height="10" width="3" x="6.7" y="-5" style="line-style:normal;line-weight:normal;filling:blue;color:black" rx="0" antialias="false" ry="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="13" x1="-51" y2="13" x2="-49.5"/>
-        <line end2="none" x1="-51" y1="13" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="13" antialias="false" end1="none" x2="-49.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="-51" y2="15" x2="-43.5"/>
-        <line end2="none" x1="-51" y1="15" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" antialias="false" end1="none" x2="-43.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="50" y2="-15" x2="42.5"/>
-        <line end2="none" x1="50" y1="-15" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="false" end1="none" x2="42.5"/>
+        <arc width="5" x="66.5" y="12.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <arc height="5" width="5" x="66.5" y="12.5" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" angle="-175"/>
+        <arc width="5" x="-77.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <arc height="5" width="5" x="-77.5" y="-17.5" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" angle="-175"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="79.5" y2="20.5" x2="40.5"/>
-        <line end2="none" x1="-40.5" y1="-19.5" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="19.5" antialias="true" end1="none" x2="-79.5"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="-40.5" y2="18.5" x2="-80.5"/>
-        <line end2="none" x1="30" y1="0" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:blue" y2="9" antialias="false" end1="none" x2="30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:blue" y1="0" x1="30" y2="9" x2="30"/>
-        <line end2="none" x1="-30" y1="-0.239243" length2="1.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="-9.77916" antialias="false" end1="none" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-0.239243" x1="-30" y2="-9.77916" x2="-30"/>
-        <dynamic_text frame="false" keep_visual_rotation="false" x="92" Halignment="AlignLeft" Valignment="AlignTop" text_width="-1" y="-36" rotation="0" uuid="{590a2487-3803-4b82-a26c-f751dc234ccb}" text_from="ElementInfo" z="35" font="Sans Serif,9,-1,5,50,0,0,0,0,0">
+        <input x="92" y="-24.5" size="9" rotate="true" text="_" tagg="label"/>
-            <text></text>
+        <rect width="40" x="-20" y="-20" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-            <info_name>label</info_name>
+        <terminal x="-90" y="-10" orientation="w"/>
-        </dynamic_text>
+        <terminal x="-90" y="10" orientation="w"/>
-        <rect height="40" width="40" x="-20" y="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false" ry="0"/>
+        <terminal x="90" y="-10" orientation="e"/>
-        <circle x="-92" diameter="4" y="-12" style="line-style:normal;line-weight:normal;filling:white;color:black" antialias="false"/>
+        <terminal x="90" y="10" orientation="e"/>
-        <circle x="-92" diameter="4" y="8" style="line-style:normal;line-weight:normal;filling:white;color:black" antialias="false"/>
-        <circle x="88" diameter="4" y="-12" style="line-style:normal;line-weight:normal;filling:white;color:black" antialias="false"/>
-        <circle x="88" diameter="4" y="8" style="line-style:normal;line-weight:normal;filling:white;color:black" antialias="false"/>
-        <circle x="-31.5" diameter="3" y="-11.5" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false"/>
-        <circle x="28.5" diameter="3" y="8.5" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false"/>
-        <terminal orientation="w" x="-90" y="10" type="Generic" uuid="{73279019-bef5-40b9-aafa-64879b00bd1f}" name=""/>
-        <terminal orientation="w" x="-90" y="-10" type="Generic" uuid="{e3c256df-b5c3-47bd-93ea-72e9fa3d4ebf}" name=""/>
-        <terminal orientation="e" x="90" y="10" type="Generic" uuid="{d925bd0f-b44c-4278-b1fd-cc93905eaf51}" name=""/>
-        <terminal orientation="e" x="90" y="-10" type="Generic" uuid="{10632a73-7785-4f39-8ed5-06f51d9c1b6a}" name=""/>
     </description>
 </definition>

elements/10_electric/10_allpole/340_converters&inverters/10_converters/prevod_i2c_485.elmt

@@ -2,7 +2,6 @@
     <uuid uuid="{a9abc5f7-020e-4b5e-b4e8-c0d39290d384}"/>
     <names>
         <name lang="cs">Převodník RS485 na I2C</name>
-	<name lang="fr">Převodník RS485/name>
     </names>
     <elementInformations>
         <elementInformation show="1" name="unity"></elementInformation>

elements/10_electric/10_allpole/340_converters&inverters/20_current_tansformers/transformateur_courant2.elmt.elmt

@@ -2,7 +2,7 @@
 <uuid uuid="{6DD8B385-CDE3-4371-9CFD-D60E314471A9}"/><names>
         <name lang="en">Transformer or current pulse, with three through primary conductors</name>
         <name lang="de">Stromwandler, Impulswandler</name>
-        <name lang="fr">Transformateur d'impulsion ou de courant, avec trois conducteurs primaires traversants</name>
+        <name lang="fr"> Transformateur d'impulsion ou de courant, avec trois conducteurs primaires traversants</name>
 	<name lang="it">Trasformatore d'impulso o di corrente, 3 conduttori primari</name>
         <name lang="pl">Przekładnik (forma 2)</name>
         <name lang="cs">Proudový transformátor se třemi primáry</name>

elements/10_electric/10_allpole/340_converters&inverters/20_current_tansformers/transformateur_courant4.elmt.elmt

@@ -1,8 +1,8 @@
 <definition width="30" version="0.3" hotspot_x="9" hotspot_y="45" height="70" type="element" ic="true">
 <uuid uuid="{1B534175-EBEE-4198-BE35-C716E0F7D496}"/><names>
         <name lang="en">Current transformer with two secondary windings on a common magnetic circuit</name>
-        <name lang="de">Stromwandler mit 2 sekundären Wicklungen</name>
+        <name lang="de">Stromwandler mit 2 sekünderen Wicklungen</name>
-        <name lang="fr">Transformateur de courant, à deux enroulements secondaires sur un circuit magnétique commun</name>
+        <name lang="fr"> Transformateur de courant, à deux enroulements secondaires sur un circuit magnétique commun</name>
         <name lang="it">Transformatore di corrente, 2 secondari 1 circuito magnetico comune</name>
         <name lang="pl">Przekładnik (forma 2)</name>
         <name lang="cs">Proudový transformátor se dvěma sekundárními vinutími na jednom jádru</name>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/line_filter.elmt

@@ -1,42 +1,45 @@
-<definition hotspot_x="45" version="0.90" type="element" width="90" height="50" hotspot_y="24" link_type="simple">
+<definition height="60" type="element" width="90" hotspot_x="45" link_type="simple" version="0.5" hotspot_y="23">
-    <uuid uuid="{905a62ee-c454-40ae-a550-36b50a17aab7}"/>
+    <uuid uuid="{846ab7b5-3024-4c60-8e06-ead72711c300}"/>
     <names>
-        <name lang="fr">Ligne filtre</name>
+        <name lang="ar">خط مرشح</name>
         <name lang="pl">Filtr sieciowy</name>
         <name lang="el">Φίλτρο γραμμής</name>
-        <name lang="cs">Síťový filtr 3f</name>
+        <name lang="fr">Ligne filtre</name>
-        <name lang="nl">Lijn filter</name>
-        <name lang="en">Line filter</name>
-        <name lang="ar">خط مرشح</name>
-        <name lang="it">Filtro di linea</name>
-        <name lang="es">Filtro de linea</name>
         <name lang="de">Netzfilter</name>
+        <name lang="cs">Síťový filtr 3f</name>
+        <name lang="en">Line filter</name>
+        <name lang="es">Filtro de linea</name>
+        <name lang="it">Filtro di linea</name>
+        <name lang="nl">Lijn filter</name>
     </names>
-    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect rx="0" antialias="false" ry="0" width="80" x="-40" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20"/>
+        <input tagg="label" size="9" rotate="true" text="_" x="43" y="-4.45"/>
-        <dynamic_text rotation="0" frame="false" keep_visual_rotation="false" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="2" Valignment="AlignTop" x="43" uuid="{30ec412d-e639-4c28-aed6-a06f8b5490e4}" Halignment="AlignLeft" y="-21.95" text_width="-1">
+        <text size="6" text="LINE FILTER" x="-26" y="8"/>
-            <text></text>
+        <polygon y1="-14" x3="40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="40" y3="26" y2="-14" x4="33" y4="26" closed="false" x1="33"/>
-            <info_name>label</info_name>
+        <polygon y1="-14" x3="-40" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-40" y3="26" y2="-14" x4="-33" y4="26" closed="false" x1="-33"/>
-        </dynamic_text>
+        <line y1="-14" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-13" y2="-14" length1="1.5" end2="none" x1="-28"/>
-        <text text="LINE FILTER" rotation="0" color="#000000" font="Sans Serif,6,-1,5,50,0,0,0,0,0" x="-26" y="2"/>
+        <line y1="25.95" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-12.55" y2="25.95" length1="1.5" end2="none" x1="-27.55"/>
-        <circle diameter="4.4721" antialias="true" x="-32.2361" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-22.2361"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-32.2361" y="-16.2361"/>
-        <circle diameter="4.4721" antialias="true" x="-32.2361" style="line-style:normal;line-weight:normal;filling:white;color:black" y="17.7639"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-32.2361" y="23.7639"/>
-        <circle diameter="4.4721" antialias="true" x="27.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="17.7639"/>
+        <line y1="25.95" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="7.45" y2="25.95" length1="1.5" end2="none" x1="-7.55"/>
-        <circle diameter="4.4721" antialias="true" x="27.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-22.2361"/>
+        <line y1="-14" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="27" y2="-14" length1="1.5" end2="none" x1="12"/>
-        <circle diameter="4.4721" antialias="true" x="7.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="17.7639"/>
+        <line y1="25.95" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="27.45" y2="25.95" length1="1.5" end2="none" x1="12.45"/>
-        <circle diameter="4.4721" antialias="true" x="7.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-22.2361"/>
+        <line y1="-14" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="7" y2="-14" length1="1.5" end2="none" x1="-8"/>
-        <circle diameter="4.4721" antialias="true" x="-12.2361" style="line-style:normal;line-weight:normal;filling:white;color:black" y="17.7639"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="27.7639" y="23.7639"/>
-        <circle diameter="4.4721" antialias="true" x="-12.2361" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-22.2361"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="27.7639" y="-16.2361"/>
-        <terminal name="" orientation="n" type="Generic" x="-10" uuid="{a249da08-25bc-41d9-acc5-052cd79ec69e}" y="-20"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="7.7639" y="23.7639"/>
-        <terminal name="" orientation="n" type="Generic" x="30" uuid="{1b1da244-ff4e-4744-96cb-cd47bae7c019}" y="-20"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="7.7639" y="-16.2361"/>
-        <terminal name="" orientation="n" type="Generic" x="10" uuid="{5417d31c-8613-48e8-ba76-e8c2e661c3b7}" y="-20"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-12.2361" y="23.7639"/>
-        <terminal name="" orientation="n" type="Generic" x="-30" uuid="{ce946f5b-f9da-4f0a-8add-255a91c6832e}" y="-20"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-12.2361" y="-16.2361"/>
-        <terminal name="" orientation="s" type="Generic" x="-10" uuid="{7dc0e784-c015-4d9c-b304-35e0ca7e110f}" y="20"/>
+        <terminal orientation="n" x="-10" y="-16"/>
-        <terminal name="" orientation="s" type="Generic" x="10" uuid="{25af4545-8c52-494f-8588-c101e0c8ca44}" y="20"/>
+        <terminal orientation="n" x="30" y="-16"/>
-        <terminal name="" orientation="s" type="Generic" x="30" uuid="{8d1f699f-9ef2-40f9-9c19-78b4efbfd17a}" y="20"/>
+        <terminal orientation="n" x="10" y="-16"/>
-        <terminal name="" orientation="s" type="Generic" x="-30" uuid="{2f0de0b4-ba40-4c74-bcfc-8a557001a107}" y="20"/>
+        <terminal orientation="n" x="-30" y="-16"/>
+        <terminal orientation="s" x="-10" y="28"/>
+        <terminal orientation="s" x="10" y="28"/>
+        <terminal orientation="s" x="30" y="28"/>
+        <terminal orientation="s" x="-30" y="28"/>
     </description>
 </definition>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/line_filter_3p.elmt

@@ -1,46 +1,47 @@
-<definition width="90" hotspot_x="41" height="60" type="element" link_type="simple" hotspot_y="29" version="0.90">
+<definition height="70" type="element" link_type="simple" hotspot_x="40" hotspot_y="39" width="90" version="0.5">
-    <uuid uuid="{675f5e89-e388-48bb-a548-124723d22b05}"/>
+<uuid uuid="{0AE64E73-A748-4868-8FB3-D2953F779C9A}"/><names>
-    <names>
-        <name lang="cs">Síťový filtr 3f</name>
-        <name lang="fr">Filtre réseau 3P</name>
         <name lang="de">Netzfilter 3P</name>
-        <name lang="es">Filtro de linea 3P</name>
         <name lang="en">Line filter 3P</name>
+        <name lang="es">Filtro de linea 3P</name>
         <name lang="pl">Trójbiegunowy filtr sieciowy</name>
+        <name lang="fr">Filtre réseau 3P</name>
+        <name lang="cs">Síťový filtr 3f</name>
     </names>
-    <elementInformations/>
     <informations>EN 60617: 06-14-03</informations>
     <description>
-        <rect width="75" height="50" rx="0" y="-25" x="-35" ry="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="37.5" diameter="5" y="-2.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="19" x="13" text="L3.1"/>
+        <text text="L3.1" x="13" y="14" size="6"/>
-        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="-14" x="-24" text="L1"/>
+        <text text="L1" x="-24" y="-19" size="6"/>
-        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="19" x="-7" text="L2.1"/>
+        <line y1="20" y2="20" end1="none" x1="3" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="17" length1="1.5" length2="1.5"/>
-        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="-14" x="-5" text="L2"/>
+        <line y1="20" y2="20" end1="none" x1="-17" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-3" length1="1.5" length2="1.5"/>
-        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="3" x="26" text="PE"/>
+        <text text="L2.1" x="-7" y="14" size="6"/>
-        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="-14" x="15" text="L3"/>
+        <text text="L2" x="-5" y="-19" size="6"/>
-        <dynamic_text rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" Valignment="AlignBottom" frame="false" uuid="{fb13357d-6747-4ed3-8cd6-af16702e6858}" y="-35" x="39" z="10" text_width="-1" keep_visual_rotation="false" text_from="ElementInfo">
+        <circle x="-2.5" diameter="5" y="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-            <text></text>
+        <text text="PE" x="26" y="-2" size="6"/>
-            <info_name>label</info_name>
+        <text text="L3" x="15" y="-19" size="6"/>
-        </dynamic_text>
+        <circle x="17.5" diameter="5" y="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="19" x="-28" text="L1.1"/>
+        <circle x="-22.5" diameter="5" y="17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <line x1="3" end2="none" y2="5" length1="1.5" length2="1.5" antialias="false" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5" x2="-3"/>
+        <circle x="-2.5" diameter="5" y="17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <arc width="10" height="8" angle="90" y="-3" x="-9" start="90" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <circle x="17.5" diameter="5" y="17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <arc width="8" height="6" angle="90" y="-3" x="-8" start="0" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <input rotate="true" text="_" x="-70" tagg="label" y="-20.5" size="9"/>
-        <arc width="8" height="6" angle="90" y="-3" x="0" start="180" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <text text="L1.1" x="-28" y="14" size="6"/>
-        <arc width="10" height="8" angle="90" y="-5" x="-1" start="270" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line y1="-30" y2="-30" end1="none" x1="-17" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-3" length1="1.5" length2="1.5"/>
-        <circle diameter="5" y="-27.5" x="-2.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <line y1="-30" y2="-30" end1="none" x1="3" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="17" length1="1.5" length2="1.5"/>
-        <circle diameter="5" y="-27.5" x="17.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <circle x="-22.5" diameter="5" y="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <circle diameter="5" y="-27.5" x="-22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <polygon y1="-30" closed="false" y2="-30" y3="20" x1="-23" y4="20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-35" y5="20" x3="-35" y6="20" x4="-23" x5="-23" x6="-23"/>
-        <circle diameter="5" y="2.5" x="37.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <polygon y1="-30" closed="false" y2="-30" y3="-3" x1="23" y4="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="40" y5="-3" x3="40" x4="40" x5="40"/>
-        <circle diameter="5" y="22.5" x="-22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <polygon y1="3" closed="false" y2="20" y3="20" x1="40" y4="20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="40" y5="20" x3="23" x4="23" x5="23"/>
-        <circle diameter="5" y="22.5" x="-2.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <line y1="-10" y2="0" end1="none" x1="3" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="-3" length1="1.5" length2="1.5"/>
-        <circle diameter="5" y="22.5" x="17.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <arc height="8" x="-9" y="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" start="90" width="10" angle="90"/>
-        <terminal uuid="{c59dbabf-322a-4f9a-a9fa-2090f51643c4}" type="Generic" y="-25" x="0" orientation="n" name="L2"/>
+        <arc height="6" x="-8" y="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" start="0" width="8" angle="90"/>
-        <terminal uuid="{b1eb8115-a864-4f3e-a371-bbcd9c38cd1c}" type="Generic" y="-25" x="-20" orientation="n" name="L1"/>
+        <arc height="6" x="0" y="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" start="180" width="8" angle="90"/>
-        <terminal uuid="{9e1e24cc-30bc-43ca-869d-aef7fb447ffd}" type="Generic" y="25" x="-20" orientation="s" name="L1.1"/>
+        <arc height="8" x="-1" y="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" start="270" width="10" angle="90"/>
-        <terminal uuid="{881bcffc-98f8-4a1c-9aff-61735b211477}" type="Generic" y="25" x="0" orientation="s" name="L2.1"/>
+        <terminal x="0" y="-33" orientation="n"/>
-        <terminal uuid="{ae8ed378-e2ce-41a6-88f9-90f1d8f8ccb9}" type="Generic" y="-25" x="20" orientation="n" name="L3"/>
+        <terminal x="-20" y="-33" orientation="n"/>
-        <terminal uuid="{b64c11d1-b053-4726-a6e1-d642f4133461}" type="Generic" y="25" x="20" orientation="s" name="L3.1"/>
+        <terminal x="-20" y="23" orientation="s"/>
-        <terminal uuid="{5ff2ec3b-cd57-4bcb-a1bb-5e75a1bd7351}" type="Generic" y="5" x="40" orientation="e" name="PE"/>
+        <terminal x="0" y="23" orientation="s"/>
+        <terminal x="20" y="-33" orientation="n"/>
+        <terminal x="20" y="23" orientation="s"/>
+        <terminal x="43" y="0" orientation="e"/>
     </description>
 </definition>

elements/10_electric/10_allpole/340_converters&inverters/90_filters/schurter/kfs4300.elmt

@@ -1,7 +1,6 @@
 <definition hotspot_x="35" link_type="simple" height="80" type="element" width="70" version="0.80" hotspot_y="40">
     <uuid uuid="{617264c1-5351-4e5e-9a43-eeb1077403ce}"/>
     <names>
-        <name lang="de">Netzfilter Schurter KFS 4300</name>
         <name lang="cs">Filtr KFS 4300</name>
         <name lang="fr">Filtre KFS 4300</name>
     </names>

elements/10_electric/10_allpole/380_signaling&operating/01_human_machine_interface/ecran_ihm_tactile_1.elmt

@@ -1,37 +1,34 @@
-<definition type="element" hotspot_y="124" link_type="simple" hotspot_x="125" version="0.90" width="250" height="250">
+<definition height="250" link_type="simple" type="element" hotspot_y="123" version="0.5" hotspot_x="125" width="250">
-    <uuid uuid="{6d2fbbec-24cd-458f-8a03-d196ca8af5f0}"/>
+    <uuid uuid="{6bf14a17-bc23-4b53-84d4-be4d8fc20178}"/>
     <names>
-        <name lang="es">HMI TÁCTIL 1</name>
-        <name lang="en">Touch panel 1</name>
-        <name lang="ar">HMI TACTILE 1</name>
         <name lang="fr">HMI TACTILE 1</name>
         <name lang="de">Touchpanel 1</name>
-        <name lang="cs">Dotykový panel 1</name>
-        <name lang="pl">HMI TACTILE 1</name>
         <name lang="it">Touch Screen 1</name>
+        <name lang="es">HMI TÁCTIL 1</name>
+        <name lang="ar">HMI TACTILE 1</name>
+        <name lang="cs">Dotykový panel 1</name>
+        <name lang="en">Touch panel 1</name>
+        <name lang="pl">HMI TACTILE 1</name>
         <name lang="nl">HMI Aanraakscherm groot</name>
     </names>
-    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <dynamic_text z="1" text_from="UserText" uuid="{4bc4cb73-0a67-4fc8-921c-3eb551e65ce5}" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" y="105.5" text_width="-1" Valignment="AlignTop" rotation="0" x="-87" frame="false" keep_visual_rotation="false">
+        <input y="113" text="-_" x="-87" rotate="true" size="4" tagg="none"/>
-            <text>-_</text>
+        <arc y="105.5" height="15" x="-120" start="-90" antialias="true" angle="-90" width="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        </dynamic_text>
+        <input y="113" text="PE_" x="-67" rotate="true" size="4" tagg="none"/>
-        <dynamic_text z="3" text_from="UserText" uuid="{bef377ff-1951-4f18-8618-e5f728cdec08}" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" y="105.5" text_width="-1" Valignment="AlignTop" rotation="0" x="-67" frame="false" keep_visual_rotation="false">
+        <arc y="-120" height="15" x="-120" start="-180" antialias="true" angle="-90" width="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-            <text>PE_</text>
+        <arc y="105.5" height="15" x="105" start="0" antialias="true" angle="-90" width="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        </dynamic_text>
+        <arc y="-120" height="15" x="105" start="90" antialias="true" angle="-90" width="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" rx="0" y="-100" antialias="false" x="-100" width="200" style="line-style:normal;line-weight:normal;filling:none;color:black" height="200"/>
+        <line end1="none" y2="-120" antialias="false" x1="-112" y1="-120" length2="1.5" length1="1.5" x2="112" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text z="12" text_from="ElementInfo" uuid="{6268b392-3be8-432d-a70e-860439c1162f}" font="Sans Serif,5,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" y="-17" text_width="-1" Valignment="AlignTop" rotation="0" x="-28" frame="false" keep_visual_rotation="false">
+        <line end1="none" y2="112" antialias="false" x1="-120" y1="-113" length2="1.5" length1="1.5" x2="-120" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-            <text></text>
+        <line end1="none" y2="111.983" antialias="false" x1="120" y1="-112.984" length2="1.5" length1="1.5" x2="120" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-            <info_name>label</info_name>
+        <line end1="none" y2="120.5" antialias="false" x1="-113.45" y1="120.5" length2="1.5" length1="1.5" x2="111.404" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        </dynamic_text>
+        <rect y="-100" height="200" x="-100" antialias="false" width="200" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text z="13" text_from="UserText" uuid="{77e6cfd3-b413-497b-8f9b-98aea31a837e}" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" y="105.5" text_width="-1" Valignment="AlignTop" rotation="0" x="-106" frame="false" keep_visual_rotation="false">
+        <input y="-8.5" text="MARQUE_" x="-28" rotate="true" size="5" tagg="label"/>
-            <text>+_</text>
+        <input y="113" text="+_" x="-106" rotate="true" size="4" tagg="none"/>
-        </dynamic_text>
+        <terminal y="121" x="-100" orientation="s"/>
-        <rect ry="7.5" rx="7.5" y="-120" antialias="false" x="-120" width="240" style="line-style:normal;line-weight:normal;filling:none;color:black" height="240"/>
+        <terminal y="121" x="-80" orientation="s"/>
-        <terminal type="Generic" orientation="s" uuid="{69a636e0-9292-4add-9e34-b9e502f1fb4c}" y="120" name="L+" x="-100"/>
+        <terminal y="121" x="-60" orientation="s"/>
-        <terminal type="Generic" orientation="s" uuid="{8fe98469-1350-4b7b-8d96-33fc7b97c0b2}" y="120" name="L-" x="-80"/>
-        <terminal type="Generic" orientation="s" uuid="{776f96f3-72be-4037-947d-054734470804}" y="120" name="PE" x="-60"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/01_human_machine_interface/ecran_ihm_tactile_2.elmt

@@ -1,37 +1,34 @@
-<definition type="element" height="170" link_type="simple" hotspot_x="95" version="0.90" width="190" hotspot_y="76">
+<definition height="170" link_type="simple" type="element" hotspot_y="75" version="0.5" hotspot_x="95" width="190">
-    <uuid uuid="{16fafb3a-6603-4d7c-a856-95089c024e36}"/>
+    <uuid uuid="{e8b19d52-137c-4cac-a884-76d245faaf2a}"/>
     <names>
-        <name lang="es">HMI TÁCTIL 2</name>
-        <name lang="ar">HMI TACTILE 2</name>
-        <name lang="it">Touch screen 2</name>
-        <name lang="pl">HMI TACTILE 2</name>
-        <name lang="cs">Dotykový panel 2</name>
-        <name lang="nl">HMI Aanraakscherm klein</name>
-        <name lang="en">Touch panel 2</name>
         <name lang="fr">HMI TACTILE 2</name>
         <name lang="de">Touchpanel 2</name>
+        <name lang="it">Touch screen 2</name>
+        <name lang="es">HMI TÁCTIL 2</name>
+        <name lang="ar">HMI TACTILE 2</name>
+        <name lang="cs">Dotykový panel 2</name>
+        <name lang="en">Touch panel 2</name>
+        <name lang="pl">HMI TACTILE 2</name>
+        <name lang="nl">HMI Aanraakscherm klein</name>
     </names>
-    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <dynamic_text x="-64.25" y="71.95" frame="false" text_width="-1" Halignment="AlignLeft" font="Sans Serif,4,-1,5,25,0,0,0,0,0" z="1" uuid="{72398da9-58a2-4bae-b5ba-6a3a22918c03}" text_from="UserText" Valignment="AlignTop" rotation="0" keep_visual_rotation="false">
+        <input y="79.45" text="-_" x="-64.25" rotate="true" size="4" tagg="none"/>
-            <text>-_</text>
+        <arc y="76.575" height="9.75" x="-90" start="-90" antialias="true" angle="-90" width="11.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        </dynamic_text>
+        <input y="79.45" text="PE_" x="-51.25" rotate="true" size="4" tagg="none"/>
-        <dynamic_text x="-51.25" y="71.95" frame="false" text_width="-1" Halignment="AlignLeft" font="Sans Serif,4,-1,5,25,0,0,0,0,0" z="3" uuid="{4f639ad6-baae-46b7-9e32-6b0391414924}" text_from="UserText" Valignment="AlignTop" rotation="0" keep_visual_rotation="false">
+        <arc y="-70" height="9.75" x="-90" start="-180" antialias="true" angle="-90" width="11.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-            <text>PE_</text>
+        <arc y="76.575" height="9.75" x="78.75" start="0" antialias="true" angle="-90" width="11.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        </dynamic_text>
+        <arc y="-70" height="9.75" x="78.75" start="90" antialias="true" angle="-90" width="11.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect x="-75" y="-57" ry="0" height="130" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="150" antialias="false"/>
+        <line end1="none" y2="-70" antialias="false" x1="-84" y1="-70" length2="1.5" length1="1.5" x2="84" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text x="-21" y="-6.025" frame="false" text_width="-1" Halignment="AlignLeft" font="Sans Serif,5,-1,5,50,0,0,0,0,0" z="12" uuid="{b14df802-4071-4560-b59c-10ab8b5ddf05}" text_from="ElementInfo" Valignment="AlignTop" rotation="0" keep_visual_rotation="false">
+        <line end1="none" y2="80.8" antialias="false" x1="-90" y1="-65.45" length2="1.5" length1="1.5" x2="-90" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-            <text></text>
+        <line end1="none" y2="80.789" antialias="false" x1="90" y1="-65.4396" length2="1.5" length1="1.5" x2="90" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-            <info_name>label</info_name>
+        <line end1="none" y2="86.325" antialias="false" x1="-85.0877" y1="86.325" length2="1.5" length1="1.5" x2="83.553" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        </dynamic_text>
+        <rect y="-57" height="130" x="-75" antialias="false" width="150" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text x="-80.5" y="71.95" frame="false" text_width="-1" Halignment="AlignLeft" font="Sans Serif,4,-1,5,25,0,0,0,0,0" z="13" uuid="{8fa2a525-390a-4ebe-a566-35aeddd7ac2d}" text_from="UserText" Valignment="AlignTop" rotation="0" keep_visual_rotation="false">
+        <input y="2.475" text="MARQUE_" x="-21" rotate="true" size="5" tagg="label"/>
-            <text>+_</text>
+        <input y="79.45" text="+_" x="-80.5" rotate="true" size="4" tagg="none"/>
-        </dynamic_text>
+        <terminal y="86.65" x="-75" orientation="s"/>
-        <rect x="-90" y="-70" ry="6" height="156" rx="6" style="line-style:normal;line-weight:normal;filling:none;color:black" width="180" antialias="false"/>
+        <terminal y="86.65" x="-60" orientation="s"/>
-        <terminal x="-75" y="86" type="Generic" uuid="{a0b00b3d-9a47-4384-bc16-3e82e94dbb5d}" orientation="s" name="L+"/>
+        <terminal y="86.65" x="-45" orientation="s"/>
-        <terminal x="-60" y="86" type="Generic" uuid="{c8ce27d3-74e1-401f-a5ba-d8a74f75d77c}" orientation="s" name="L-"/>
-        <terminal x="-45" y="86" type="Generic" uuid="{eee7a714-a41a-45b2-8165-71558d089e42}" orientation="s" name="PE"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/carte_voyant.elmt

@@ -1,148 +1,135 @@
-<definition height="90" type="element" width="450" link_type="simple" hotspot_x="225" hotspot_y="44" version="0.90">
+<definition version="0.70" type="element" width="450" height="90" hotspot_y="44" hotspot_x="225" link_type="simple">
-    <uuid uuid="{8b521f7d-d3c8-4169-89be-6f50ca074a2e}"/>
+    <uuid uuid="{202b43e9-7b17-4df1-8a21-b0bbdd57c9ab}"/>
     <names>
-        <name lang="de">LED-Karte</name>
         <name lang="fr">Carte à voyant</name>
     </names>
-    <elementInformations>
+    <elementInformations/>
-        <elementInformation name="designation" show="1"></elementInformation>
+    <informations></informations>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-    </elementInformations>
-    <informations>S.DEFFAUX</informations>
     <description>
-        <circle y="16.5" x="6.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="16.5"/>
-        <circle y="16.5" x="-143.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="16.5"/>
-        <circle y="16.5" x="66.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="16.5"/>
-        <circle y="-23.5" x="126.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="-23.5"/>
-        <rect height="10" ry="0" y="-25" width="20" rx="0" x="-170" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-170" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
-        <circle y="-23.5" x="-123.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="-23.5"/>
-        <circle y="16.5" x="126.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="16.5"/>
-        <rect height="10" ry="0" y="-25" width="20" rx="0" x="-150" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-150" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
-        <circle y="16.5" x="-83.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="16.5"/>
-        <text y="10" color="#000000" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="-100" text="RD2"/>
+        <text x="-100" color="#000000" text="RD2" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
-        <circle y="-23.5" x="-83.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="-23.5"/>
-        <circle y="-23.5" x="-143.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="-23.5"/>
-        <circle y="16.5" x="106.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="16.5"/>
-        <circle y="-23.5" x="6.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="-23.5"/>
-        <circle y="16.5" x="-13.54" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="16.5"/>
-        <circle y="16.5" x="186.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="16.5"/>
-        <circle y="16.5" x="-103.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="16.5"/>
-        <circle y="16.5" x="46.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="16.5"/>
-        <circle y="16.5" x="-163.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="16.5"/>
-        <rect height="10" ry="0" y="15" width="60" rx="0" x="80" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="80" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <circle y="-23.5" x="66.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="-23.5"/>
-        <rect height="10" ry="0" y="-25" width="20" rx="0" x="-90" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-90" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
-        <rect height="10" ry="0" y="15" width="60" rx="0" x="-190" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-190" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <rect height="10" ry="0" y="15" width="60" rx="0" x="-130" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-130" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <rect height="10" ry="0" y="-25" width="40" rx="0" x="-130" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-130" rx="0" antialias="false" ry="0" width="40" height="10" y="-25"/>
-        <rect height="10" ry="0" y="15" width="60" rx="0" x="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <rect height="10" ry="0" y="15" width="60" rx="0" x="-40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-40" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <circle y="16.5" x="166.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="16.5"/>
-        <circle y="-23.5" x="-163.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="-23.5"/>
-        <circle y="-23.5" x="186.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="-23.5"/>
-        <circle y="16.5" x="-123.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="16.5"/>
-        <circle y="-23.5" x="-103.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="-23.5"/>
-        <circle y="16.5" x="-183.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-183.535" antialias="false" y="16.5"/>
-        <circle y="16.5" x="86.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="16.5"/>
-        <circle y="16.5" x="-33.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="16.5"/>
-        <circle y="16.5" x="26.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="16.5"/>
-        <circle y="-23.5" x="106.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="-23.5"/>
-        <circle y="-23.5" x="-13.54" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="-23.5"/>
-        <circle y="-23.5" x="46.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="-23.5"/>
-        <rect height="10" ry="0" y="-25" width="60" rx="0" x="-40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-40" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <circle y="-23.5" x="166.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="-23.5"/>
-        <rect height="10" ry="0" y="-25" width="60" rx="0" x="80" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="80" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <rect height="10" ry="0" y="-25" width="60" rx="0" x="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <circle y="-23.5" x="26.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="-23.5"/>
-        <circle y="-23.5" x="-33.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="-23.5"/>
-        <circle y="-23.5" x="86.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="-23.5"/>
-        <rect height="10" ry="0" y="-25" width="60" rx="0" x="140" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="140" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <rect height="10" ry="0" y="15" width="60" rx="0" x="140" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="140" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <circle y="-23.5" x="146.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="-23.5"/>
-        <rect height="80" ry="0" y="-40" width="440" rx="0" x="-220" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-220" rx="0" antialias="false" ry="0" width="440" height="80" y="-40"/>
-        <circle y="16.5" x="146.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="16.5"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-180" text="NO"/>
+        <text x="-180" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-160" text="C"/>
+        <text x="-160" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-140" text="NF"/>
+        <text x="-140" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="10" color="#000000" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="-160" text="RD1"/>
+        <text x="-160" color="#000000" text="RD1" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-120" text="NO"/>
+        <text x="-120" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-100" text="C"/>
+        <text x="-100" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-79" text="NF"/>
+        <text x="-79" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-29.86" text="24"/>
+        <text x="-29.8553" color="#000000" text="24" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-10" text="23"/>
+        <text x="-10" color="#000000" text="23" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="10" text="22"/>
+        <text x="10" color="#000000" text="22" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="30" text="21"/>
+        <text x="30" color="#000000" text="21" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="50" text="20"/>
+        <text x="50" color="#000000" text="20" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="70" text="19"/>
+        <text x="70" color="#000000" text="19" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="90" text="18"/>
+        <text x="90" color="#000000" text="18" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="110" text="17"/>
+        <text x="110" color="#000000" text="17" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="130" text="16"/>
+        <text x="130" color="#000000" text="16" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="150" text="15"/>
+        <text x="150" color="#000000" text="15" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="170" text="14"/>
+        <text x="170" color="#000000" text="14" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="190" text="13"/>
+        <text x="190" color="#000000" text="13" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-30.91" text="01"/>
+        <text x="-30.9073" color="#000000" text="01" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-10" text="02"/>
+        <text x="-10" color="#000000" text="02" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="30" text="04"/>
+        <text x="30" color="#000000" text="04" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="50" text="05"/>
+        <text x="50" color="#000000" text="05" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="70" text="06"/>
+        <text x="70" color="#000000" text="06" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="90" text="07"/>
+        <text x="90" color="#000000" text="07" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="110" text="08"/>
+        <text x="110" color="#000000" text="08" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="130" text="09"/>
+        <text x="130" color="#000000" text="09" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="150" text="10"/>
+        <text x="150" color="#000000" text="10" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="170" text="11"/>
+        <text x="170" color="#000000" text="11" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="190" text="12"/>
+        <text x="190" color="#000000" text="12" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="10" text="03"/>
+        <text x="10" color="#000000" text="03" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-165" text="24VTp"/>
+        <text x="-165" color="#000000" text="24VTp" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-145" text="+24V"/>
+        <text x="-145" color="#000000" text="+24V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-126" text="24VAC"/>
+        <text x="-126" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-106" text="24VAC"/>
+        <text x="-106" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-83" text="0V"/>
+        <text x="-83" color="#000000" text="0V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <line y1="-20" length2="1.5" end2="none" length1="1.5" x1="-199.78" antialias="false" x2="-199.78" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" end1="none"/>
+        <line x1="-199.776" y2="0" length2="1.5" length1="1.5" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end2="none" x2="-199.776" end1="none"/>
-        <rect height="1" ry="0" y="-17" width="0" rx="0" x="-204" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-204" rx="0" antialias="false" ry="0" width="0" height="1" y="-17"/>
-        <rect height="15" ry="0" y="-17" width="8.45" rx="0" x="-204" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-204" rx="0" antialias="false" ry="0" width="8.4474" height="15" y="-17"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-29.86" uuid="{55f47e81-e1b8-4e1a-b37f-59d349ab904c}"/>
+        <terminal x="-29.8553" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="10" uuid="{5d031e4f-fc16-437c-b5ce-1a9b15ed2e9d}"/>
+        <terminal x="10" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-79.86" uuid="{edeb5033-7480-4b78-895e-b6158d87ddec}"/>
+        <terminal x="-79.8553" orientation="s" y="40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="70.14" uuid="{140fca0c-6803-486f-943e-ddcd683b0de2}"/>
+        <terminal x="70.1447" orientation="s" y="40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-9.86" uuid="{9a110fea-cd6f-4c84-9897-5f97e95cdc55}"/>
+        <terminal x="-9.8553" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="-140" uuid="{d185d372-4d18-4dd2-83aa-e9e758921f13}"/>
+        <terminal x="-140" orientation="n" y="-40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="150" uuid="{d1f29465-f9ca-41fc-bc4b-0620d117dae8}"/>
+        <terminal x="150" orientation="n" y="-40"/>
-        <terminal y="-39" type="Generic" name="" orientation="n" x="-120" uuid="{bfd67b54-84ea-4b47-bcc5-6a9c8153875b}"/>
+        <terminal x="-120" orientation="n" y="-39"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="50.14" uuid="{67dd48c0-0dda-499c-aa55-224f75f70c0c}"/>
+        <terminal x="50.1447" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="70" uuid="{02cb24f4-c327-4802-b813-a12a2389a755}"/>
+        <terminal x="70" orientation="n" y="-40"/>
-        <terminal y="-40" type="Generic" name="01" orientation="n" x="-30" uuid="{54f46748-55ea-4642-9af9-257c122a062a}"/>
+        <terminal x="-30" orientation="n" y="-40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="110" uuid="{c32a8e92-8a87-4cb4-a63b-f055b7164ad0}"/>
+        <terminal x="110" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-119.86" uuid="{ec60a1d4-f481-4edc-abc5-b5037f596eb5}"/>
+        <terminal x="-119.855" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="30" uuid="{843be5e1-2eae-438f-b7cb-424b12369d35}"/>
+        <terminal x="30" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-99.86" uuid="{461536c0-cc2b-42b6-8d02-c863261a2688}"/>
+        <terminal x="-99.8553" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="-100" uuid="{3f5028bf-3dba-40ec-a925-56d098ba921e}"/>
+        <terminal x="-100" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="10.14" uuid="{b10fbc12-5445-4fbc-bb70-adb5f85cd96f}"/>
+        <terminal x="10.1447" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="-160" uuid="{2dbad4df-80ec-449f-9b6d-3e1b2976aa22}"/>
+        <terminal x="-160" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="130.15" uuid="{c00dbddf-102e-425f-8453-9985e904c975}"/>
+        <terminal x="130.145" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="190" uuid="{ee1caef2-b9b8-41fb-9b1c-b98cc109753f}"/>
+        <terminal x="190" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-139.85" uuid="{0ce2b148-2d32-42f5-976b-cc2fde126f59}"/>
+        <terminal x="-139.855" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="130" uuid="{664149b6-c0bb-4acd-a17c-521bb9fd41c6}"/>
+        <terminal x="130" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-180" uuid="{655fd653-24fd-49ad-8128-422a4ac51c7e}"/>
+        <terminal x="-180" orientation="s" y="40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="-160" uuid="{0bc9470d-51a1-4e3a-9d32-769ef53afcd3}"/>
+        <terminal x="-160" orientation="s" y="40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="30.14" uuid="{6df93baf-2a5a-43cb-b390-da7d94a076d9}"/>
+        <terminal x="30.1447" orientation="s" y="40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="150.15" uuid="{8ec15c77-2440-4ca9-a757-e56510facd05}"/>
+        <terminal x="150.145" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="90" uuid="{edb54ede-15e1-41e3-9b18-61530d98b1a3}"/>
+        <terminal x="90" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="109.88" uuid="{62c72ef3-fc5a-42bc-a4c0-3667b8981f16}"/>
+        <terminal x="109.883" orientation="s" y="40"/>
-        <terminal y="-39" type="Generic" name="" orientation="n" x="-80" uuid="{79a97b90-57cd-47f3-bb32-f5b740f1f551}"/>
+        <terminal x="-80" orientation="n" y="-39"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="90.14" uuid="{aa704c47-46ab-4df7-b20b-2db94adb3222}"/>
+        <terminal x="90.1447" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="50" uuid="{33b5ce91-93af-4c08-afd9-aff6007fbc72}"/>
+        <terminal x="50" orientation="n" y="-40"/>
-        <terminal y="-40" type="Generic" name="" orientation="n" x="170" uuid="{ef6df1d3-dba8-4e7b-be4b-e62d45fc5436}"/>
+        <terminal x="170" orientation="n" y="-40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="190" uuid="{fc0fa3ed-c8e8-482d-a6f5-f3a1482c0544}"/>
+        <terminal x="190" orientation="s" y="40"/>
-        <terminal y="40" type="Generic" name="" orientation="s" x="170.15" uuid="{0ce8acd4-a116-4ca6-951b-301870782626}"/>
+        <terminal x="170.145" orientation="s" y="40"/>
-        <terminal y="-40" type="Generic" name="02" orientation="n" x="-10" uuid="{de6c321a-05b4-405a-8806-3547c266718d}"/>
+        <terminal x="-10" orientation="n" y="-40"/>
     </description>
 </definition>