Test font size in pixel for DynamicElementTextItem

Fix bug 249.
https://qelectrotech.org/bugtracker/view.php?id=249

.github/workflows/publish-edge-snap.yml

@@ -0,0 +1,21 @@
+name: Publish Edge Snap
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish_amd64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: snapcore/action-build@v1
+      id: build
+      with:
+        snapcraft-args: --enable-experimental-extensions
+    - uses: snapcore/action-publish@v1
+      with:
+        store_login: ${{ secrets.STORE_LOGIN }}
+        snap: ${{ steps.build.outputs.snap }}
+        release: edge

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

@@ -78,18 +78,17 @@
       ]
     },
     {
-    "name": "python3.6.0",
+    "name": "python3-PySimpleGUI",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
+    ],
     "sources": [
         {
-            "type": "archive",
-            "url": "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz",
-            "sha256": "b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622"
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
+            "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
         }
-    ],
-    "config-opts": ["--enable-shared"],
-    "post-install": [
-        "chmod +w ${FLATPAK_DEST}/lib/libpython3.6m.so.1.0",
-        "chmod +w ${FLATPAK_DEST}/lib/libpython3.so"
     ]
 },
     {
@@ -101,25 +100,10 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/9e/c3/aaad3309a5f2ca08e2fa0ab01123bb6fafb15a92854bff88042039192a67/qet_tb_generator-1.1.7.tar.gz",
-            "sha256": "f626ab7bf4d9091fc85f63d33136585e611272b347499b448ece4e33cc04eeed"
+            "url": "https://files.pythonhosted.org/packages/70/aa/ebde0dddfbde799a4e8cf0564e52f95089105a7f562739ee1d16ff5a495a/qet_tb_generator-1.3.1.tar.gz",
+            "sha256": "52c9836387d54bc30ea29272068ec156fc65c3905e0cb863afd9418abc3c0907"
         }
     ]
-},
-    {
-      "name": "DXFtoQET-2020-1",
-      "buildsystem": "qmake",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qelectrotech/DXFtoQET-2020.git",
-          "commit": "01fbb2afe0fe66782cb1d1f901c73616c7d5299d"
-        }
-      ],
-      "post-install": [
-        "mkdir -p ${FLATPAK_DEST}/bin",
-        "cp DXFtoQET ${FLATPAK_DEST}/bin/"
-        ]
 }
   ]
 }

build-aux/snap/local/launchers/qelectrotech-launch

@@ -1,13 +1,15 @@
 #!/bin/sh
 
-# a KDE session forces the KDE Plasma platformtheme which is incompatible with QET
-# unset the ENV vars in that case to prevent loading of the theme
-if [ ! -z "$KDE_FULL_SESSION" ]; then
-  unset KDE_FULL_SESSION
-fi
-
-if echo "$XDG_CURRENT_DESKTOP" | grep -q KDE; then
-  unset XDG_CURRENT_DESKTOP
+# check if _only_ the correct framework snap is connected
+framework_name=$(grep "name:" $SNAP/kf5/meta/snap.yaml | cut -d" " -f2)
+if [ "$framework_name" != "kde-frameworks-5-qt-5-15-3-core20" ]; then
+  downloads_dir=$(xdg-user-dir DOWNLOAD)
+  test ! -d "$downloads_dir" && mkdir -p "$downloads_dir"
+  instructions_file="snap.qelectrotech.update-instructions.html"
+  target="$downloads_dir/$instructions_file"
+  cp "$SNAP/update-instructions/$instructions_file" "$target"
+  xdg-open "$target"
+  exit 1
 fi
 
 # migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
@@ -23,12 +25,4 @@ fi
 mkdir -p "$HOME/.qet"
 ln -snf "$SNAP/bin/DXFtoQET" "$HOME/.qet/DXFtoQET"
 
-# start desktop portal. Open & save dialogs might fail if it is not running
-dbus-send --print-reply \
-  --dest=org.freedesktop.DBus \
-  /org/freedesktop/DBus \
-  org.freedesktop.DBus.StartServiceByName \
-  string:org.freedesktop.portal.Desktop \
-  uint32:0
-
 exec "${@}"

build-aux/snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: qelectrotech
 title: QElectroTech
-base: core18
+base: core20
 adopt-info: qelectrotech
 license: GPL-2.0
 summary: Electrical diagram editor
@@ -10,6 +10,7 @@ description: |
 
 grade: stable
 confinement: strict
+compression: lzo
 
 architectures:
   - build-on: amd64
@@ -30,15 +31,14 @@ apps:
     extensions: [kde-neon]
     plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
     environment: &env
-      __EGL_VENDOR_LIBRARY_DIRS: $SNAP/kf5/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
       TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
-      QT_QPA_PLATFORMTHEME: gtk3
-      QT_AUTO_SCREEN_SCALE_FACTOR: 1
       HOME: $SNAP_USER_COMMON
-      PYTHONPATH: $SNAP:$SNAP/lib/python3.6/site-packages:$SNAP/usr/lib/python3.6:$SNAP/usr/lib/python3.6/lib-dynload
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3.8:$SNAP/usr/lib/python3.8/lib-dynload
 
   qet-tb-generator:
-    command: bin/qelectrotech-launch $SNAP/bin/qet_tb_generator
+    command: bin/qet_tb_generator
+    command-chain:
+      - bin/qelectrotech-launch
     extensions: [kde-neon]
     plugs: *plugs
     environment: *env
@@ -56,10 +56,16 @@ parts:
     organize:
       '*': bin/
 
+  update-instructions:
+    plugin: dump
+    source: build-aux/snap/local/update-instructions
+    organize: 
+      '*': update-instructions/
+
   qet-tb-generator:
     plugin: python
-    python-version: python3
-    source: https://github.com/qelectrotech/qet_tb_generator.git
+    source: https://github.com/raulroda/qet_tb_generator-plugin.git
+    python-packages: [PySimpleGUI]
     stage-packages: 
       - python3-lxml
       - python3-tk
@@ -68,14 +74,14 @@ parts:
   kde-sdk-setup:
     plugin: nil
     build-snaps:
-      - kde-frameworks-5-core18-sdk
+      - kde-frameworks-5-qt-5-15-3-core20-sdk
     build-packages:
       - g++
       - mesa-common-dev
       - libglvnd-dev
       - rsync
     override-build: |
-      rsync -a --ignore-existing /snap/kde-frameworks-5-core18-sdk/current/ /
+      rsync -a --ignore-existing /snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current/ /
       
   dxf-to-qet:
     after: [kde-sdk-setup]
@@ -91,14 +97,15 @@ parts:
     after: [kde-sdk-setup]
     plugin: nil
     source: .
-    stage-packages: [ git, sqlite3 ]
+    stage-packages: [ git, sqlite3, xdg-user-dirs ]
     build-packages:
       - git
       - libsqlite3-dev
     override-pull: |
       snapcraftctl pull
-      snap_version=$(git describe --dirty)
-      modified_displayed_version=$snap_version".snap"
+      displayed_version=$(grep "displayedVersion" sources/qet.h | tr -d "\";" | cut -d" " -f5)
+      snap_version="${displayed_version}~$(git rev-parse --short=8 HEAD)"
+      modified_displayed_version="${snap_version}.snap"
       sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
       snapcraftctl set-version "$snap_version"
     override-build: |
@@ -114,11 +121,14 @@ parts:
   cleanup:
     after: [qelectrotech, dxf-to-qet, qet-tb-generator]
     plugin: nil
-    build-snaps: [core18, kde-frameworks-5-core18]
+    build-snaps: [kde-frameworks-5-qt-5-15-3-core20]
     override-prime: |
-      # Remove all files from snap that are already included in the base snap or in
-      # any connected content snaps
       set -eux
-      for snap in "core18" "kde-frameworks-5-core18"; do  # List all content-snaps and base snaps you're using here
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      for snap in "kde-frameworks-5-qt-5-15-3-core20"; do  # List all content-snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" "$SNAPCRAFT_PRIME/usr/{}" \;
       done
+      for cruft in bug lintian man; do
+        rm -rf $SNAPCRAFT_PRIME/usr/share/$cruft
+      done
+      find $SNAPCRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
+      find $SNAPCRAFT_PRIME/usr/share -type d -empty -delete

cmake/qet_compilation_vars.cmake

@@ -113,9 +113,6 @@ 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
@@ -161,8 +158,6 @@ 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
@@ -581,9 +576,13 @@ 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/110_network_supplies/3_pen_pravy.elmt

@@ -12,7 +12,7 @@
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
         <name lang="cs">Přípojnice 3f+PEN pravá</name>
-	<name lang="hu">3F + PEN</name>
+	    <name lang="hu">3F + PEN</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team

elements/10_electric/10_allpole/110_network_supplies/3f_n_pe_pravy.elmt

@@ -12,7 +12,7 @@
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
         <name lang="cs">Přípojnice 3f+N+PE pravá</name>
-	<name lang="hu">3F + N + PE</name>
+	    <name lang="hu">3F + N + PE</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team

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

@@ -14,7 +14,7 @@
         <name lang="es">Masa</name>
         <name lang="ar">هيكل معدني</name>
         <name lang="fr">Masse</name>
-	<name lang="hu">Test</name>
+	    <name lang="hu">Test</name>
     </names>
     <elementInformations>
         <elementInformation name="comment" show="1"></elementInformation>

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

@@ -13,7 +13,7 @@
         <name lang="en">Chassis</name>
         <name lang="fr">Masse</name>
         <name lang="ru">Шасси</name>
-	<name lang="hu">Vázszerkezet</name>
+	    <name lang="hu">Vázszerkezet</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -12,7 +12,7 @@
         <name lang="en">Single-pole source + PE +N</name>
         <name lang="fr">Source unipolaire + PE +N</name>
         <name lang="ru">Однополюсный + PE +N</name>
-	<name lang="hu">F + N + PE</name>
+	    <name lang="hu">F + N + PE</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -12,7 +12,7 @@
         <name lang="en">Single-pole source +PEN</name>
         <name lang="fr">Source unipolaire + PEN</name>
         <name lang="ru">Однополюсный + PEN</name>
-	<name lang="hu">F + PEN</name>
+	    <name lang="hu">F + PEN</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -13,7 +13,7 @@
         <name lang="en">Single-pole source + neutral</name>
         <name lang="fr">Source unipolaire + neutre</name>
         <name lang="ru">Однополюсный + нейтраль</name>
-	<name lang="hu">F + N</name>
+	    <name lang="hu">F + N</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -13,7 +13,7 @@
         <name lang="en">Three-pole source</name>
         <name lang="fr">Source tripolaire</name>
         <name lang="ru">Трёхполюсный</name>
-	<name lang="hu">3F</name>
+	    <name lang="hu">3F</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -12,7 +12,7 @@
         <name lang="en">Three-pole source + PE +N</name>
         <name lang="fr">Source tripolaire + PE +N</name>
         <name lang="ru">Трёхполюсный + PE +N</name>
-	<name lang="hu">3F + N + PE</name>
+	    <name lang="hu">3F + N + PE</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -12,7 +12,7 @@
         <name lang="en">Three-pole source + PEN</name>
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ru">Трёхполюсный + PEN</name>
-	<name lang="hu">3F + PEN</name>
+	    <name lang="hu">3F + PEN</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -13,7 +13,7 @@
         <name lang="en">Three-pole source + neutral</name>
         <name lang="fr">Source tripolaire + neutre</name>
         <name lang="ru">Трёхполюсный + нейтраль</name>
-	<name lang="hu">3F + N</name>
+	    <name lang="hu">3F + N</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -13,7 +13,7 @@
         <name lang="en">Neutral source</name>
         <name lang="fr">Source neutre</name>
         <name lang="ru">Нейтраль</name>
-	<name lang="hu">N</name>
+	    <name lang="hu">N</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -13,7 +13,7 @@
         <name lang="en">Phase source</name>
         <name lang="fr">Source phase</name>
         <name lang="ru">Фаза</name>
-	<name lang="hu">F</name>
+	    <name lang="hu">F</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -11,7 +11,7 @@
         <name lang="en">Distribution point TN-C >TN-S</name>
         <name lang="fr">Point de distribution TN-C >TN-S</name>
         <name lang="ru">Распределительный пункт TN-C >TN-S</name>
-	<name lang="hu">3F + PEN szétválasztva TN-C-ről TN-S-re</name>
+	    <name lang="hu">3F + PEN szétválasztva TN-C-ről TN-S-re</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

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

@@ -1,17 +1,23 @@
-<definition width="20" height="20" hotspot_y="9" type="element" link_type="simple" hotspot_x="9" version="0.60">
-    <uuid uuid="{079913f8-18b5-4524-84bd-aadf75dfefbf}"/>
+<definition width="20" version="0.90" type="element" height="20" hotspot_y="9" link_type="simple" hotspot_x="9">
+    <uuid uuid="{1eefef79-1c23-413b-873a-3d84f4aa5c25}"/>
     <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 diameter="4" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-2" x="-2"/>
-        <input rotate="true" text=" " tagg="label" size="9" y="-3" x="-11"/>
-        <terminal orientation="e" y="0" x="2"/>
-        <terminal orientation="w" y="0" x="-2"/>
-        <terminal orientation="s" y="2" x="0"/>
-        <terminal orientation="n" y="-2" x="0"/>
+        <circle y="-2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" diameter="4" 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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="0" type="Generic" uuid="{9cc2fc56-976f-49ac-a0f8-63eb85f716c2}" orientation="e" x="2" name=""/>
+        <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,22 +1,24 @@
-<definition hotspot_x="14" height="30" link_type="simple" width="30" version="0.80" type="element" hotspot_y="12">
-    <uuid uuid="{0b6817fe-dd44-42a8-8e7c-3c110d13b8a2}"/>
+<definition type="element" width="30" hotspot_y="12" version="0.90" height="30" link_type="simple" hotspot_x="14">
+    <uuid uuid="{9b3513fd-694f-4fc7-8b7e-66b733b9b4e1}"/>
     <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 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">
+        <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">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <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" 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 x="10" orientation="e" uuid="{06bf5c9f-6986-45bf-b11f-02e876abc4b8}" y="0" name=""/>
-        <terminal x="0" orientation="n" uuid="{33c03677-8555-4b42-ae2c-4b4308978086}" y="-5" name=""/>
-        <terminal x="-10" orientation="w" uuid="{95bef6e9-343e-45d7-9705-4aa81f62bed0}" y="0" name=""/>
-        <terminal x="0" orientation="s" uuid="{e9329e22-255b-4763-9dc6-65da277e1ac7}" y="10" name=""/>
+        <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"/>
+        <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"/>
+        <terminal type="Generic" name="" y="0" x="10" uuid="{06bf5c9f-6986-45bf-b11f-02e876abc4b8}" orientation="e"/>
+        <terminal type="Generic" name="" y="-5" x="0" uuid="{33c03677-8555-4b42-ae2c-4b4308978086}" orientation="n"/>
+        <terminal type="Generic" name="" y="0" x="-10" uuid="{95bef6e9-343e-45d7-9705-4aa81f62bed0}" orientation="w"/>
+        <terminal type="Generic" name="" y="10" x="0" uuid="{e9329e22-255b-4763-9dc6-65da277e1ac7}" orientation="s"/>
     </description>
 </definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_1f.elmt

@@ -0,0 +1,38 @@
+<definition version="0.90" link_type="master" type="element" width="20" hotspot_y="34" hotspot_x="10" height="60">
+    <uuid uuid="{c716b6e0-2a14-4058-9aa5-e69c0b462a86}"/>
+    <names>
+        <name lang="ar">قاطع ثنائي القطبية - 1 قطب محمي</name>
+        <name lang="fr">Disjoncteur bipolaire 1 pole protege</name>
+        <name lang="en">Circuit-breaker</name>
+        <name lang="it">Int. Aut. Magneto-termico 1P</name>
+        <name lang="pl">Wyłącznik</name>
+        <name lang="de">Leitungsschutzschalter LS 1P</name>
+        <name lang="nl">Lastscheider 1P</name>
+        <name lang="es">Disyuntor termico magnetico en polo P</name>
+        <name lang="hu">Kismegszakító 1 pólusú</name>
+        <name lang="cs">Dvoupólový jistič 1 pól chránící</name>
+    </names>
+    <kindInformations>
+        <kindInformation name="type">protection</kindInformation>
+    </kindInformations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <line end1="none" y2="20" length1="1.5" y1="16" antialias="false" x1="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" end2="none"/>
+        <polygon x3="-5" y2="0" y1="3" antialias="true" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" closed="false" y3="-20"/>
+        <dynamic_text y="-17.5" text_from="ElementInfo" uuid="{b3b0aba4-6a49-4225-9525-4a3fb043d24e}" text_width="-1" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" x="10" Valignment="AlignTop" z="6" frame="false" keep_visual_rotation="false">
+            <text>-F1</text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <arc y="10.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" x="-4" height="5" start="90" angle="-180"/>
+        <line end1="none" y2="10" length1="1.5" y1="8" antialias="false" x1="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" end2="none"/>
+        <line end1="none" y2="8" length1="1.5" y1="8" antialias="false" x1="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="5" end2="none"/>
+        <line end1="none" y2="8" length1="1.5" y1="3" antialias="false" x1="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="5" end2="none"/>
+        <line end1="none" y2="3" length1="1.5" y1="3" antialias="false" x1="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="5" end2="none"/>
+        <line end1="none" y2="-20" length1="1.5" y1="-30" antialias="false" x1="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" end2="none"/>
+        <line end1="none" y2="-18" length1="1.5" y1="-22" antialias="true" x1="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-2" end2="none"/>
+        <line end1="none" y2="-18" length1="1.5" y1="-22" antialias="true" x1="-2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="2" end2="none"/>
+        <terminal y="20" type="Generic" uuid="{a075b1fc-549f-4649-bf21-0dc88e608d66}" orientation="s" x="0" name=""/>
+        <terminal y="-30" type="Generic" uuid="{6544c451-e414-4fc7-b47d-8c1d33b21f08}" orientation="n" x="0" name=""/>
+    </description>
+</definition>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_1fn.elmt

@@ -1,7 +1,7 @@
 <definition width="40" version="0.4" hotspot_x="20" hotspot_y="34" height="60" link_type="master" type="element">
 <uuid uuid="{913D46E0-6E35-4878-9B5D-5CFBF47C819F}"/><names>
         <name lang="ar">قاطع ثنائي القطبية - 1 قطب محمي</name>
-        <name lang="de">Leitungsschutzschalter 1P+N</name>
+        <name lang="de">Leitungsschutzschalter LS 1P+N</name>
         <name lang="en">Circuit-breaker</name>
         <name lang="es">Disyuntor termico magnetico en polo P+N</name>
         <name lang="it">Int. Aut. Magneto-termico 1P+N</name>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_2f.elmt

@@ -1,7 +1,7 @@
 <definition width="40" version="0.4" hotspot_x="20" hotspot_y="34" height="60" link_type="master" type="element">
 <uuid uuid="{AFE0F3B3-00EE-4EC2-9458-E7934876F42B}"/><names>
         <name lang="ar">قطب ثنائي القطبية قطبين محميين</name>
-        <name lang="de">Leitungsschutzschalter 2P</name>
+        <name lang="de">Leitungsschutzschalter LS 2P</name>
         <name lang="en">Circuit-breaker</name>
         <name lang="es">Disyuntor termico magnetico en 2P</name>
         <name lang="it">Int. Aut. Magneto-termico 2P</name>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_2f2.elmt

@@ -2,7 +2,7 @@
     <uuid uuid="{315bc1e6-0466-4d2f-a6e4-547252f6bd16}"/>
     <names>
         <name lang="ar">قطب ثنائي القطبية قطبين محميين</name>
-        <name lang="de">Leitungsschutzschalter 2P</name>
+        <name lang="de">Leitungsschutzschalter LS 2P</name>
         <name lang="en">Circuit-breaker</name>
         <name lang="es">Disyuntor termico magnetico en 2P</name>
         <name lang="it">Int. Aut. Magneto-termico 2P</name>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_3f.elmt

@@ -1,7 +1,7 @@
 <definition width="60" version="0.4" hotspot_x="30" hotspot_y="34" height="60" link_type="master" type="element">
 <uuid uuid="{E22BC531-ED13-4C91-BED3-97582C9DA35B}"/><names>
         <name lang="ar">قاطع ثلاثي القطبية</name>
-        <name lang="de">Leitungsschutzschalter 3P</name>
+        <name lang="de">Leitungsschutzschalter LS 3P</name>
         <name lang="en">Circuit-breaker</name>
         <name lang="es">Disyuntor termico magnetico en 3P</name>
         <name lang="it">Int. Aut. Magneto-termico 3P</name>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_3fn.elmt

@@ -1,7 +1,7 @@
 <definition width="80" version="0.4" hotspot_x="40" hotspot_y="34" height="60" link_type="master" type="element">
 <uuid uuid="{D54EB26A-23BB-4865-B8BC-CCA0EF9743C9}"/><names>
         <name lang="ar">قاطع ثلاثي القطبية + خط محايد</name>
-        <name lang="de">Leitungsschutzschalter 3P+N</name>
+        <name lang="de">Leitungsschutzschalter LS 3P+N</name>
         <name lang="en">Circuit-breaker</name>
         <name lang="es">Disyuntor termico magnetico en polos 3P+N</name>
         <name lang="it">Int. Aut. Magneto-termico 3P+N</name>

elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_4fn.elmt

@@ -1,7 +1,7 @@
 <definition width="80" version="0.4" hotspot_x="40" hotspot_y="34" height="60" link_type="master" type="element">
 <uuid uuid="{189A2BE7-D456-4DBD-BF70-A3BF7841745A}"/><names>
         <name lang="ar">قاطع رباعي القطبية</name>
-        <name lang="de">Leitungsschutzschalter 4P</name>
+        <name lang="de">Leitungsschutzschalter LS 4P</name>
         <name lang="en">Circuit-breaker</name>
         <name lang="es">Disyuntor termico magnetico en 4P</name>
         <name lang="it">Int. Aut. Magneto-termico 4P</name>

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

@@ -1,31 +1,34 @@
-<definition type="element" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
-    <uuid uuid="{45a179e7-866e-4756-965f-d2445ced8dd2}"/>
+<definition height="50" hotspot_y="25" type="element" link_type="master" hotspot_x="23" version="0.90" width="40">
+    <uuid uuid="{b0c301a0-f0d5-4a66-888a-66e550fd63c9}"/>
     <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 show="1" name="type">coil</kindInformation>
+        <kindInformation name="type">coil</kindInformation>
     </kindInformations>
     <elementInformations/>
     <informations></informations>
     <description>
-        <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 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 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">
+        <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 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"/>
+        <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">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <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" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="A2" color="#000000"/>
-        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="S" color="#000000"/>
-        <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 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 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 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 x="2" y="-10" color="#000000" text="A1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <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="-9" y="-10" color="#000000" text="S" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="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="-8" length1="1.5"/>
+        <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 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"/>
+        <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">
             <text>g</text>
         </dynamic_text>
-        <terminal orientation="s" x="0" y="15"/>
-        <terminal orientation="n" x="0" y="-15"/>
-        <terminal orientation="n" x="-10" y="-15"/>
+        <terminal x="0" y="15" type="Generic" orientation="s" uuid="{84fa8673-63b5-4398-a8ee-cb421df0aca5}" name=""/>
+        <terminal x="0" y="-15" type="Generic" orientation="n" uuid="{d0ca8801-050e-4160-abd8-eee62c44e9bf}" name=""/>
+        <terminal x="-10" y="-15" type="Generic" orientation="n" uuid="{ea11c065-8d86-4041-b907-2cd28b877069}" name=""/>
     </description>
 </definition>

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

@@ -9,6 +9,7 @@
         <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,6 +10,7 @@
         <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,6 +9,7 @@
         <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,6 +8,7 @@
         <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,6 +4,7 @@
         <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,6 +9,7 @@
         <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,6 +9,7 @@
         <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,6 +7,7 @@
         <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,6 +8,7 @@
         <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,5 +14,6 @@
         <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,6 +7,7 @@
         <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,39 +1,48 @@
-<definition width="100" version="0.3" hotspot_x="48" hotspot_y="30" height="60" type="element" ic="true" orientation="dnny">
-<uuid uuid="{9EC34531-9367-4401-ADFE-7FB65430ED6D}"/><names>
-        <name lang="el">Πηνίο ρελέ με πολικότητα</name>
-        <name lang="en">Polarized relay</name>
+<definition hotspot_x="47" type="element" width="90" link_type="simple" height="50" version="0.90" hotspot_y="24">
+    <uuid uuid="{b421e3a2-41bb-41a0-8600-efc75811e20a}"/>
+    <names>
         <name lang="de">Relais polarisiert mit Wechsler</name>
+        <name lang="en">Polarized relay</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="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>
+        <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="cs">Polarizované monostabilní relé</name>
     </names>
+    <elementInformations/>
     <informations>License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="34.5" y="-16.5" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-5" y2="0" x2="25"/>
-        <circle x="-13.5" y="13.5" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3"/>
-        <input x="19.5" y="-15.45" size="4" text="2"/>
-        <input x="20" y="16" size="4" text="3"/>
-        <input x="0" y="-16" size="4" text="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="10" y2="-9" x2="23"/>
-        <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"/>
-        <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"/>
-        <rect width="7" x="-42" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10"/>
-        <rect width="30" x="-35" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-10" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-20" y2="10" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-20" y2="-10" x2="-20"/>
-        <input x="-34" y="18" size="4" text="A2"/>
-        <input x="-34" y="-17" size="4" text="A1"/>
-        <input x="31" y="0.5" size="9" text="_" tagg="label"/>
-        <terminal x="-20" y="-20" orientation="n"/>
-        <terminal x="-20" y="20" orientation="s"/>
-        <terminal x="10" y="-20" orientation="n"/>
-        <terminal x="30" y="-20" orientation="n"/>
-        <terminal x="30" y="20" orientation="s"/>
+        <circle diameter="3" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-16.5" antialias="true" x="34.5"/>
+        <text text="A2" font="Sans Serif,4,-1,5,50,0,0,0,0,0" y="19" rotation="0" x="-30" color="#000000"/>
+        <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 diameter="3" style="line-style:normal;line-weight:normal;filling:black;color:black" y="13.5" antialias="true" x="-13.5"/>
+        <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">
+            <text>2</text>
+        </dynamic_text>
+        <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">
+            <text>3</text>
+        </dynamic_text>
+        <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">
+            <text>1</text>
+        </dynamic_text>
+        <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 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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <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"/>
+        <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,6 +10,7 @@
         <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,6 +6,7 @@
         <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,34 +1,37 @@
-<definition width="60" version="0.3" hotspot_x="19" hotspot_y="37" height="70" type="element" link_type="master">
-<uuid uuid="{1CF30813-0219-4625-B019-A00A318ED8F9}"/><names>
+<definition link_type="master" width="40" height="50" version="0.90" hotspot_x="20" type="element" hotspot_y="24">
+    <uuid uuid="{fbebf37a-b316-447b-9f4d-16e87e2066a0}"/>
+    <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" show="1">coil</kindInformation>
+        <kindInformation name="type">coil</kindInformation>
     </kindInformations>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="8" y2="4" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-8" y2="0" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-8" y2="0" x2="-8"/>
-        <input x="4" y="20" size="6" rotate="true" text="_"/>
-        <input x="4" y="-22" size="6" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" x1="0" y2="-8" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="0" y2="21" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="14" y2="-8" x2="14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-14" y2="8" x2="14"/>
-        <input x="20" y="2.6666" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="14" y2="-8" x2="-14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-14" y2="8" x2="-14"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <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">
+            <text>_</text>
+        </dynamic_text>
+        <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">
+            <text>_</text>
+        </dynamic_text>
+        <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"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <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"/>
+        <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 orientation="n" x="0" name="A1" y="-20" type="Generic"/>
+        <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,6 +8,7 @@
         <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,6 +4,7 @@
         <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,6 +3,7 @@
     <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,6 +3,7 @@
     <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

@@ -1,31 +0,0 @@
-<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

@@ -0,0 +1,33 @@
+<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
+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/330_transformers&power_supplies/10_transformers/autotransformator_3f_2.elmt

@@ -1,46 +1,58 @@
-<definition width="80" version="0.4" hotspot_x="46" hotspot_y="25" height="50" type="element" ic="true">
-<uuid uuid="{6681E115-5D33-4F03-B6CC-3392357CD888}"/><names>
-        <name lang="it">Autotrasformatore 3F a stella</name>
-        <name lang="en">Three-phase Autotransformer Yd</name>
-        <name lang="es">Autotransformador trifásico</name>
-        <name lang="de">Spartransformator Stern</name>
+<definition height="50" version="0.90" type="element" hotspot_y="24" link_type="simple" width="60" hotspot_x="44">
+    <uuid uuid="{2caf7a54-cf3b-4724-8ad4-61691d6cfc18}"/>
+    <names>
         <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>
+        <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="cs">Třífázový autotransformátor Y, spojený do hvězdy</name>
+        <name lang="pl">Autotransformator trójfazowy skojarzony w gwiazdę (forma 2)</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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 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"/>
-        <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"/>
-        <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"/>
-        <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 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 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"/>
-        <line 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"/>
-        <line 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"/>
-        <line 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"/>
-        <line 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 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"/>
-        <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"/>
-        <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 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 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"/>
-        <line 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"/>
-        <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"/>
-        <input x="15" y="0" size="9" rotate="true" text="_" tagg="label"/>
-        <terminal x="10" y="-20" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="20" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="-10" y="-20" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="-30" y="-20" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="-20" y="20" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="-40" y="20" nameHidden="0" number="" name="" orientation="s"/>
+        <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"/>
+        <text text="C2" x="1.99995" rotation="0" y="19" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <text text="C1" x="0.17185" rotation="0" y="-15" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <text text="B1" x="-19.4219" rotation="0" y="-15" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <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 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"/>
+        <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"/>
+        <text text="A2" x="-38.1719" rotation="0" y="19" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <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 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 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 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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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 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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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">
+            <text></text>
+            <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,6 +1,7 @@
 <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="fr">
-Transformateur à deux enroulements</name>
+        <name lang="de">Transformator 1ph.</name>
+        <name lang="fr">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/30_power_supplies/2080_ps120_240vac.elmt

@@ -1,6 +1,7 @@
 <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,42 +1,46 @@
-<definition type="element" hotspot_x="29" version="0.5" hotspot_y="25" link_type="simple" width="60" height="40">
-    <uuid uuid="{3973dcdb-e383-4a83-adff-69061aa9fe78}"/>
+<definition type="element" link_type="simple" height="40" width="50" hotspot_x="24" hotspot_y="25" version="0.90">
+    <uuid uuid="{e67588a1-0339-4637-878a-22391aab7764}"/>
     <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="ar">موحد أحادي الوجه -2</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="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>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text text="N" x="-13" y="0" size="5"/>
-        <text text="L" x="-13" y="-7.6666" size="5"/>
-        <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 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 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"/>
-        <input text="T_ 230V/24VDC __W" x="-16" y="-33.3333" tagg="label" size="8" rotate="true"/>
-        <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"/>
-        <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"/>
-        <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 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 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"/>
-        <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 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 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 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 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"/>
-        <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 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"/>
-        <terminal x="-21" y="-10" orientation="w"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="-10" orientation="e"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <text y="2" x="-13" rotation="0" text="N" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <text y="-7.6666" x="-13" rotation="0" text="L" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <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 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 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"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <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"/>
+        <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"/>
+        <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 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 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 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 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 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"/>
+        <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 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"/>
+        <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"/>
+        <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 type="Generic" y="-10" name="L" orientation="w" x="-20" uuid="{1ea47dc7-4a51-40b8-9036-809b9cbb54ec}"/>
+        <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">Netzteile</name>
+        <name lang="de">Netzgeräte</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,57 +1,71 @@
-<definition width="220" version="0.4" hotspot_x="98" hotspot_y="43" height="80" type="element" ic="true" link_type="master">
-<uuid uuid="{F3049D0C-277C-43CA-A56C-0921EC69BF02}"/><names>
-        <name lang="nl">UPS</name>
-        <name lang="be">UPS</name>
-        <name lang="en">UPS</name>
-        <name lang="de">USV</name>
+<definition hotspot_x="94" height="70" width="190" link_type="master" version="0.90" type="element" hotspot_y="35">
+    <uuid uuid="{b79409e5-f665-40e9-84b3-5b07543c8466}"/>
+    <names>
         <name lang="fr">UPS</name>
-        <name lang="pl">UPS</name>
-        <name lang="it">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>
     </names>
+    <kindInformations>
+        <kindInformation name="type">coil</kindInformation>
+    </kindInformations>
+    <elementInformations/>
     <informations>
-		Author: RDS for QelectroTech
+	Author: RDS for QelectroTech
     </informations>
     <description>
-        <rect width="180" x="-90" y="-30" antialias="false" height="60" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <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 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 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 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"/>
-        <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 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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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 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"/>
-        <rect width="3" x="-7" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80.7179" y2="-10" x2="89.2223"/>
-        <line 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 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 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 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 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"/>
-        <text x="14" y="5.6666" size="6" text="-"/>
-        <text x="-17" y="7" size="6" 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="-17" x1="47" y2="-17" 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 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"/>
-        <rect width="3" x="6.7" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="-51" y2="13" 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 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"/>
-        <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 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"/>
-        <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 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 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 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"/>
-        <input x="92" y="-24.5" size="9" rotate="true" text="_" tagg="label"/>
-        <rect width="40" x="-20" y="-20" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-90" y="-10" orientation="w"/>
-        <terminal x="-90" y="10" orientation="w"/>
-        <terminal x="90" y="-10" orientation="e"/>
-        <terminal x="90" y="10" orientation="e"/>
+        <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"/>
+        <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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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="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" text="+" rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000"/>
+        <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 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 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 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 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 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 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 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 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 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 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 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"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <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"/>
+        <circle x="-92" diameter="4" y="-12" style="line-style:normal;line-weight:normal;filling:white;color:black" antialias="false"/>
+        <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,6 +2,7 @@
     <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 sekünderen Wicklungen</name>
-        <name lang="fr"> Transformateur de courant, à deux enroulements secondaires sur un circuit magnétique commun</name>
+        <name lang="de">Stromwandler mit 2 sekundären Wicklungen</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,45 +1,42 @@
-<definition height="60" type="element" width="90" hotspot_x="45" link_type="simple" version="0.5" hotspot_y="23">
-    <uuid uuid="{846ab7b5-3024-4c60-8e06-ead72711c300}"/>
+<definition hotspot_x="45" version="0.90" type="element" width="90" height="50" hotspot_y="24" link_type="simple">
+    <uuid uuid="{905a62ee-c454-40ae-a550-36b50a17aab7}"/>
     <names>
-        <name lang="ar">خط مرشح</name>
+        <name lang="fr">Ligne filtre</name>
         <name lang="pl">Filtr sieciowy</name>
         <name lang="el">Φίλτρο γραμμής</name>
-        <name lang="fr">Ligne filtre</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>
+        <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>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input tagg="label" size="9" rotate="true" text="_" x="43" y="-4.45"/>
-        <text size="6" text="LINE FILTER" x="-26" y="8"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-32.2361" y="-16.2361"/>
-        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-32.2361" y="23.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"/>
-        <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"/>
-        <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"/>
-        <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" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="27.7639" y="23.7639"/>
-        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="27.7639" y="-16.2361"/>
-        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="7.7639" y="23.7639"/>
-        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="7.7639" y="-16.2361"/>
-        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-12.2361" y="23.7639"/>
-        <circle diameter="4.4721" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-12.2361" y="-16.2361"/>
-        <terminal orientation="n" x="-10" y="-16"/>
-        <terminal orientation="n" x="30" y="-16"/>
-        <terminal orientation="n" x="10" y="-16"/>
-        <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"/>
+        <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"/>
+        <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></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text text="LINE FILTER" rotation="0" color="#000000" font="Sans Serif,6,-1,5,50,0,0,0,0,0" x="-26" y="2"/>
+        <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" antialias="true" x="-32.2361" style="line-style:normal;line-weight:normal;filling:white;color:black" y="17.7639"/>
+        <circle diameter="4.4721" antialias="true" x="27.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="17.7639"/>
+        <circle diameter="4.4721" antialias="true" x="27.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-22.2361"/>
+        <circle diameter="4.4721" antialias="true" x="7.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="17.7639"/>
+        <circle diameter="4.4721" antialias="true" x="7.7639" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-22.2361"/>
+        <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" antialias="true" x="-12.2361" style="line-style:normal;line-weight:normal;filling:white;color:black" y="-22.2361"/>
+        <terminal name="" orientation="n" type="Generic" x="-10" uuid="{a249da08-25bc-41d9-acc5-052cd79ec69e}" y="-20"/>
+        <terminal name="" orientation="n" type="Generic" x="30" uuid="{1b1da244-ff4e-4744-96cb-cd47bae7c019}" y="-20"/>
+        <terminal name="" orientation="n" type="Generic" x="10" uuid="{5417d31c-8613-48e8-ba76-e8c2e661c3b7}" y="-20"/>
+        <terminal name="" orientation="n" type="Generic" x="-30" uuid="{ce946f5b-f9da-4f0a-8add-255a91c6832e}" y="-20"/>
+        <terminal name="" orientation="s" type="Generic" x="-10" uuid="{7dc0e784-c015-4d9c-b304-35e0ca7e110f}" y="20"/>
+        <terminal name="" orientation="s" type="Generic" x="10" uuid="{25af4545-8c52-494f-8588-c101e0c8ca44}" y="20"/>
+        <terminal name="" orientation="s" type="Generic" x="30" uuid="{8d1f699f-9ef2-40f9-9c19-78b4efbfd17a}" y="20"/>
+        <terminal name="" orientation="s" type="Generic" x="-30" uuid="{2f0de0b4-ba40-4c74-bcfc-8a557001a107}" y="20"/>
     </description>
 </definition>

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

@@ -1,47 +1,46 @@
-<definition height="70" type="element" link_type="simple" hotspot_x="40" hotspot_y="39" width="90" version="0.5">
-<uuid uuid="{0AE64E73-A748-4868-8FB3-D2953F779C9A}"/><names>
-        <name lang="de">Netzfilter 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>
+<definition width="90" hotspot_x="41" height="60" type="element" link_type="simple" hotspot_y="29" version="0.90">
+    <uuid uuid="{675f5e89-e388-48bb-a548-124723d22b05}"/>
+    <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="pl">Trójbiegunowy filtr sieciowy</name>
     </names>
+    <elementInformations/>
     <informations>EN 60617: 06-14-03</informations>
     <description>
-        <circle x="37.5" diameter="5" y="-2.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <text text="L3.1" x="13" y="14" size="6"/>
-        <text text="L1" x="-24" y="-19" size="6"/>
-        <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"/>
-        <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 text="L2.1" x="-7" y="14" size="6"/>
-        <text text="L2" x="-5" y="-19" size="6"/>
-        <circle x="-2.5" diameter="5" y="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <text text="PE" x="26" y="-2" size="6"/>
-        <text text="L3" x="15" y="-19" size="6"/>
-        <circle x="17.5" diameter="5" y="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <circle x="-22.5" diameter="5" y="17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <circle x="-2.5" diameter="5" y="17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <circle x="17.5" diameter="5" y="17.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <input rotate="true" text="_" x="-70" tagg="label" y="-20.5" size="9"/>
-        <text text="L1.1" x="-28" y="14" size="6"/>
-        <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"/>
-        <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 x="-22.5" diameter="5" y="-32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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 x="0" y="-33" orientation="n"/>
-        <terminal x="-20" y="-33" orientation="n"/>
-        <terminal x="-20" y="23" orientation="s"/>
-        <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"/>
+        <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"/>
+        <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 rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="-14" x="-24" text="L1"/>
+        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="19" x="-7" text="L2.1"/>
+        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="-14" x="-5" text="L2"/>
+        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="3" x="26" text="PE"/>
+        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="-14" x="15" text="L3"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" y="19" x="-28" text="L1.1"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <circle diameter="5" y="-27.5" x="-2.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <circle diameter="5" y="-27.5" x="17.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <circle diameter="5" y="-27.5" x="-22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <circle diameter="5" y="2.5" x="37.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <circle diameter="5" y="22.5" x="-22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <circle diameter="5" y="22.5" x="-2.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <circle diameter="5" y="22.5" x="17.5" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black"/>
+        <terminal uuid="{c59dbabf-322a-4f9a-a9fa-2090f51643c4}" type="Generic" y="-25" x="0" orientation="n" name="L2"/>
+        <terminal uuid="{b1eb8115-a864-4f3e-a371-bbcd9c38cd1c}" type="Generic" y="-25" x="-20" orientation="n" name="L1"/>
+        <terminal uuid="{9e1e24cc-30bc-43ca-869d-aef7fb447ffd}" type="Generic" y="25" x="-20" orientation="s" name="L1.1"/>
+        <terminal uuid="{881bcffc-98f8-4a1c-9aff-61735b211477}" type="Generic" y="25" x="0" orientation="s" name="L2.1"/>
+        <terminal uuid="{ae8ed378-e2ce-41a6-88f9-90f1d8f8ccb9}" type="Generic" y="-25" x="20" orientation="n" name="L3"/>
+        <terminal uuid="{b64c11d1-b053-4726-a6e1-d642f4133461}" type="Generic" y="25" x="20" orientation="s" name="L3.1"/>
+        <terminal uuid="{5ff2ec3b-cd57-4bcb-a1bb-5e75a1bd7351}" type="Generic" y="5" x="40" orientation="e" name="PE"/>
     </description>
 </definition>

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

@@ -1,6 +1,7 @@
 <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,34 +1,37 @@
-<definition height="250" link_type="simple" type="element" hotspot_y="123" version="0.5" hotspot_x="125" width="250">
-    <uuid uuid="{6bf14a17-bc23-4b53-84d4-be4d8fc20178}"/>
+<definition type="element" hotspot_y="124" link_type="simple" hotspot_x="125" version="0.90" width="250" height="250">
+    <uuid uuid="{6d2fbbec-24cd-458f-8a03-d196ca8af5f0}"/>
     <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="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="it">Touch Screen 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>
-        <input y="113" text="-_" x="-87" rotate="true" size="4" tagg="none"/>
-        <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"/>
-        <input y="113" text="PE_" x="-67" rotate="true" size="4" tagg="none"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <rect y="-100" height="200" x="-100" antialias="false" width="200" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input y="-8.5" text="MARQUE_" x="-28" rotate="true" size="5" tagg="label"/>
-        <input y="113" text="+_" x="-106" rotate="true" size="4" tagg="none"/>
-        <terminal y="121" x="-100" orientation="s"/>
-        <terminal y="121" x="-80" orientation="s"/>
-        <terminal y="121" x="-60" orientation="s"/>
+        <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">
+            <text>-_</text>
+        </dynamic_text>
+        <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">
+            <text>PE_</text>
+        </dynamic_text>
+        <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"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <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">
+            <text>+_</text>
+        </dynamic_text>
+        <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 type="Generic" orientation="s" uuid="{69a636e0-9292-4add-9e34-b9e502f1fb4c}" y="120" name="L+" x="-100"/>
+        <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,34 +1,37 @@
-<definition height="170" link_type="simple" type="element" hotspot_y="75" version="0.5" hotspot_x="95" width="190">
-    <uuid uuid="{e8b19d52-137c-4cac-a884-76d245faaf2a}"/>
+<definition type="element" height="170" link_type="simple" hotspot_x="95" version="0.90" width="190" hotspot_y="76">
+    <uuid uuid="{16fafb3a-6603-4d7c-a856-95089c024e36}"/>
     <names>
-        <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="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>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input y="79.45" text="-_" x="-64.25" rotate="true" size="4" tagg="none"/>
-        <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"/>
-        <input y="79.45" text="PE_" x="-51.25" rotate="true" size="4" tagg="none"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <rect y="-57" height="130" x="-75" antialias="false" width="150" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input y="2.475" text="MARQUE_" x="-21" rotate="true" size="5" tagg="label"/>
-        <input y="79.45" text="+_" x="-80.5" rotate="true" size="4" tagg="none"/>
-        <terminal y="86.65" x="-75" orientation="s"/>
-        <terminal y="86.65" x="-60" orientation="s"/>
-        <terminal y="86.65" x="-45" orientation="s"/>
+        <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">
+            <text>-_</text>
+        </dynamic_text>
+        <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">
+            <text>PE_</text>
+        </dynamic_text>
+        <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"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <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">
+            <text>+_</text>
+        </dynamic_text>
+        <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 x="-75" y="86" type="Generic" uuid="{a0b00b3d-9a47-4384-bc16-3e82e94dbb5d}" orientation="s" name="L+"/>
+        <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,135 +1,148 @@
-<definition version="0.70" type="element" width="450" height="90" hotspot_y="44" hotspot_x="225" link_type="simple">
-    <uuid uuid="{202b43e9-7b17-4df1-8a21-b0bbdd57c9ab}"/>
+<definition height="90" type="element" width="450" link_type="simple" hotspot_x="225" hotspot_y="44" version="0.90">
+    <uuid uuid="{8b521f7d-d3c8-4169-89be-6f50ca074a2e}"/>
     <names>
+        <name lang="de">LED-Karte</name>
         <name lang="fr">Carte à voyant</name>
     </names>
-    <elementInformations/>
-    <informations></informations>
+    <elementInformations>
+        <elementInformation name="designation" show="1"></elementInformation>
+        <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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="-23.5"/>
-        <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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="16.5"/>
-        <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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="16.5"/>
-        <text x="-100" color="#000000" text="RD2" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="16.5"/>
-        <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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="-23.5"/>
-        <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 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 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 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 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 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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-183.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="-23.5"/>
-        <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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="-23.5"/>
-        <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 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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="-23.5"/>
-        <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 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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="-23.5"/>
-        <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 diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="16.5"/>
-        <text x="-180" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-160" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-140" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-160" color="#000000" text="RD1" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
-        <text x="-120" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-100" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-79" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <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 x="-10" color="#000000" text="23" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="10" color="#000000" text="22" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="30" color="#000000" text="21" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="50" color="#000000" text="20" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="70" color="#000000" text="19" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="90" color="#000000" text="18" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="110" color="#000000" text="17" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="130" color="#000000" text="16" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="150" color="#000000" text="15" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="170" color="#000000" text="14" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="190" color="#000000" text="13" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <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 x="-10" color="#000000" text="02" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="30" color="#000000" text="04" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="50" color="#000000" text="05" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="70" color="#000000" text="06" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="90" color="#000000" text="07" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="110" color="#000000" text="08" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="130" color="#000000" text="09" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="150" color="#000000" text="10" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="170" color="#000000" text="11" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="190" color="#000000" text="12" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="10" color="#000000" text="03" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-165" color="#000000" text="24VTp" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-145" color="#000000" text="+24V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-126" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-106" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-83" color="#000000" text="0V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <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 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 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 x="-29.8553" orientation="s" y="40"/>
-        <terminal x="10" orientation="n" y="-40"/>
-        <terminal x="-79.8553" orientation="s" y="40"/>
-        <terminal x="70.1447" orientation="s" y="40"/>
-        <terminal x="-9.8553" orientation="s" y="40"/>
-        <terminal x="-140" orientation="n" y="-40"/>
-        <terminal x="150" orientation="n" y="-40"/>
-        <terminal x="-120" orientation="n" y="-39"/>
-        <terminal x="50.1447" orientation="s" y="40"/>
-        <terminal x="70" orientation="n" y="-40"/>
-        <terminal x="-30" orientation="n" y="-40"/>
-        <terminal x="110" orientation="n" y="-40"/>
-        <terminal x="-119.855" orientation="s" y="40"/>
-        <terminal x="30" orientation="n" y="-40"/>
-        <terminal x="-99.8553" orientation="s" y="40"/>
-        <terminal x="-100" orientation="n" y="-40"/>
-        <terminal x="10.1447" orientation="s" y="40"/>
-        <terminal x="-160" orientation="n" y="-40"/>
-        <terminal x="130.145" orientation="s" y="40"/>
-        <terminal x="190" orientation="n" y="-40"/>
-        <terminal x="-139.855" orientation="s" y="40"/>
-        <terminal x="130" orientation="n" y="-40"/>
-        <terminal x="-180" orientation="s" y="40"/>
-        <terminal x="-160" orientation="s" y="40"/>
-        <terminal x="30.1447" orientation="s" y="40"/>
-        <terminal x="150.145" orientation="s" y="40"/>
-        <terminal x="90" orientation="n" y="-40"/>
-        <terminal x="109.883" orientation="s" y="40"/>
-        <terminal x="-80" orientation="n" y="-39"/>
-        <terminal x="90.1447" orientation="s" y="40"/>
-        <terminal x="50" orientation="n" y="-40"/>
-        <terminal x="170" orientation="n" y="-40"/>
-        <terminal x="190" orientation="s" y="40"/>
-        <terminal x="170.145" orientation="s" y="40"/>
-        <terminal x="-10" orientation="n" y="-40"/>
+        <circle y="16.5" x="6.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="-143.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="66.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="126.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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"/>
+        <circle y="-23.5" x="-123.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="126.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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"/>
+        <circle y="16.5" x="-83.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <text y="10" color="#000000" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="-100" text="RD2"/>
+        <circle y="-23.5" x="-83.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="-143.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="106.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="6.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="-13.54" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="186.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="-103.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="46.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="-163.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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"/>
+        <circle y="-23.5" x="66.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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 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 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 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 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 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"/>
+        <circle y="16.5" x="166.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="-163.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="186.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="-123.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="-103.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="-183.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="86.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="-33.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="16.5" x="26.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="106.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="-13.54" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="46.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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"/>
+        <circle y="-23.5" x="166.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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 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"/>
+        <circle y="-23.5" x="26.46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="-33.53" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <circle y="-23.5" x="86.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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 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"/>
+        <circle y="-23.5" x="146.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <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"/>
+        <circle y="16.5" x="146.47" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-180" text="NO"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-160" text="C"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-140" text="NF"/>
+        <text y="10" color="#000000" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="-160" text="RD1"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-120" text="NO"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-100" text="C"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-79" text="NF"/>
+        <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 y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-10" text="23"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="10" text="22"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="30" text="21"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="50" text="20"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="70" text="19"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="90" text="18"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="110" text="17"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="130" text="16"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="150" text="15"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="170" text="14"/>
+        <text y="35" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="190" text="13"/>
+        <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 y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-10" text="02"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="30" text="04"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="50" text="05"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="70" text="06"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="90" text="07"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="110" text="08"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="130" text="09"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="150" text="10"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="170" text="11"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="190" text="12"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="10" text="03"/>
+        <text y="-30" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-165" text="24VTp"/>
+        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-145" text="+24V"/>
+        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-126" text="24VAC"/>
+        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-106" text="24VAC"/>
+        <text y="-29" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0" x="-83" text="0V"/>
+        <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"/>
+        <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 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"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-29.86" uuid="{55f47e81-e1b8-4e1a-b37f-59d349ab904c}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="10" uuid="{5d031e4f-fc16-437c-b5ce-1a9b15ed2e9d}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-79.86" uuid="{edeb5033-7480-4b78-895e-b6158d87ddec}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="70.14" uuid="{140fca0c-6803-486f-943e-ddcd683b0de2}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-9.86" uuid="{9a110fea-cd6f-4c84-9897-5f97e95cdc55}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="-140" uuid="{d185d372-4d18-4dd2-83aa-e9e758921f13}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="150" uuid="{d1f29465-f9ca-41fc-bc4b-0620d117dae8}"/>
+        <terminal y="-39" type="Generic" name="" orientation="n" x="-120" uuid="{bfd67b54-84ea-4b47-bcc5-6a9c8153875b}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="50.14" uuid="{67dd48c0-0dda-499c-aa55-224f75f70c0c}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="70" uuid="{02cb24f4-c327-4802-b813-a12a2389a755}"/>
+        <terminal y="-40" type="Generic" name="01" orientation="n" x="-30" uuid="{54f46748-55ea-4642-9af9-257c122a062a}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="110" uuid="{c32a8e92-8a87-4cb4-a63b-f055b7164ad0}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-119.86" uuid="{ec60a1d4-f481-4edc-abc5-b5037f596eb5}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="30" uuid="{843be5e1-2eae-438f-b7cb-424b12369d35}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-99.86" uuid="{461536c0-cc2b-42b6-8d02-c863261a2688}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="-100" uuid="{3f5028bf-3dba-40ec-a925-56d098ba921e}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="10.14" uuid="{b10fbc12-5445-4fbc-bb70-adb5f85cd96f}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="-160" uuid="{2dbad4df-80ec-449f-9b6d-3e1b2976aa22}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="130.15" uuid="{c00dbddf-102e-425f-8453-9985e904c975}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="190" uuid="{ee1caef2-b9b8-41fb-9b1c-b98cc109753f}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-139.85" uuid="{0ce2b148-2d32-42f5-976b-cc2fde126f59}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="130" uuid="{664149b6-c0bb-4acd-a17c-521bb9fd41c6}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-180" uuid="{655fd653-24fd-49ad-8128-422a4ac51c7e}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="-160" uuid="{0bc9470d-51a1-4e3a-9d32-769ef53afcd3}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="30.14" uuid="{6df93baf-2a5a-43cb-b390-da7d94a076d9}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="150.15" uuid="{8ec15c77-2440-4ca9-a757-e56510facd05}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="90" uuid="{edb54ede-15e1-41e3-9b18-61530d98b1a3}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="109.88" uuid="{62c72ef3-fc5a-42bc-a4c0-3667b8981f16}"/>
+        <terminal y="-39" type="Generic" name="" orientation="n" x="-80" uuid="{79a97b90-57cd-47f3-bb32-f5b740f1f551}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="90.14" uuid="{aa704c47-46ab-4df7-b20b-2db94adb3222}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="50" uuid="{33b5ce91-93af-4c08-afd9-aff6007fbc72}"/>
+        <terminal y="-40" type="Generic" name="" orientation="n" x="170" uuid="{ef6df1d3-dba8-4e7b-be4b-e62d45fc5436}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="190" uuid="{fc0fa3ed-c8e8-482d-a6f5-f3a1482c0544}"/>
+        <terminal y="40" type="Generic" name="" orientation="s" x="170.15" uuid="{0ce8acd4-a116-4ca6-951b-301870782626}"/>
+        <terminal y="-40" type="Generic" name="02" orientation="n" x="-10" uuid="{de6c321a-05b4-405a-8806-3547c266718d}"/>
     </description>
 </definition>

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

@@ -1,147 +1,148 @@
-<definition hotspot_y="4" hotspot_x="5" width="560" link_type="simple" type="element" height="150" version="0.70">
-    <uuid uuid="{0393ed13-81ec-405e-ad5b-5f99855e2cf6}"/>
-    <names>
-        <name lang="fr">Carte à voyant</name>
-    </names>
-    <elementInformations>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1">Best</elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <circle diameter="15" x="182.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="182.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="362.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="362.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="452.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="452.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="272.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="272.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="302.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="482.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="302.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="482.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="212.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="212.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="392.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="392.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="422.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="512.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="422.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="332.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="512.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="355" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="76.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="445" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="332.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="355" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="265" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="242.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="445" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="175" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="265" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="50" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="96.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="70" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="136.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="120" color="#000000" y="107" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD2"/>
-        <circle diameter="7" x="136.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="76.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="242.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="116.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="56.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="130" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="30" y="110" width="60" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="90" y="110" width="60" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="90" y="20" width="40" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="56.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="96.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="116.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="36.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="175" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="0" y="0" width="550" height="140" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="40" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO"/>
-        <text x="60" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C"/>
-        <text x="80" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF"/>
-        <text x="60" color="#000000" y="107" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD1"/>
-        <text x="100" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO"/>
-        <text x="120" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C"/>
-        <text x="140" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF"/>
-        <text x="190" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24"/>
-        <text x="220" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="23"/>
-        <text x="250" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="22"/>
-        <text x="280" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="21"/>
-        <text x="310" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="20"/>
-        <text x="340" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="19"/>
-        <text x="370" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="18"/>
-        <text x="400" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="17"/>
-        <text x="430" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="16"/>
-        <text x="460" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="15"/>
-        <text x="490" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="14"/>
-        <text x="520" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="13"/>
-        <text x="190" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="01"/>
-        <text x="220" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="02"/>
-        <text x="280" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="04"/>
-        <text x="310" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="05"/>
-        <text x="340" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="06"/>
-        <text x="370" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="07"/>
-        <text x="400" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="08"/>
-        <text x="430" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="09"/>
-        <text x="460" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="10"/>
-        <text x="490" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="11"/>
-        <text x="520" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="12"/>
-        <text x="250" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="03"/>
-        <text x="60" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VTp"/>
-        <text x="80" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="+24V"/>
-        <text x="100" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC"/>
-        <text x="120" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC"/>
-        <text x="140" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="0V"/>
-        <line end1="none" end2="none" y1="22" length1="1.5" x2="20" y2="43" length2="1.5" antialias="false" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="16" y="25" width="0" height="1" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="16" y="25" width="8" height="15" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal orientation="s" x="400" y="140"/>
-        <terminal orientation="s" x="250" y="140"/>
-        <terminal orientation="s" x="190" y="140"/>
-        <terminal orientation="n" x="100" y="0"/>
-        <terminal orientation="s" x="490" y="140"/>
-        <terminal orientation="n" x="80" y="0"/>
-        <terminal orientation="n" x="280" y="0"/>
-        <terminal orientation="s" x="460" y="140"/>
-        <terminal orientation="n" x="340" y="0"/>
-        <terminal orientation="n" x="370" y="0"/>
-        <terminal orientation="s" x="340" y="140"/>
-        <terminal orientation="n" x="220" y="0"/>
-        <terminal orientation="s" x="280" y="140"/>
-        <terminal orientation="n" x="400" y="0"/>
-        <terminal orientation="n" x="490" y="0"/>
-        <terminal orientation="s" x="140" y="140"/>
-        <terminal orientation="n" x="120" y="0"/>
-        <terminal orientation="n" x="430" y="0"/>
-        <terminal orientation="n" x="310" y="0"/>
-        <terminal orientation="s" x="370" y="140"/>
-        <terminal orientation="n" x="460" y="0"/>
-        <terminal orientation="n" x="190" y="0"/>
-        <terminal orientation="s" x="80" y="140"/>
-        <terminal orientation="s" x="40" y="140"/>
-        <terminal orientation="s" x="220" y="140"/>
-        <terminal orientation="s" x="60" y="140"/>
-        <terminal orientation="s" x="310" y="140"/>
-        <terminal orientation="s" x="100" y="140"/>
-        <terminal orientation="n" x="60" y="0"/>
-        <terminal orientation="s" x="520" y="140"/>
-        <terminal orientation="n" x="140" y="0"/>
-        <terminal orientation="s" x="430" y="140"/>
-        <terminal orientation="n" x="520" y="0"/>
-        <terminal orientation="n" x="250" y="0"/>
-        <terminal orientation="s" x="120" y="140"/>
-    </description>
+<definition type="element" width="560" height="150" version="0.70" hotspot_x="5" hotspot_y="4" link_type="simple">
+  <uuid uuid="{0393ed13-81ec-405e-ad5b-5f99855e2cf6}"/>
+  <names>
+    <name lang="de">LED-Karte</name>
+    <name lang="fr">Carte à voyant</name>
+  </names>
+  <elementInformations>
+    <elementInformation name="machine_manufacturer_reference" show="1"/>
+    <elementInformation name="designation" show="1"/>
+    <elementInformation name="label" show="1"/>
+    <elementInformation name="plant" show="1"/>
+    <elementInformation name="comment" show="1"/>
+    <elementInformation name="supplier" show="1"/>
+    <elementInformation name="description" show="1"/>
+    <elementInformation name="manufacturer_reference" show="1"/>
+    <elementInformation name="unity" show="1"/>
+    <elementInformation name="manufacturer" show="1">Best</elementInformation>
+    <elementInformation name="quantity" show="1"/>
+  </elementInformations>
+  <informations/>
+  <description>
+    <circle x="182.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="182.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="362.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="362.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="452.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="452.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="272.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="272.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="302.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="482.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="302.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="482.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="212.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="212.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="392.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="392.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="422.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="512.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="422.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="332.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="512.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <rect x="355" y="100" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <circle x="76.5" y="111.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <rect x="445" y="100" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <circle x="332.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <rect x="355" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <rect x="265" y="100" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <circle x="242.5" y="102.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <rect x="445" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <rect x="175" y="100" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <rect x="265" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <rect x="50" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="20" height="10" antialias="false"/>
+    <circle x="96.5" y="21.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <rect x="70" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="20" height="10" antialias="false"/>
+    <circle x="136.5" y="111.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <text x="120" y="107" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD2" color="#000000" rotation="0"/>
+    <circle x="136.5" y="21.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <circle x="76.5" y="21.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <circle x="242.5" y="22.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="false"/>
+    <circle x="116.5" y="111.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <circle x="56.5" y="111.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <rect x="130" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="20" height="10" antialias="false"/>
+    <rect x="30" y="110" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="60" height="10" antialias="false"/>
+    <rect x="90" y="110" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="60" height="10" antialias="false"/>
+    <rect x="90" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="40" height="10" antialias="false"/>
+    <circle x="56.5" y="21.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <circle x="96.5" y="111.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <circle x="116.5" y="21.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <circle x="36.5" y="111.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7" antialias="false"/>
+    <rect x="175" y="20" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="90" height="20" antialias="false"/>
+    <rect x="0" y="0" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="550" height="140" antialias="false"/>
+    <text x="40" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO" color="#000000" rotation="0"/>
+    <text x="60" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C" color="#000000" rotation="0"/>
+    <text x="80" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF" color="#000000" rotation="0"/>
+    <text x="60" y="107" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD1" color="#000000" rotation="0"/>
+    <text x="100" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO" color="#000000" rotation="0"/>
+    <text x="120" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C" color="#000000" rotation="0"/>
+    <text x="140" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF" color="#000000" rotation="0"/>
+    <text x="190" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24" color="#000000" rotation="0"/>
+    <text x="220" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="23" color="#000000" rotation="0"/>
+    <text x="250" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="22" color="#000000" rotation="0"/>
+    <text x="280" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="21" color="#000000" rotation="0"/>
+    <text x="310" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="20" color="#000000" rotation="0"/>
+    <text x="340" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="19" color="#000000" rotation="0"/>
+    <text x="370" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="18" color="#000000" rotation="0"/>
+    <text x="400" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="17" color="#000000" rotation="0"/>
+    <text x="430" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="16" color="#000000" rotation="0"/>
+    <text x="460" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="15" color="#000000" rotation="0"/>
+    <text x="490" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="14" color="#000000" rotation="0"/>
+    <text x="520" y="135" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="13" color="#000000" rotation="0"/>
+    <text x="190" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="01" color="#000000" rotation="0"/>
+    <text x="220" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="02" color="#000000" rotation="0"/>
+    <text x="280" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="04" color="#000000" rotation="0"/>
+    <text x="310" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="05" color="#000000" rotation="0"/>
+    <text x="340" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="06" color="#000000" rotation="0"/>
+    <text x="370" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="07" color="#000000" rotation="0"/>
+    <text x="400" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="08" color="#000000" rotation="0"/>
+    <text x="430" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="09" color="#000000" rotation="0"/>
+    <text x="460" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="10" color="#000000" rotation="0"/>
+    <text x="490" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="11" color="#000000" rotation="0"/>
+    <text x="520" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="12" color="#000000" rotation="0"/>
+    <text x="250" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="03" color="#000000" rotation="0"/>
+    <text x="60" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VTp" color="#000000" rotation="0"/>
+    <text x="80" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="+24V" color="#000000" rotation="0"/>
+    <text x="100" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC" color="#000000" rotation="0"/>
+    <text x="120" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC" color="#000000" rotation="0"/>
+    <text x="140" y="10" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="0V" color="#000000" rotation="0"/>
+    <line x1="20" x2="20" y1="22" y2="43" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <rect x="16" y="25" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="0" height="1" antialias="false"/>
+    <rect x="16" y="25" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" height="15" antialias="false"/>
+    <terminal x="400" y="140" orientation="s"/>
+    <terminal x="250" y="140" orientation="s"/>
+    <terminal x="190" y="140" orientation="s"/>
+    <terminal x="100" y="0" orientation="n"/>
+    <terminal x="490" y="140" orientation="s"/>
+    <terminal x="80" y="0" orientation="n"/>
+    <terminal x="280" y="0" orientation="n"/>
+    <terminal x="460" y="140" orientation="s"/>
+    <terminal x="340" y="0" orientation="n"/>
+    <terminal x="370" y="0" orientation="n"/>
+    <terminal x="340" y="140" orientation="s"/>
+    <terminal x="220" y="0" orientation="n"/>
+    <terminal x="280" y="140" orientation="s"/>
+    <terminal x="400" y="0" orientation="n"/>
+    <terminal x="490" y="0" orientation="n"/>
+    <terminal x="140" y="140" orientation="s"/>
+    <terminal x="120" y="0" orientation="n"/>
+    <terminal x="430" y="0" orientation="n"/>
+    <terminal x="310" y="0" orientation="n"/>
+    <terminal x="370" y="140" orientation="s"/>
+    <terminal x="460" y="0" orientation="n"/>
+    <terminal x="190" y="0" orientation="n"/>
+    <terminal x="80" y="140" orientation="s"/>
+    <terminal x="40" y="140" orientation="s"/>
+    <terminal x="220" y="140" orientation="s"/>
+    <terminal x="60" y="140" orientation="s"/>
+    <terminal x="310" y="140" orientation="s"/>
+    <terminal x="100" y="140" orientation="s"/>
+    <terminal x="60" y="0" orientation="n"/>
+    <terminal x="520" y="140" orientation="s"/>
+    <terminal x="140" y="0" orientation="n"/>
+    <terminal x="430" y="140" orientation="s"/>
+    <terminal x="520" y="0" orientation="n"/>
+    <terminal x="250" y="0" orientation="n"/>
+    <terminal x="120" y="140" orientation="s"/>
+  </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-azul.elmt

@@ -1,23 +1,29 @@
-<definition width="40" version="0.4" hotspot_x="12" hotspot_y="20" height="40" link_type="simple" type="element" ic="true">
-<uuid uuid="{9E3942A7-CE5B-46B8-B355-43285E21FF8A}"/><names>
-        <name lang="ru">Лампа</name>
-        <name lang="pt">Lâmpada</name>
-        <name lang="en">Light</name>
-        <name lang="fr">Lampe</name>
-        <name lang="es">Lámpara azul</name>
-        <name lang="cs">Kontrolka</name>
-    </names>
-    <informations>Author: The QElectroTech team
+<definition ic="true" type="element" width="40" height="40" version="0.4" hotspot_x="12" hotspot_y="20" link_type="simple">
+  <uuid uuid="{9E3942A7-CE5B-46B8-B355-43285E21FF8A}"/>
+  <names>
+    <name lang="ru">Лампа</name>
+    <name lang="pt">Lâmpada</name>
+    <name lang="en">Light</name>
+    <name lang="de">Lampe, blau</name>
+    <name lang="fr">Lampe</name>
+    <name lang="es">Lámpara azul</name>
+    <name lang="cs">Kontrolka</name>
+  </names>
+  <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <ellipse width="14.5169" x="-7.5012" y="-6.95514" antialias="true" height="13.3034" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.97958" x1="4.85994" y2="4.37273" x2="-5.34544"/>
-        <line 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.97958" x1="-5.34544" y2="4.37273" x2="4.85994"/>
-        <line 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.6069" x1="-0.242746" y2="-6.95514" x2="-0.242746"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.34829" x1="-0.242746" y2="13" x2="-0.242746"/>
-        <input x="15" y="3" size="9" text="" tagg="none"/>
-        <input x="4.83817" y="2.68985" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-15" orientation="n"/>
-        <terminal x="0" y="14" orientation="s"/>
-    </description>
+  <description>
+    <line x1="0" x2="0" y1="-15" y2="15" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <circle x="-8.5" y="-8.5" style="line-style:normal;line-weight:normal;filling:blue;color:black" diameter="17" antialias="true"/>
+    <line x1="6.22" x2="-6.14" y1="-5.33" y2="5.12" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="-6.14" x2="6.22" y1="-5.33" y2="5.12" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <dynamic_text x="15" y="-8.5" z="5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{5e3bea5c-4602-45c1-9dca-be100942ed3f}" frame="false" rotation="0" text_from="UserText" Halignment="AlignLeft" Valignment="AlignTop" text_width="-1" keep_visual_rotation="false">
+      <text/>
+    </dynamic_text>
+    <dynamic_text x="5.5" y="-5.5" z="6" font="Sans Serif,6,-1,5,50,0,0,0,0,0" uuid="{add0969f-5504-4c50-bbc3-3f2183db4025}" frame="false" rotation="0" text_from="ElementInfo" Halignment="AlignLeft" Valignment="AlignTop" text_width="-1" keep_visual_rotation="false">
+      <text/>
+      <info_name>label</info_name>
+    </dynamic_text>
+    <terminal x="0" y="-15" name="" type="Generic" uuid="{a18642fe-cb88-46c0-a178-1ec47b939b27}" orientation="n"/>
+    <terminal x="0" y="15" name="" type="Generic" uuid="{78c445e3-750a-444b-80c3-62f11922386c}" orientation="s"/>
+  </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-red.elmt

@@ -1,24 +1,32 @@
-<definition width="40" version="0.4" hotspot_x="13" hotspot_y="20" height="40" link_type="simple" type="element" ic="true">
-<uuid uuid="{70564EDE-85D0-46CA-8D43-7F773B9F1E6B}"/><names>
+<definition hotspot_x="13" version="0.90" type="element" height="50" width="30" hotspot_y="25" link_type="simple">
+    <uuid uuid="{1a7e1030-4163-4d97-b130-6620346741ca}"/>
+    <names>
         <name lang="ru">Лампа</name>
-        <name lang="pt">Lâmpada</name>
-        <name lang="en">Light</name>
-        <name lang="fr">Lampe</name>
         <name lang="es">Lámpara roja</name>
+        <name lang="pt">Lâmpada</name>
+        <name lang="de">Lampe, rot</name>
+        <name lang="en">Light</name>
         <name lang="cs">Kontrolka</name>
+        <name lang="fr">Lampe</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon style="line-style:normal;line-weight:normal;filling:red;color:red" x1="-6.61784" x2="-8.37626" x3="-8.37626" x4="-7.49705" antialias="false" x5="-4.85942" x6="-0.463379" x7="3.05345" x8="5.69108" x9="7.4495" y1="-5.31158" y10="-0.849266" y2="-2.3367" y11="-3.82414" y3="0.638173" y4="3.61305" y12="-6.0553" y5="5.84421" x10="7.4495" y13="-6.79902" y6="7.33165" x11="6.57029" y14="-6.79902" y7="6.58793" x12="4.81187" y15="-5.31158" y8="4.35677" x13="1.29504" y9="2.12561" x14="-3.10101" x15="-6.61784"/>
-        <ellipse width="17.5842" x="-9.25546" y="-7.54274" antialias="true" height="14.8744" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.33389" x1="5.71746" y2="5.1228" x2="-6.64422"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.33389" x1="-6.64422" y2="5.1228" x2="5.71746"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.9799" x1="-0.463379" y2="-7.54274" x2="-0.463379"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.33165" x1="-0.463379" y2="14.7688" x2="-0.463379"/>
-        <input x="15" y="3" size="9" text="" tagg="none"/>
-        <input x="5.69108" y="3.24119" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="-0.463379" y="-15.7237" orientation="n"/>
-        <terminal x="-0.463379" y="15.5126" orientation="s"/>
+        <line x2="0" y1="-15" y2="15" x1="0" length1="1.5" antialias="false" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length2="1.5"/>
+        <circle y="-8.5" antialias="true" style="line-style:normal;line-weight:normal;filling:red;color:black" x="-8.5" diameter="17"/>
+        <line x2="-6.14" y1="-5.33" y2="5.12" x1="6.22" length1="1.5" antialias="false" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length2="1.5"/>
+        <line x2="6.22" y1="-5.33" y2="5.12" x1="-6.14" length1="1.5" antialias="false" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length2="1.5"/>
+        <dynamic_text y="-8.5" Valignment="AlignTop" text_from="UserText" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" x="15" frame="false" text_width="-1" z="5" keep_visual_rotation="false" uuid="{5e3bea5c-4602-45c1-9dca-be100942ed3f}">
+            <text></text>
+        </dynamic_text>
+        <dynamic_text y="-5.5" Valignment="AlignTop" text_from="ElementInfo" rotation="0" font="Sans Serif,6,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" x="5.5" frame="false" text_width="-1" z="6" keep_visual_rotation="false" uuid="{add0969f-5504-4c50-bbc3-3f2183db4025}">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text y="-5" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" x="2" text="X1"/>
+        <text y="20" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" x="2" text="X2"/>
+        <terminal y="15" orientation="s" name="" x="0" type="Generic" uuid="{78c445e3-750a-444b-80c3-62f11922386c}"/>
+        <terminal y="-15" orientation="n" name="" x="0" type="Generic" uuid="{a18642fe-cb88-46c0-a178-1ec47b939b27}"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampara-verde.elmt

@@ -1,24 +1,30 @@
-<definition width="40" version="0.4" hotspot_x="12" hotspot_y="20" height="40" link_type="simple" type="element" ic="true">
-<uuid uuid="{A7DFB114-E3C5-4BCB-A855-248EE6D25ABE}"/><names>
-        <name lang="ru">Лампа</name>
-        <name lang="pt">Lâmpada</name>
-        <name lang="en">Light</name>
-        <name lang="fr">Lampe</name>
-        <name lang="es">Lámpara verde</name>
-        <name lang="ca">Lum verda</name>
-        <name lang="cs">Kontrolka</name>
-    </names>
-    <informations>Author: The QElectroTech team
+<definition ic="true" type="element" width="40" height="40" version="0.4" hotspot_x="12" hotspot_y="20" link_type="simple">
+  <uuid uuid="{A7DFB114-E3C5-4BCB-A855-248EE6D25ABE}"/>
+  <names>
+    <name lang="ru">Лампа</name>
+    <name lang="pt">Lâmpada</name>
+    <name lang="en">Light</name>
+    <name lang="de">Lampe, grün</name>
+    <name lang="fr">Lampe</name>
+    <name lang="es">Lámpara verde</name>
+    <name lang="ca">Lum verda</name>
+    <name lang="cs">Kontrolka</name>
+  </names>
+  <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <ellipse width="14.5169" x="-7.5012" y="-6.95514" antialias="true" height="13.3034" style="line-style:normal;line-weight:normal;filling:green;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.97958" x1="4.85994" y2="4.37273" x2="-5.34544"/>
-        <line 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.97958" x1="-5.34544" y2="4.37273" x2="4.85994"/>
-        <line 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.6069" x1="-0.242746" y2="-6.95514" x2="-0.242746"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.34829" x1="-0.242746" y2="13" x2="-0.242746"/>
-        <input x="15" y="3" size="9" text="" tagg="none"/>
-        <input x="4.83817" y="2.68985" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-15" orientation="n"/>
-        <terminal x="0" y="14" orientation="s"/>
-    </description>
+  <description>
+    <line x1="0" x2="0" y1="-15" y2="15" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <circle x="-8.5" y="-8.5" style="line-style:normal;line-weight:normal;filling:green;color:black" diameter="17" antialias="true"/>
+    <line x1="6.22" x2="-6.14" y1="-5.33" y2="5.12" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="-6.14" x2="6.22" y1="-5.33" y2="5.12" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <dynamic_text x="15" y="-8.5" z="5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{5e3bea5c-4602-45c1-9dca-be100942ed3f}" frame="false" rotation="0" text_from="UserText" Halignment="AlignLeft" Valignment="AlignTop" text_width="-1" keep_visual_rotation="false">
+      <text/>
+    </dynamic_text>
+    <dynamic_text x="5.5" y="-5.5" z="6" font="Sans Serif,6,-1,5,50,0,0,0,0,0" uuid="{add0969f-5504-4c50-bbc3-3f2183db4025}" frame="false" rotation="0" text_from="ElementInfo" Halignment="AlignLeft" Valignment="AlignTop" text_width="-1" keep_visual_rotation="false">
+      <text/>
+      <info_name>label</info_name>
+    </dynamic_text>
+    <terminal x="0" y="-15" name="" type="Generic" uuid="{a18642fe-cb88-46c0-a178-1ec47b939b27}" orientation="n"/>
+    <terminal x="0" y="15" name="" type="Generic" uuid="{78c445e3-750a-444b-80c3-62f11922386c}" orientation="s"/>
+  </description>
 </definition>

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

@@ -1,30 +1,30 @@
-<definition height="60" link_type="simple" type="element" hotspot_y="29" version="0.5" hotspot_x="13" width="30">
-    <uuid uuid="{5a60adde-9bf3-4aa6-9927-597956ad0db3}"/>
-    <names>
-        <name lang="fr">Lampe clignotante</name>
-        <name lang="de">Blinkleuchte</name>
-        <name lang="it">Luce intermittente</name>
-        <name lang="es">Luz intermitente</name>
-        <name lang="ar">مصباح رفّاف</name>
-        <name lang="ru">Проблесковый маяк</name>
-        <name lang="el">Λυχνία με παλλόμενο φως</name>
-        <name lang="pt">Luz intermitente</name>
-        <name lang="cs">Blikající světlo</name>
-        <name lang="en">Flashing light</name>
-        <name lang="pl">Lampa sygnalizacyjna o świetle migowym</name>
-        <name lang="nl">Knipperlamp</name>
-    </names>
-    <informations>Author: The QElectroTech team
+<definition type="element" width="30" height="60" version="0.5" hotspot_x="13" hotspot_y="29" link_type="simple">
+  <uuid uuid="{5a60adde-9bf3-4aa6-9927-597956ad0db3}"/>
+  <names>
+    <name lang="fr">Lampe clignotante</name>
+    <name lang="de">Blinkleuchte</name>
+    <name lang="it">Luce intermittente</name>
+    <name lang="es">Luz intermitente</name>
+    <name lang="ar">مصباح رفّاف</name>
+    <name lang="ru">Проблесковый маяк</name>
+    <name lang="el">Λυχνία με παλλόμενο φως</name>
+    <name lang="pt">Luz intermitente</name>
+    <name lang="cs">Blikající světlo</name>
+    <name lang="en">Flashing light</name>
+    <name lang="pl">Lampa sygnalizacyjna o świetle migowym</name>
+    <name lang="nl">Knipperlamp</name>
+  </names>
+  <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x4="12" y2="20" antialias="false" y6="20" y5="20" x6="14" x1="5" y1="20" closed="false" x3="7" x2="7" x5="12" y3="15" y4="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle y="-10" x="-10" antialias="true" diameter="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="7.03" antialias="false" x1="7.03" y1="-7.03" length2="1.5" length1="1.5" x2="-7.03" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="7.03" antialias="false" x1="-7.03" y1="-7.03" length2="1.5" length1="1.5" x2="7.03" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="-10" antialias="false" x1="0" y1="-20" length2="1.5" length1="1.5" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="20" antialias="false" x1="0" y1="10" length2="1.5" length1="1.5" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input y="3" text="H_" x="15" size="9" tagg="label"/>
-        <terminal y="-21" x="0" orientation="n"/>
-        <terminal y="21" x="0" orientation="s"/>
-    </description>
+  <description>
+    <polygon x1="5" x2="7" x3="7" x4="12" x5="12" x6="14" y1="20" y2="20" y3="15" y4="15" y5="20" y6="20" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" antialias="false"/>
+    <circle x="-10" y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="true"/>
+    <line x1="7.03" x2="-7.03" y1="-7.03" y2="7.03" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="-7.03" x2="7.03" y1="-7.03" y2="7.03" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="0" x2="0" y1="-20" y2="-10" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="0" x2="0" y1="10" y2="20" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <input x="15" y="3" size="9" tagg="label" text="H_"/>
+    <terminal x="0" y="-20" orientation="n"/>
+    <terminal x="0" y="20" orientation="s"/>
+  </description>
 </definition>

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

@@ -1,28 +1,28 @@
-<definition height="60" link_type="simple" type="element" hotspot_y="29" version="0.5" hotspot_x="16" width="50">
-    <uuid uuid="{b023f4b0-b88f-4fb9-9aa1-49826bd42be1}"/>
-    <names>
-        <name lang="fr">Voyant avec transformateur</name>
-        <name lang="de">Meldeleuchte mit Transformator</name>
-        <name lang="it">Luce con trasformatore</name>
-        <name lang="ar">مصباح بمُحوّل</name>
-        <name lang="el">Λυχνία με μετασχηματιστή</name>
-        <name lang="cs">Kontrolka s transformátorem</name>
-        <name lang="en">Light with transformer</name>
-        <name lang="es">Lampara con transformador</name>
-        <name lang="pl">Wskaźnik optyczny transformatorowy</name>
-        <name lang="nl">Lamp met transformator</name>
-    </names>
-    <informations>Author: The QElectroTech team
+<definition type="element" width="50" height="60" version="0.5" hotspot_x="16" hotspot_y="29" link_type="simple">
+  <uuid uuid="{b023f4b0-b88f-4fb9-9aa1-49826bd42be1}"/>
+  <names>
+    <name lang="fr">Voyant avec transformateur</name>
+    <name lang="de">Meldeleuchte mit Transformator</name>
+    <name lang="it">Luce con trasformatore</name>
+    <name lang="ar">مصباح بمُحوّل</name>
+    <name lang="el">Λυχνία με μετασχηματιστή</name>
+    <name lang="cs">Kontrolka s transformátorem</name>
+    <name lang="en">Light with transformer</name>
+    <name lang="es">Lampara con transformador</name>
+    <name lang="pl">Wskaźnik optyczny transformatorowy</name>
+    <name lang="nl">Lamp met transformator</name>
+  </names>
+  <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <circle y="-10" x="-10" antialias="true" diameter="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input y="0.55" text="_" x="33" rotate="true" size="9" tagg="label"/>
-        <circle y="-10" x="7" antialias="true" diameter="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="7.03" antialias="false" x1="24.03" y1="-7.03" length2="1.5" length1="1.5" x2="9.97" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="7.03" antialias="false" x1="9.97" y1="-7.03" length2="1.5" length1="1.5" x2="24.03" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="-10" antialias="false" x1="0" y1="-20" length2="1.5" length1="1.5" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="20" antialias="false" x1="0" y1="10" length2="1.5" length1="1.5" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal y="-21" x="0" orientation="n"/>
-        <terminal y="21" x="0" orientation="s"/>
-    </description>
+  <description>
+    <circle x="-10" y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="true"/>
+    <input x="33" y="0.55" size="9" tagg="label" text="_" rotate="true"/>
+    <circle x="7" y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="true"/>
+    <line x1="24.03" x2="9.97" y1="-7.03" y2="7.03" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="9.97" x2="24.03" y1="-7.03" y2="7.03" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="0" x2="0" y1="-20" y2="-10" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="0" x2="0" y1="10" y2="20" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <terminal x="0" y="-20" orientation="n"/>
+    <terminal x="0" y="20" orientation="s"/>
+  </description>
 </definition>

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

@@ -1,28 +1,29 @@
-<definition width="60" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny">
-<uuid uuid="{0319D98A-1348-4904-A5CB-787A8D6280CD}"/><names>
-        <name lang="ar">مُؤشّر ضوئي لمفتاح ضاغط</name>
-        <name lang="el">Μπουτόν, φωτειζόμενο με LED</name>
-        <name lang="en">LED of an illuminated push-button</name>
-        <name lang="es">LED en un pulsador iluminado</name>
-        <name lang="de">Meldeleuchte eines Drucktasters</name>
-        <name lang="it">Spia luminosa a LED</name>
-        <name lang="fr">Voyant d'un bouton poussoir lumineux</name>
-        <name lang="pl">Łącznik przyciskowy podświetlony</name>
-        <name lang="cs">Prosvětlené tlačítko</name>
-        <name lang="nl">lamp van drukknop </name>
-    </names>
-    <informations>Author: The QElectroTech team
+<definition type="element" width="60" height="50" version="0.3" hotspot_x="15" hotspot_y="25" orientation="dnny">
+  <uuid uuid="{0319D98A-1348-4904-A5CB-787A8D6280CD}"/>
+  <names>
+    <name lang="ar">مُؤشّر ضوئي لمفتاح ضاغط</name>
+    <name lang="el">Μπουτόν, φωτειζόμενο με LED</name>
+    <name lang="en">LED of an illuminated push-button</name>
+    <name lang="es">LED en un pulsador iluminado</name>
+    <name lang="de">Meldeleuchte eines Drucktasters</name>
+    <name lang="it">Spia luminosa a LED</name>
+    <name lang="fr">Voyant d'un bouton poussoir lumineux</name>
+    <name lang="pl">Łącznik przyciskowy podświetlony</name>
+    <name lang="cs">Prosvětlené tlačítko</name>
+    <name lang="nl">lamp van drukknop </name>
+  </names>
+  <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="20"/>
-        <polygon x4="17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="17" y2="5" x2="20" y3="-5" x3="20" y4="-5"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.03" x1="7.03" y2="7.03" x2="-7.03"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.03" x1="-7.03" y2="7.03" x2="7.03"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0"/>
-        <input x="23" y="-1.5" size="9" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
+  <description>
+    <line x1="10" x2="20" y1="0" y2="0" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <polygon x1="17" x2="20" x3="20" x4="17" y1="5" y2="5" y3="-5" y4="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" antialias="false"/>
+    <circle x="-10" y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="true"/>
+    <line x1="7.03" x2="-7.03" y1="-7.03" y2="7.03" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="-7.03" x2="7.03" y1="-7.03" y2="7.03" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="0" x2="0" y1="-20" y2="-10" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <line x1="0" x2="0" y1="10" y2="20" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
+    <input x="23" y="-1.5" size="9" tagg="label" text="_" rotate="true"/>
+    <terminal x="0" y="-20" orientation="n"/>
+    <terminal x="0" y="20" orientation="s"/>
+  </description>
 </definition>

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

@@ -1,29 +1,35 @@
-<definition height="60" link_type="simple" type="element" hotspot_y="29" version="0.5" hotspot_x="15" width="30">
-    <uuid uuid="{41cad2a6-e90a-4d04-90af-ff74e15e3031}"/>
+<definition type="element" hotspot_y="30" hotspot_x="14" link_type="simple" width="30" height="60" version="0.90">
+    <uuid uuid="{2b0973a9-d0f8-42e1-b28b-0571dadc72e8}"/>
     <names>
-        <name lang="fr">Voyant flash</name>
-        <name lang="de">Blinklicht</name>
         <name lang="it">Luce intermittente</name>
-        <name lang="ar">مُؤشّر وميضي</name>
         <name lang="el">Λυχνία με παλλόμενο φως</name>
+        <name lang="ar">مُؤشّر وميضي</name>
         <name lang="cs">Blikající světlo</name>
-        <name lang="en">Flashing light</name>
         <name lang="es">Lampara intermitente</name>
         <name lang="pl">Wskaźnik optyczny o świetle migowym</name>
+        <name lang="en">Flashing light</name>
         <name lang="nl">Knipperlicht</name>
+        <name lang="de">Blinklicht</name>
+        <name lang="fr">Voyant flash</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input y="-4.45" text="_" x="13" rotate="true" size="9" tagg="label"/>
-        <polygon x4="-7" y2="7" antialias="false" y5="0" x1="0" y1="0" x3="-10" x2="-7" x5="0" y3="0" y4="-7" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <polygon x4="7" y2="-7" y7="0" antialias="false" y6="0" y5="0" x6="0" x1="0" y1="0" x3="10" x2="7" x5="0" y3="0" y4="7" x7="0" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <circle y="-10" x="-10" antialias="true" diameter="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="7.03" antialias="false" x1="7.03" y1="-7.03" length2="1.5" length1="1.5" x2="-7.03" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="7.03" antialias="false" x1="-7.03" y1="-7.03" length2="1.5" length1="1.5" x2="7.03" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="-10" antialias="false" x1="0" y1="-20" length2="1.5" length1="1.5" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="20" antialias="false" x1="0" y1="10" length2="1.5" length1="1.5" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal y="-21" x="0" orientation="n"/>
-        <terminal y="21" x="0" orientation="s"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" x="13" uuid="{52feb3dc-7d99-477d-9675-e980db92c85c}" frame="false" Halignment="AlignLeft" keep_visual_rotation="false" z="1" text_width="-1" Valignment="AlignTop" y="-15.95" text_from="ElementInfo">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="2" text="X2" y="20" color="#000000"/>
+        <polygon x2="-7" y2="7" y5="0" y4="-7" antialias="false" x1="0" style="line-style:normal;line-weight:normal;filling:black;color:black" x3="-10" y3="0" x5="0" x4="-7" y1="0"/>
+        <polygon x2="7" y2="-7" y5="0" y7="0" y4="7" y6="0" antialias="false" x1="0" style="line-style:normal;line-weight:normal;filling:black;color:black" x3="10" y3="0" x5="0" x4="7" x6="0" x7="0" y1="0"/>
+        <circle x="-10" antialias="true" diameter="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10"/>
+        <line x2="-7.03" y2="7.03" end1="none" length1="1.5" antialias="false" x1="7.03" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y1="-7.03"/>
+        <line x2="7.03" y2="7.03" end1="none" length1="1.5" antialias="false" x1="-7.03" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y1="-7.03"/>
+        <line x2="0" y2="-10" end1="none" length1="1.5" antialias="false" x1="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y1="-20"/>
+        <line x2="0" y2="20" end1="none" length1="1.5" antialias="false" x1="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y1="10"/>
+        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="2" text="X1" y="-15" color="#000000"/>
+        <terminal type="Generic" x="0" orientation="s" uuid="{40fe89f2-f4f2-4cc1-9b77-5fc8dc2d0142}" y="20" name=""/>
+        <terminal type="Generic" x="0" orientation="n" uuid="{156f4a82-5703-42f5-a23a-f8338411e883}" y="-20" name=""/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/avertisseur.elmt

@@ -1,29 +1,31 @@
-<definition height="50" hotspot_y="24" version="0.60" width="50" type="element" hotspot_x="10" link_type="simple">
-    <uuid uuid="{b9c6cdc5-159d-458d-95b1-1eb8c4685dd3}"/>
+<definition hotspot_y="24" hotspot_x="10" type="element" link_type="simple" version="0.90" width="50" height="50">
+    <uuid uuid="{7b87c67d-c6bc-4cc4-b997-0fa0a1b4421f}"/>
     <names>
-        <name lang="pl">Buczek</name>
-        <name lang="nl">Toeter</name>
-        <name lang="el">Κόρνα</name>
-        <name lang="pt">Buzina</name>
         <name lang="fr">Avertisseur</name>
-        <name lang="it">Tromba</name>
-        <name lang="de">Warnhupe</name>
-        <name lang="cs">Houkačka</name>
-        <name lang="en">Horn</name>
-        <name lang="ru">Горн</name>
+        <name lang="nl">Toeter</name>
         <name lang="es">Bocina</name>
+        <name lang="it">Tromba</name>
+        <name lang="ru">Горн</name>
         <name lang="ar">مُنبّه</name>
+        <name lang="el">Κόρνα</name>
+        <name lang="en">Horn</name>
+        <name lang="de">Warnhupe</name>
+        <name lang="pt">Buzina</name>
+        <name lang="pl">Buczek</name>
+        <name lang="cs">Houkačka</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon y1="5" closed="false" y4="-5" antialias="true" y2="10" y3="-10" x1="6" x3="26" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="36" x4="6"/>
-        <input y="3" x="41" tagg="label" size="9" text="_"/>
-        <line length1="1.5" y1="12" antialias="false" y2="12" end1="none" x1="6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-6" end2="none"/>
-        <line length1="1.5" y1="-12" antialias="false" y2="12" end1="none" x1="6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="6" end2="none"/>
-        <line length1="1.5" y1="-12" antialias="false" y2="12" end1="none" x1="-6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-6" end2="none"/>
-        <line length1="1.5" y1="-12" antialias="false" y2="-12" end1="none" x1="-6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="6" end2="none"/>
-        <terminal y="16" x="0" orientation="s"/>
-        <terminal y="-16" x="0" orientation="n"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" end2="none" end1="none" y2="20" y1="-20" antialias="false" x2="0" length1="1.5" length2="1.5"/>
+        <rect y="-12" style="line-style:normal;line-weight:normal;filling:white;color:black" ry="0" x="-6" width="12" height="24" rx="0" antialias="false"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:white;color:black" x1="6" y3="-10" y2="10" y1="5" x4="6" antialias="true" y4="-5" x2="36" x3="26"/>
+        <dynamic_text y="-8.5" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" Valignment="AlignTop" z="4" x="41" frame="false" text_from="ElementInfo" keep_visual_rotation="false" uuid="{e8358a96-3528-4d52-b12c-4411b54a3e10}" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="20" orientation="s" x="0" type="Generic" name="A2" uuid="{8c091f38-cbe7-4a39-b20f-8395634b930b}"/>
+        <terminal y="-20" orientation="n" x="0" type="Generic" name="A1" uuid="{bc5f0ef2-6810-4390-abea-292b295a6d81}"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/haut_parleur.elmt

@@ -1,28 +1,29 @@
-<definition height="40" link_type="simple" type="element" hotspot_y="19" version="0.5" hotspot_x="15" width="30">
-    <uuid uuid="{3aea23d8-a9ab-4ece-bce6-a5156c8313db}"/>
+<definition width="30" link_type="simple" hotspot_y="19" hotspot_x="15" version="0.90" height="40" type="element">
+    <uuid uuid="{c9f95cb7-f919-4ed3-a6b5-ec2c086b18de}"/>
     <names>
         <name lang="fr">Haut-parleur</name>
+        <name lang="en">Speaker</name>
+        <name lang="el">Ηχείο</name>
+        <name lang="pl">Głośnik</name>
         <name lang="de">Lautsprecher</name>
         <name lang="it">Altoparlante</name>
         <name lang="ar">سمّاعة</name>
-        <name lang="el">Ηχείο</name>
-        <name lang="cs">Reproduktor</name>
-        <name lang="en">Speaker</name>
-        <name lang="es">Bocina</name>
-        <name lang="pl">Głośnik</name>
         <name lang="nl">Luidspreker</name>
+        <name lang="cs">Reproduktor</name>
+        <name lang="es">Bocina</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input y="1.55" text="_" x="14" rotate="true" size="9" tagg="label"/>
-        <polygon x4="3" y2="-14" antialias="false" y5="-8" x1="3" y1="-8" closed="false" x3="11" x2="11" x5="3" y3="14" y4="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect y="-8" height="16" x="-3" antialias="false" width="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="-5" antialias="false" x1="-3" y1="-5" length2="1.5" length1="1.5" x2="-10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="5" antialias="false" x1="-3" y1="5" length2="1.5" length1="1.5" x2="-10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="-11" antialias="false" x1="-10" y1="-5" length2="1.5" length1="1.5" x2="-10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="5" antialias="false" x1="-10" y1="11" length2="1.5" length1="1.5" x2="-10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal y="14" x="-10" orientation="s"/>
-        <terminal y="-14" x="-10" orientation="n"/>
+        <dynamic_text keep_visual_rotation="false" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" uuid="{cfd67ab0-3b0b-4840-ab79-c9cd5f2a4039}" frame="false" text_from="ElementInfo" x="14" z="1" Valignment="AlignTop" Halignment="AlignLeft" rotation="0" y="-9.95">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <polygon y3="14" y1="-8" x2="11" x3="11" x1="3" y2="-14" y5="-8" x5="3" x4="3" antialias="false" y4="8" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="6" ry="0" x="-3" rx="0" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8"/>
+        <polygon y3="-5" y1="-15" x2="-10" y6="15" x3="-3" x6="-10" x1="-10" y2="-5" y5="5" x5="-10" x4="-3" antialias="false" y4="5" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal name="A2" uuid="{3f6cfe1d-546f-4f32-85ab-3fb971ca4b59}" orientation="s" x="-10" type="Generic" y="15"/>
+        <terminal name="A1" uuid="{558ab7ac-d054-4d12-9369-932c569ff5ef}" orientation="n" x="-10" type="Generic" y="-15"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/sirene.elmt

@@ -1,30 +1,30 @@
-<definition width="60" version="0.3" hotspot_x="10" hotspot_y="30" height="60" type="element">
-<uuid uuid="{02481F43-0948-4ABA-B595-14290CFA93D7}"/><names>
-        <name lang="ar">صفّارة إنذار</name>
-        <name lang="de">Sirene</name>
-        <name lang="ru">Сирена</name>
-        <name lang="pt">Sirene</name>
-        <name lang="el">Σειρήνα</name>
-        <name lang="en">Siren</name>
-        <name lang="it">Sirena</name>
+<definition link_type="simple" hotspot_x="6" width="40" type="element" version="0.90" height="50" hotspot_y="24">
+    <uuid uuid="{aceabf6d-9db8-449a-a91f-f71ff9aad879}"/>
+    <names>
         <name lang="fr">Sirène</name>
+        <name lang="ru">Сирена</name>
+        <name lang="de">Sirene</name>
+        <name lang="en">Siren</name>
+        <name lang="el">Σειρήνα</name>
+        <name lang="cs">Siréna</name>
+        <name lang="ar">صفّارة إنذار</name>
+        <name lang="nl">Sirene</name>
+        <name lang="pt">Sirene</name>
+        <name lang="it">Sirena</name>
         <name lang="pl">Syrena</name>
         <name lang="es">Sirena</name>
-        <name lang="cs">Siréna</name>
-        <name lang="nl">Sirene</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="35" y="3" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="0" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="0" y2="20" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="20" y2="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="-5" x1="0" y2="-5" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-5" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <dynamic_text text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" keep_visual_rotation="false" text_width="-1" Valignment="AlignTop" z="1" frame="false" Halignment="AlignLeft" x="35" uuid="{4202f0f5-05ab-41af-9612-da9c24b976cc}" y="-8.5" rotation="0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <polygon y1="-10" y2="10" x3="30" style="line-style:normal;line-weight:normal;filling:white;color:black" x1="20" antialias="false" x2="20" y3="0"/>
+        <polygon y1="-20" y2="-5" x3="20" y6="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="false" x2="0" x4="20" y3="-5" x5="0" y5="5" y4="5" x6="0" closed="false"/>
+        <terminal type="Generic" orientation="s" name="A2" x="0" uuid="{112f4a5d-3a40-48f9-8746-dcd5c64bffb9}" y="20"/>
+        <terminal type="Generic" orientation="n" name="A1" x="0" uuid="{95da3481-88c4-4a1e-9419-7033b26f198f}" y="-20"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/sonnerie.elmt

@@ -1,29 +1,31 @@
-<definition width="60" version="0.3" hotspot_x="10" hotspot_y="30" height="60" type="element">
-<uuid uuid="{B32B5892-320F-4D88-B51E-435A2D74DAB6}"/><names>
-        <name lang="ar">جرس</name>
-        <name lang="de">Klingel</name>
+<definition hotspot_x="6" hotspot_y="24" width="30" height="50" version="0.90" type="element" link_type="simple">
+    <uuid uuid="{07108acf-c5d0-4236-8638-780c4ea104e5}"/>
+    <names>
         <name lang="ru">Звонок</name>
-        <name lang="pt">Campaínha</name>
-        <name lang="el">Κουδούνι</name>
-        <name lang="en">Bell</name>
-        <name lang="it">Campanella</name>
-        <name lang="fr">Sonnerie</name>
         <name lang="pl">Dzwonek</name>
-        <name lang="es">Timbre</name>
+        <name lang="el">Κουδούνι</name>
+        <name lang="pt">Campaínha</name>
         <name lang="cs">Zvonek</name>
+        <name lang="fr">Sonnerie</name>
+        <name lang="es">Timbre</name>
+        <name lang="it">Campanella</name>
         <name lang="nl">Bel</name>
+        <name lang="de">Klingel</name>
+        <name lang="ar">جرس</name>
+        <name lang="en">Bell</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="35" y="3" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="-20" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="0" y2="20" x2="0"/>
-        <arc width="20" x="10" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="20" y2="-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="5" x1="0" y2="5" x2="20"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <dynamic_text Valignment="AlignTop" text_width="-1" frame="false" y="-8.5" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" keep_visual_rotation="false" x="35" rotation="0" uuid="{67256a36-07c7-4d14-a316-a0f6a85c5116}" z="1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <arc start="90" y="-10" width="20" height="20" x="10" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
+        <line y1="-10" x2="20" end2="none" end1="none" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="false" length1="1.5" length2="1.5"/>
+        <polygon y1="-20" y2="-5" x3="20" y6="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="false" x2="0" x4="20" y3="-5" x5="0" y5="5" y4="5" x6="0" closed="false"/>
+        <terminal orientation="s" y="20" x="0" uuid="{489e5343-f20e-4795-afaa-5e315ad152cc}" name="A2" type="Generic"/>
+        <terminal orientation="n" y="-20" x="0" uuid="{eb1b606d-779d-4355-bb0b-87cef400b251}" name="A1" type="Generic"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/sonnerie_a_1_coup.elmt

@@ -1,29 +1,30 @@
-<definition height="40" link_type="simple" type="element" hotspot_y="19" version="0.5" hotspot_x="15" width="30">
-    <uuid uuid="{1d4b77ad-4422-48c7-9801-f6e5789e7f15}"/>
+<definition hotspot_y="24" height="50" link_type="simple" width="40" hotspot_x="6" version="0.90" type="element">
+    <uuid uuid="{753b9301-b909-4f60-bee4-318e53b9f3d8}"/>
     <names>
-        <name lang="fr">Sonnerie à un coup</name>
         <name lang="de">Gong</name>
-        <name lang="it">Suoneria a singola suonata</name>
-        <name lang="ar">جرس بضربة واحدة</name>
-        <name lang="el">Κουδούνι ενός ήχου</name>
         <name lang="cs">Gong</name>
         <name lang="en">1 bell ringer has</name>
-        <name lang="es">Campana de domo</name>
+        <name lang="it">Suoneria a singola suonata</name>
         <name lang="pl">Gong</name>
+        <name lang="el">Κουδούνι ενός ήχου</name>
+        <name lang="fr">Sonnerie à un coup</name>
+        <name lang="ar">جرس بضربة واحدة</name>
         <name lang="nl">Gong</name>
+        <name lang="es">Campana de domo</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input y="0.55" text="_" x="10" rotate="true" size="9" tagg="label"/>
-        <rect y="-1" height="2" x="1" antialias="false" width="7" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line end1="none" y2="-5" antialias="false" x1="1" y1="-5" length2="1.5" length1="1.5" x2="-7" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="7" antialias="false" x1="1" y1="-7" length2="1.5" length1="1.5" x2="1" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc y="-7.5" height="15" x="-6.5" start="90" antialias="true" angle="-180" width="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="5" antialias="false" x1="1" y1="5" length2="1.5" length1="1.5" x2="-7" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="-11" antialias="false" x1="-7" y1="-5" length2="1.5" length1="1.5" x2="-7" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" y2="5" antialias="false" x1="-7" y1="11" length2="1.5" length1="1.5" x2="-7" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal y="-14" x="-7" orientation="n"/>
-        <terminal y="14" x="-7" orientation="s"/>
+        <rect ry="0" height="2" width="9.5" antialias="false" x="20" y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" rx="0"/>
+        <dynamic_text uuid="{67256a36-07c7-4d14-a316-a0f6a85c5116}" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo" x="35" y="-8.5" z="1" keep_visual_rotation="false" Valignment="AlignTop" rotation="0" frame="false" text_width="-1" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <arc height="20" width="20" start="90" antialias="true" x="10" angle="-180" y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end1="none" length1="1.5" y1="-10" x2="20" antialias="false" end2="none" x1="20" length2="1.5" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon closed="false" x4="20" y3="-5" y4="5" y1="-20" x2="0" antialias="false" x6="0" y6="20" x1="0" x3="20" y5="5" y2="-5" x5="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal uuid="{eb1b606d-779d-4355-bb0b-87cef400b251}" name="A1" x="0" y="-20" type="Generic" orientation="n"/>
+        <terminal uuid="{489e5343-f20e-4795-afaa-5e315ad152cc}" name="A2" x="0" y="20" type="Generic" orientation="s"/>
     </description>
 </definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/switch_led_green.elmt

@@ -0,0 +1,74 @@
+<definition hotspot_y="24" version="0.80" orientation="dyyy" hotspot_x="47" width="80" height="60" link_type="master" type="element">
+    <uuid uuid="{23e2be0b-4fda-4c61-a627-7f18dc750a8e}"/>
+    <names>
+        <name lang="ar">Switch with LED</name>
+        <name lang="es">Switch with LED</name>
+        <name lang="en">Switch with LED</name>
+        <name lang="cs">Switch with LED</name>
+        <name lang="nl">Switch with LED</name>
+        <name lang="de">Switch with LED</name>
+        <name lang="fr">Switch with LED</name>
+        <name lang="pl">Switch with LED</name>
+        <name lang="it">Switch with LED</name>
+    </names>
+    <kindInformations>
+        <kindInformation show="1" name="type">commutator</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <circle x="13" diameter="14" style="line-style:normal;line-weight:normal;filling:green;color:black" y="-2" antialias="true"/>
+        <polygon y2="15" y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" x3="0" closed="false" y3="25" x1="-15" antialias="true"/>
+        <polygon y5="5" y4="5" y2="5" y1="5" style="line-style:dotted;line-weight:normal;filling:none;color:black" x2="-27" x4="-31" x3="-29" x5="-41" closed="false" y3="10" x1="-8" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-5" y1="-15" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" end2="none" x1="0" antialias="false"/>
+        <polygon y2="-3" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-20" x3="-12" closed="false" y3="-3" x1="-20" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-2" y1="-15" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" end2="none" x1="20" antialias="false"/>
+        <line end1="none" length2="1.5" y2="25" y1="12" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" end2="none" x1="20" antialias="false"/>
+        <arc x="-22.5" angle="180" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="-22.5" antialias="true"/>
+        <line end1="none" length2="1.5" y2="10" y1="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="25" end2="none" x1="15" antialias="false"/>
+        <arc x="17.5" angle="180" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="27.5" antialias="true"/>
+        <dynamic_text z="10" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" x="18" rotation="0" uuid="{29d2349f-5f03-47cb-9b7a-b373fa6b3aad}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-24" frame="false">
+            <text>+</text>
+        </dynamic_text>
+        <dynamic_text z="10" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="35" rotation="0" uuid="{8053f011-a2d9-400b-b527-e8d14d50237e}" text_from="ElementInfo" Halignment="AlignLeft" text_width="-1" y="-5" frame="true">
+            <text/>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line end1="none" length2="1.5" y2="0" y1="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="25" end2="none" x1="15" antialias="false"/>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="-15" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-23" frame="false">
+            <text>3</text>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="-14" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="14" frame="false">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="-35" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-23" frame="false">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="5" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-23" frame="false">
+            <text>X1</text>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="4" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="14" frame="false">
+            <text>X2</text>
+        </dynamic_text>
+        <arc x="17.5" angle="180" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="-22.5" antialias="true"/>
+        <arc x="-2.5" angle="180" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="27.5" antialias="true"/>
+        <arc x="-2.5" angle="180" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="-22.5" antialias="true"/>
+        <line end1="none" length2="1.5" y2="10" y1="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-41" end2="none" x1="-41" antialias="false"/>
+        <arc x="-45" angle="-180" start="-90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" height="10" y="0" antialias="true"/>
+        <line end1="none" length2="1.5" y2="-20" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-33" end2="none" x1="-33" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" end2="none" x1="30" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-23" end2="none" x1="-33" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-3" end2="none" x1="-17" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="17" end2="none" x1="3" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" end2="none" x1="23" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" end2="none" x1="23" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="3" end2="none" x1="17" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-3" end2="none" x1="-33" antialias="false"/>
+        <terminal x="-20" orientation="n" y="-20"/>
+        <terminal x="20" orientation="n" y="-20"/>
+        <terminal x="20" orientation="s" y="30"/>
+        <terminal x="0" orientation="n" y="-20"/>
+        <terminal x="0" orientation="s" y="30"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/switch_led_red.elmt

@@ -0,0 +1,74 @@
+<definition hotspot_y="24" version="0.80" orientation="dyyy" hotspot_x="47" width="80" height="60" link_type="master" type="element">
+    <uuid uuid="{d541c930-af0b-49f6-8904-953c8ce390c0}"/>
+    <names>
+        <name lang="ar">Switch with LED</name>
+        <name lang="es">Switch with LED</name>
+        <name lang="en">Switch with LED</name>
+        <name lang="cs">Switch with LED</name>
+        <name lang="nl">Switch with LED</name>
+        <name lang="de">Switch with LED</name>
+        <name lang="fr">Switch with LED</name>
+        <name lang="pl">Switch with LED</name>
+        <name lang="it">Switch with LED</name>
+    </names>
+    <kindInformations>
+        <kindInformation show="1" name="type">commutator</kindInformation>
+    </kindInformations>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <circle x="13" diameter="14" style="line-style:normal;line-weight:normal;filling:red;color:black" y="-2" antialias="true"/>
+        <polygon y2="15" y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" x3="0" closed="false" y3="25" x1="-15" antialias="true"/>
+        <polygon y5="5" y4="5" y2="5" y1="5" style="line-style:dotted;line-weight:normal;filling:none;color:black" x2="-27" x4="-31" x3="-29" x5="-41" closed="false" y3="10" x1="-8" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-5" y1="-15" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" end2="none" x1="0" antialias="false"/>
+        <polygon y2="-3" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-20" x3="-12" closed="false" y3="-3" x1="-20" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-2" y1="-15" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" end2="none" x1="20" antialias="false"/>
+        <line end1="none" length2="1.5" y2="25" y1="12" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" end2="none" x1="20" antialias="false"/>
+        <arc x="-22.5" angle="180" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="-22.5" antialias="true"/>
+        <line end1="none" length2="1.5" y2="10" y1="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="25" end2="none" x1="15" antialias="false"/>
+        <dynamic_text z="10" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" x="18" rotation="0" uuid="{29d2349f-5f03-47cb-9b7a-b373fa6b3aad}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-24" frame="false">
+            <text>+</text>
+        </dynamic_text>
+        <arc x="17.5" angle="180" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="27.5" antialias="true"/>
+        <dynamic_text z="10" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="35" rotation="0" uuid="{8053f011-a2d9-400b-b527-e8d14d50237e}" text_from="ElementInfo" Halignment="AlignLeft" text_width="-1" y="-5" frame="true">
+            <text/>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="5" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-23" frame="false">
+            <text>X1</text>
+        </dynamic_text>
+        <line end1="none" length2="1.5" y2="0" y1="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="25" end2="none" x1="15" antialias="false"/>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="-35" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-23" frame="false">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="-14" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="14" frame="false">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="-15" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="-23" frame="false">
+            <text>3</text>
+        </dynamic_text>
+        <dynamic_text z="11" Valignment="AlignTop" font="Sans Serif,6,-1,5,0,0,0,0,0,0,normal" x="4" rotation="0" uuid="{cc7bb8fc-97ea-4f33-abcc-7c37e5174f9b}" text_from="UserText" Halignment="AlignLeft" text_width="-1" y="14" frame="false">
+            <text>X2</text>
+        </dynamic_text>
+        <arc x="17.5" angle="180" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="-22.5" antialias="true"/>
+        <arc x="-2.5" angle="180" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="27.5" antialias="true"/>
+        <arc x="-2.5" angle="180" start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5" height="5" y="-22.5" antialias="true"/>
+        <line end1="none" length2="1.5" y2="10" y1="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-41" end2="none" x1="-41" antialias="false"/>
+        <arc x="-45" angle="-180" start="-90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" height="10" y="0" antialias="true"/>
+        <line end1="none" length2="1.5" y2="-20" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-33" end2="none" x1="-33" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" end2="none" x1="30" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-23" end2="none" x1="-33" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-3" end2="none" x1="-17" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="17" end2="none" x1="3" antialias="false"/>
+        <line end1="none" length2="1.5" y2="-20" y1="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" end2="none" x1="23" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" end2="none" x1="23" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="3" end2="none" x1="17" antialias="false"/>
+        <line end1="none" length2="1.5" y2="30" y1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-3" end2="none" x1="-33" antialias="false"/>
+        <terminal x="-20" orientation="n" y="-20"/>
+        <terminal x="0" orientation="s" y="30"/>
+        <terminal x="0" orientation="n" y="-20"/>
+        <terminal x="20" orientation="s" y="30"/>
+        <terminal x="20" orientation="n" y="-20"/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/010_switch_1pos.elmt

@@ -0,0 +1,33 @@
+<definition hotspot_x="11" type="element" link_type="simple" width="20" version="0.80" hotspot_y="29" height="60">
+    <uuid uuid="{d3b03c88-7d17-4c10-adb8-94fe40b2f53b}"/>
+    <names>
+        <name lang="pt">Interruptor</name>
+        <name lang="nl">Contact (NO)</name>
+        <name lang="es">Interruptor</name>
+        <name lang="ar">مفتاح</name>
+        <name lang="en">Switch</name>
+        <name lang="it">Interruttore</name>
+        <name lang="ru">Переключатель</name>
+        <name lang="pl">Łącznik</name>
+        <name lang="de">Ein-/Ausschalter</name>
+        <name lang="fr">Interrupteur</name>
+        <name lang="cs">Spínač</name>
+        <name lang="el">Διακόπτης</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <circle x="-1.75" diameter="3.5" antialias="true" y="8.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="-20" y2="-12.5" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <dynamic_text x="2.75" Valignment="AlignTop" Halignment="AlignLeft" rotation="0" z="3" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" uuid="{06a2b3b1-c587-454b-89e3-4d8b41413e44}" y="-8.5" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <circle x="-1.75" diameter="3.5" antialias="true" y="-11.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="-10" y2="8" x1="-5" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-0.7" length2="1.5" end2="none"/>
+        <line y1="12" y2="17" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <terminal x="0" orientation="s" uuid="{eabdd4d0-f563-43b0-b1e3-4f7f816d79b1}" y="21" name=""/>
+        <terminal x="0" orientation="n" uuid="{6f505308-b294-48e4-821c-da003e1cff89}" y="-21" name=""/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/012_switch_dpst.elmt

@@ -0,0 +1,34 @@
+<definition hotspot_x="22" type="element" link_type="simple" width="40" version="0.80" hotspot_y="34" height="50">
+    <uuid uuid="{292876ce-c7fc-4eed-b957-ba6eecbd5ef2}"/>
+    <names>
+        <name lang="es">Conmutador bipolar NA</name>
+        <name lang="en">Switch, DPST, n.o.</name>
+        <name lang="ro">Comutator bipolar n,d.</name>
+        <name lang="pl">Zestyki zwierne o przełączaniu niezawodnym</name>
+        <name lang="fr">Commutateur bipolaire n.o.</name>
+        <name lang="cs">Dvoupólový spínač</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <circle x="8.25" diameter="3.5" antialias="true" y="-21.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="8.25" diameter="3.5" antialias="true" y="-1.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-11.75" diameter="3.5" antialias="true" y="-1.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-11.75" diameter="3.5" antialias="true" y="-21.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="-30" y2="-22" x1="-10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-10" length2="1.5" end2="none"/>
+        <line y1="-30" y2="-22" x1="10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="10" length2="1.5" end2="none"/>
+        <line y1="-10" y2="-10" x1="-18" length1="1.5" antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" end1="none" x2="13" length2="1.5" end2="none"/>
+        <dynamic_text x="16" Valignment="AlignTop" Halignment="AlignLeft" rotation="0" z="9" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" uuid="{131bf174-6f11-49a5-8e31-1366974c78b9}" y="-18" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="10" y2="2" x1="-10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-10" length2="1.5" end2="none"/>
+        <line y1="10" y2="2" x1="10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="10" length2="1.5" end2="none"/>
+        <line y1="-1.7" y2="-20" x1="-10.6" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-15" length2="1.5" end2="none"/>
+        <line y1="-1.7" y2="-20" x1="9.4" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="5" length2="1.5" end2="none"/>
+        <terminal x="10" orientation="s" uuid="{62d6aa78-c93e-4ce0-9108-17cc95085452}" y="10" name=""/>
+        <terminal x="-10" orientation="s" uuid="{52bf346a-cfa7-498c-85fd-4400fd338bc3}" y="10" name=""/>
+        <terminal x="-10" orientation="n" uuid="{53465032-346d-4056-9a81-87c47bb07dda}" y="-30" name=""/>
+        <terminal x="10" orientation="n" uuid="{b2675506-49be-4c22-8d32-aa9be7a200d4}" y="-30" name=""/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/020_switch 3 contacts.elmt

@@ -1,13 +1,13 @@
 <definition width="30" version="0.4" hotspot_x="4" hotspot_y="34" height="50" link_type="simple" type="element">
 <uuid uuid="{C08E215A-998C-44C4-BE38-6A9E638C7CDB}"/><names>
         <name lang="ar">مفتاح بوضعين</name>
-        <name lang="de">Wahlschalter 2 Positionen</name>
-        <name lang="ru">Переключатель 2-х позиционный</name>
-        <name lang="pt">Interruptor 2 posições</name>
+        <name lang="de">Wahlschalter 3 Positionen</name>
+        <name lang="ru">Переключатель 3-х позиционный</name>
+        <name lang="pt">Interruptor 3 posições</name>
         <name lang="el">Διακόπτης 2 θέσεων</name>
-        <name lang="en">Switch 2 positions</name>
-        <name lang="it">Interruttore a 2 posizioni</name>
-        <name lang="fr">Interrupteur 2 positions</name>
+        <name lang="en">Switch 3 positions</name>
+        <name lang="it">Interruttore a 3 posizioni</name>
+        <name lang="fr">Interrupteur 3 positions</name>
         <name lang="pl">Zestyk przełączny przerwowy</name>
         <name lang="es">Interruptor 3 posiciones</name>
         <name lang="nl">WisselContact (NC/NO)</name>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/021_switch_3pos.elmt

@@ -0,0 +1,39 @@
+<definition hotspot_x="24" type="element" link_type="simple" width="50" version="0.80" hotspot_y="34" height="50">
+    <uuid uuid="{6a6396ac-0161-4b29-be22-b69e52599c55}"/>
+    <names>
+        <name lang="pt">Interruptor 3 posições</name>
+        <name lang="es">Interruptor 3 posiciones</name>
+        <name lang="en">Switch 3 positions</name>
+        <name lang="it">Interruttore a 3 posizioni</name>
+        <name lang="ro">comutatorcu3pozitii</name>
+        <name lang="pl">Zestyk przełączny, trójpozycyjny</name>
+        <name lang="ru">Переключатель 3-х позиционный</name>
+        <name lang="de">Wahlschalter 3 Positionen</name>
+        <name lang="fr">Interrupteur 3 positions</name>
+        <name lang="cs">Třípolohový přepínač</name>
+        <name lang="el">Διακόπτης 3 θέσεων</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: titus
+titus0818@yahoo.com
+</informations>
+    <description>
+        <dynamic_text x="18" Valignment="AlignTop" Halignment="AlignLeft" rotation="0" z="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" uuid="{41daec74-14cf-4605-bb4d-22f9cecc0c85}" y="-33" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <circle x="18.5" diameter="3" antialias="true" y="-1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="2" y2="10" x1="20" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="20" length2="1.5" end2="none"/>
+        <line y1="-18.8" y2="1" x1="-1.2" length1="1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-18" length2="1.5" end2="none"/>
+        <circle x="-1.5" diameter="3" antialias="true" y="-1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-1.5" diameter="3" antialias="true" y="-21.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-21.5" diameter="3" antialias="true" y="-1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="2" y2="10" x1="-20" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-20" length2="1.5" end2="none"/>
+        <line y1="2" y2="10" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <line y1="-22" y2="-25.5943" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <terminal x="0" orientation="s" uuid="{41a23056-b737-48fe-8bef-7a75fdcf8cd9}" y="10" name=""/>
+        <terminal x="-20" orientation="s" uuid="{bc263590-b9f0-4386-9b01-8ee2cda81a36}" y="10" name=""/>
+        <terminal x="0" orientation="n" uuid="{02106d3b-b190-4331-8a8e-8f608bf54299}" y="-30" name=""/>
+        <terminal x="20" orientation="s" uuid="{283aaa3e-05cb-4b11-bcb8-beb1f4b6ae87}" y="10" name=""/>
+    </description>
+</definition>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commut_3_pos.elmt

@@ -16,8 +16,9 @@
         <elementInformation name="plant" show="1"></elementInformation>
         <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
     </elementInformations>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+    </informations>
     <description>
         <text x="-22" color="#000000" text="0" y="-6" font="Sans Serif,2,-1,5,50,0,0,0,0,0" rotation="0"/>
         <polygon x3="150" x1="145" y1="-10" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="20" closed="false" antialias="true" x2="150"/>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator bipolar n.d.elmt

@@ -1,26 +0,0 @@
-<definition type="element" link_type="simple" hotspot_x="21" hotspot_y="34" version="0.5" width="40" height="50">
-<uuid uuid="{1518186B-7F8F-4A69-A715-937286537ED9}"/><names>
-        <name lang="ro">Comutator bipolar n,d.</name>
-        <name lang="pl">Zestyki zwierne o przełączaniu niezawodnym</name>
-        <name lang="es">Conmutador bipolar NA</name>
-        <name lang="fr">Conmutateur bipolaire NO</name>
-        <name lang="cs">Dvoupólový spínač</name>
-    </names>
-    <informations>Author:titus
-titus0818@yahoo.com</informations>
-    <description>
-        <circle x="-13.5" y="-11" antialias="true" diameter="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <polygon y2="0" y3="10" x1="-15" x2="-10" closed="false" x3="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line y2="-20" x1="-10" end1="none" x2="-10" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <polygon y2="0" y3="10" x1="5" x2="10" closed="false" x3="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line y2="-20" x1="10" end1="none" x2="10" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <circle x="6.5" y="-11" antialias="true" diameter="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line y2="-11" x1="-13" end1="none" x2="7" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11"/>
-        <line y2="-9" x1="-13" end1="none" x2="7" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9"/>
-        <input rotate="true" tagg="label" size="9" x="16" y="-6.5" text="_"/>
-        <terminal orientation="s" x="10" y="10"/>
-        <terminal orientation="n" x="10" y="-30"/>
-        <terminal orientation="s" x="-10" y="10"/>
-        <terminal orientation="n" x="-10" y="-30"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator3poziții.elmt

@@ -1,34 +0,0 @@
-<definition type="element" height="50" version="0.5" width="50" link_type="simple" hotspot_x="24" hotspot_y="34">
-<uuid uuid="{D2C838A8-2C15-4977-880A-42CF376AB71B}"/><names>
-        <name lang="es">Interruptor 3 posiciones</name>
-        <name lang="pt">Interruptor 3 posições</name>
-        <name lang="de">Wahlschalter 3 Positionen</name>
-        <name lang="it">Interruttore a 3 posizioni</name>
-        <name lang="ro">comutatorcu3pozitii</name>
-        <name lang="el">Διακόπτης 3 θέσεων</name>
-        <name lang="en">Switch 3 positions</name>
-        <name lang="pl">Zestyk przełączny, trójpozycyjny</name>
-        <name lang="fr">Interrupteur 3 positions</name>
-        <name lang="ru">Переключатель 3-х позиционный</name>
-        <name lang="cs">Třípolohový přepínač</name>
-    </names>
-    <informations>Author: titus
-titus0818@yahoo.com
-</informations>
-    <description>
-        <input tagg="label" size="9" x="18" text="_" y="-21.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="18.5" y="-1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="10" antialias="false" x1="20" x2="20" length1="1.5" length2="1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="1" antialias="true" x1="0" x2="-18" length1="1.5" length2="1.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="-1.5" y="-1.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="-1.5" y="-21.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="-21.5" y="-1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="10" antialias="false" x1="-20" x2="-20" length1="1.5" length2="1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="10" antialias="false" x1="0" x2="0" length1="1.5" length2="1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20.4057" y2="-25.5943" antialias="false" x1="0" x2="0" length1="1.5" length2="1.5"/>
-        <terminal x="-20" y="10" orientation="s"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="20" y="10" orientation="s"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/interrupteur.elmt

@@ -1,29 +0,0 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny">
-<uuid uuid="{1DF6CC2E-009C-40B6-A165-FD2494620646}"/><names>
-        <name lang="ar">مفتاح</name>
-        <name lang="de">Ein-/Ausschalter</name>
-        <name lang="ru">Переключатель</name>
-        <name lang="pt">Interruptor</name>
-        <name lang="el">Διακόπτης</name>
-        <name lang="en">Switch</name>
-        <name lang="it">Interruttore</name>
-        <name lang="fr">Interrupteur</name>
-        <name lang="pl">Łącznik</name>
-        <name lang="es">Interruptor</name>
-        <name lang="cs">Spínač</name>
-        <name lang="nl">Contact (NO)</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-12.5" x2="0"/>
-        <input x="2.75" y="3" size="9" text="_" tagg="label"/>
-        <circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
-</definition>

elements/10_electric/10_allpole/390_sensors&instruments/02_sensors_inductive/induc.elmt

@@ -1,46 +1,45 @@
-<definition width="100" version="0.3" hotspot_x="55" hotspot_y="40" height="70" type="element">
-<uuid uuid="{E03480B9-9444-4F93-8F50-9B946F23733E}"/><names>
-        <name lang="ar">حسّاس حثّي</name>
-        <name lang="el">Επαγωγικός αισθητήρας</name>
-        <name lang="en">Inductif sensor</name>
-        <name lang="de">Induktiver Sensor 3-Leiter mit Stecker</name>
+<definition width="60" height="60" hotspot_x="22" hotspot_y="37" link_type="simple" version="0.90" type="element">
+    <uuid uuid="{f8ee4bb6-f4a4-41bc-ae71-91ce3d216d77}"/>
+    <names>
+        <name lang="pl">Czujnik indukcyjny</name>
         <name lang="it">Sensore induttivo</name>
         <name lang="fr">Inductif</name>
-        <name lang="pl">Czujnik indukcyjny</name>
-        <name lang="es">Sensor inductivo</name>
+        <name lang="ar">حسّاس حثّي</name>
+        <name lang="en">Inductif sensor</name>
+        <name lang="el">Επαγωγικός αισθητήρας</name>
         <name lang="cs">Indukční snímač 3 vodiče s konektorem</name>
+        <name lang="es">Sensor inductivo</name>
+        <name lang="de">Induktiver Sensor 3-Leiter mit Stecker</name>
         <name lang="nl">Inductief</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-51" y="-4.3333" size="9" rotate="true" text="_" tagg="label"/>
-        <rect width="40" x="-20" y="-20" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-15" x1="-15" y2="-5" x2="-15" y3="-4" x3="-15" y4="-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="-12" y2="-15" x2="-13"/>
-        <rect width="8" x="25" y="-18" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-4" y5="-10" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-16" x2="-4" y3="-10" x3="2" y4="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="20" x2="-20"/>
-        <polygon x4="15" y5="6" x5="14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="14" x1="3" y2="14" x2="9" y3="6" x3="9" y4="6"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-13" x2="-15" x3="-15" x4="-14" antialias="false" x5="-15" x6="-14" x7="-13" x8="-14" x9="-14" closed="false" y1="-5" y2="-5" y10="-15" y3="-6" y11="-16" y4="-6" y12="-14" y5="-16" x10="-13" y6="-15" x11="-13" y7="-15" x12="-15" y8="-15" y9="-14"/>
-        <polygon x4="33" y5="-15" x5="25" y6="-16" x6="25" y7="-16" x7="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="26" y2="-17" x2="32" y3="-17" x3="33" y4="-15"/>
-        <polygon x4="-4" y5="-6" x5="-2" y6="-14" x6="-2" y7="-16" x7="-4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-16" x1="-4" y2="-14" x2="-6" y3="-6" x3="-6" y4="-4"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-12" x2="-16" x3="-16" x4="-12" antialias="false" x5="-12" x6="-14" x7="-14" x8="-12" x9="-12" closed="false" y1="-16" y2="-16" y3="-4" y4="-4" y5="-6" y6="-6" y7="-14" y8="-14" y9="-16"/>
-        <text x="21" y="-19" size="6" 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="-16" x1="21" y2="-16" x2="24"/>
-        <text x="27" y="11.6667" size="8" text="4"/>
-        <text x="27" y="-4.3333" size="8" text="3"/>
-        <text x="28" y="-21.3333" size="8" text="1"/>
-        <text x="21" y="12" size="6" text="A"/>
-        <text x="21" y="-4" size="6" text="-"/>
-        <rect width="8" x="25" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8" x="25" y="14" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="33" y5="17" x5="25" y6="16" x6="25" y7="16" x7="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="15" x1="26" y2="15" x2="32" y3="15" x3="33" y4="17"/>
-        <polygon x4="33" y5="1" x5="25" y6="0" x6="25" y7="0" x7="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="26" y2="-1" x2="32" y3="-1" x3="33" y4="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16" x1="21" y2="16" x2="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="21" y2="0" x2="24"/>
-        <terminal x="33" y="0" orientation="e"/>
-        <terminal x="33" y="16" orientation="e"/>
-        <terminal x="33" y="-16" orientation="e"/>
+        <dynamic_text Halignment="AlignLeft" z="1" text_from="ElementInfo" x="-51" y="-15.8333" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" keep_visual_rotation="false" Valignment="AlignTop" rotation="0" uuid="{558559ad-f84a-4121-9542-a85f1c0fabc7}" frame="false">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <rect width="40" height="40" x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20" ry="0" antialias="false" rx="0"/>
+        <rect width="8" height="4" x="25" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-18" ry="0" antialias="false" rx="0"/>
+        <polygon y5="-10" x5="-10" x2="-4" y4="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="-10" y2="-16" antialias="false" x4="-4" x3="2" y3="-10"/>
+        <line length2="1.5" x2="-19.5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="19.5" y1="-19.5" y2="19.5" end2="none" antialias="false" end1="none"/>
+        <polygon y5="6" x5="14" closed="false" x2="9" y4="6" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" y1="14" y2="14" antialias="false" x4="15" x3="9" y3="6"/>
+        <polygon y5="-6" x7="-4" y6="-14" x5="-2" x2="-6" y7="-16" y4="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" y1="-16" x6="-2" y2="-14" antialias="false" x4="-4" x3="-6" y3="-6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:black;color:black" y9="-16" x8="-12" x7="-14" y3="-4" x3="-16" x6="-14" x4="-12" x9="-12" antialias="false" x1="-12" x2="-16" y8="-14" y1="-16" y2="-16" x5="-12" y7="-14" y5="-6" y6="-6" y4="-4"/>
+        <text text="+" x="21" color="#000000" y="-19" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <line length2="1.5" x2="24" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="21" y1="-16" y2="-16" end2="none" antialias="false" end1="none"/>
+        <text text="4" x="27" color="#000000" y="11.6667" font="Sans Serif,8,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text text="3" x="27" color="#000000" y="-4.3333" font="Sans Serif,8,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text text="1" x="28" color="#000000" y="-21.3333" font="Sans Serif,8,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text text="A" x="21" color="#000000" y="12" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text text="-" x="21" color="#000000" y="-4" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <rect width="8" height="4" x="25" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-2" ry="0" antialias="false" rx="0"/>
+        <rect width="8" height="4" x="25" style="line-style:normal;line-weight:normal;filling:black;color:black" y="14" ry="0" antialias="false" rx="0"/>
+        <line length2="1.5" x2="24" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="21" y1="16" y2="16" end2="none" antialias="false" end1="none"/>
+        <line length2="1.5" x2="24" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="21" y1="0" y2="0" end2="none" antialias="false" end1="none"/>
+        <terminal x="33" y="0" orientation="e" type="Generic" name="" uuid="{62d62484-8103-412a-b8e0-41e903e079be}"/>
+        <terminal x="33" y="16" orientation="e" type="Generic" name="" uuid="{2fdc2b18-38e3-4356-b9ce-a7219944af2d}"/>
+        <terminal x="33" y="-16" orientation="e" type="Generic" name="" uuid="{329c074f-d69a-4124-8bcd-4a6cb6fe4f26}"/>
     </description>
 </definition>

elements/10_electric/10_allpole/390_sensors&instruments/04_sensors_optical/cellule_photoelectrique_emetteur.elmt

@@ -1,33 +1,38 @@
-<definition width="70" version="0.3" hotspot_x="40" hotspot_y="30" height="60" type="element" orientation="dnny">
-<uuid uuid="{F045891E-F280-4EDB-B528-1AAF9CAEFD9B}"/><names>
-        <name lang="ar">خليّة كهرو ضوئي - باعث</name>
-        <name lang="en">Photo-electric sensor -transmitter</name>
+<definition width="60" hotspot_y="25" version="0.90" link_type="simple" height="50" hotspot_x="38" type="element">
+    <uuid uuid="{8cab845f-a39f-4c8d-84d2-3d13f0b5e4ac}"/>
+    <names>
         <name lang="de">Photozelle Sender 2-Leiter</name>
-        <name lang="fr">Cellule photo-électrique - Emetteur</name>
-        <name lang="pl">Komórka fotoelektryczna - nadajnik</name>
-        <name lang="cs">Optická závora – vysílač</name>
-        <name lang="es">Sensor foto-eléctrico emisor</name>
         <name lang="it">Sensore foto-elettrico - Trasmettitore</name>
+        <name lang="es">Sensor foto-eléctrico emisor</name>
         <name lang="nl">Fotocel Zender</name>
+        <name lang="en">Photo-electric sensor -transmitter</name>
+        <name lang="pl">Komórka fotoelektryczna - nadajnik</name>
+        <name lang="ar">خليّة كهرو ضوئي - باعث</name>
+        <name lang="cs">Optická závora – vysílač</name>
+        <name lang="fr">Cellule photo-électrique - Emetteur</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-8" y="-15.6667" size="4" text="BN"/>
-        <text x="-8" y="18.3333" size="4" text="BU"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" x1="-20" y2="-4" x2="-32"/>
-        <rect width="30" x="-15" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="0.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-1" x1="-8" y2="-4" x2="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-2" y2="-8" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="0" y2="-10" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="4" x1="-20" y2="4" x2="-32"/>
-        <line length1="1.5" length2="0.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="2" x1="-8" y2="-1" x2="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-2" y2="5" x2="-2"/>
-        <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-7" y2="-5" x2="3" y3="5" x3="-2" y4="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="19" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="5" x2="3"/>
-        <input x="19.5" y="2.3333" size="9" text="_" tagg="label"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <text y="-15.6667" x="-8" text="BN" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <text y="18.3333" x="-8" text="BU" color="#000000" font="Sans Serif,4,-1,5,50,0,0,0,0,0" rotation="0"/>
+        <line end2="triangle" x2="-32" end1="none" length1="1.5" antialias="false" length2="1.5" x1="-20" y1="-4" y2="-4" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect y="-10" width="30" x="-15" ry="0" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0"/>
+        <line end2="triangle" x2="-13" end1="none" length1="1.5" antialias="true" length2="0.5" x1="-8" y1="-1" y2="-4" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <line end2="none" x2="-2" end1="none" length1="1.5" antialias="false" length2="1.5" x1="-2" y1="-5" y2="-8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" x2="0" end1="none" length1="1.5" antialias="false" length2="1.5" x1="0" y1="-19" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="triangle" x2="-32" end1="none" length1="1.5" antialias="false" length2="1.5" x1="-20" y1="4" y2="4" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <line end2="triangle" x2="-13" end1="none" length1="1.5" antialias="true" length2="0.5" x1="-8" y1="2" y2="-1" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <line end2="none" x2="-2" end1="none" length1="1.5" antialias="false" length2="1.5" x1="-2" y1="8" y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x2="3" antialias="true" y3="5" x1="-7" y1="-5" x4="-7" y2="-5" x3="-2" y4="-5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" x2="0" end1="none" length1="1.5" antialias="false" length2="1.5" x1="0" y1="10" y2="19" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" x2="3" end1="none" length1="1.5" antialias="false" length2="1.5" x1="-7" y1="5" y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <dynamic_text y="-9.1667" frame="false" Halignment="AlignLeft" x="19.5" Valignment="AlignTop" keep_visual_rotation="false" text_from="ElementInfo" z="14" uuid="{0ff9a420-3b7b-4c0a-8681-496fef2b27d6}" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" rotation="0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="20" x="0" name="" uuid="{4a95d782-eb35-4a21-accd-4c061fccd5ce}" orientation="s" type="Generic"/>
+        <terminal y="-20" x="0" name="" uuid="{b5603669-9b5b-44d3-817c-ba447e0ef8c2}" orientation="n" type="Generic"/>
     </description>
 </definition>

elements/10_electric/10_allpole/390_sensors&instruments/04_sensors_optical/cellule_photoelectrique_recepteur.elmt

@@ -1,33 +1,38 @@
-<definition width="70" version="0.3" hotspot_x="30" hotspot_y="30" height="60" type="element" orientation="dnny">
-<uuid uuid="{5CA82021-7F70-43B0-BE69-0E447B228B3A}"/><names>
-        <name lang="ar">خليّة كهرو ضوئية - لاقط</name>
-        <name lang="en">Photo-electric sensor receptor</name>
-        <name lang="de">Photozelle Empfänger 2-Leiter</name>
+<definition hotspot_x="17" link_type="simple" height="50" hotspot_y="25" type="element" version="0.90" width="50">
+    <uuid uuid="{830f55c1-6f2c-472f-a315-5dbc050883ed}"/>
+    <names>
         <name lang="fr">Cellule photo-électrique - Récepteur</name>
         <name lang="pl">Komórka fotoelektryczna - odbiornik</name>
-        <name lang="cs">Optická závora – přijímač</name>
         <name lang="es">Sensor foto-eléctrico receptor</name>
-        <name lang="it">Sensore foto-elettrico - Ricevitore</name>
+        <name lang="cs">Optická závora – přijímač</name>
         <name lang="nl">Fotocel Ontvanger</name>
+        <name lang="de">Photozelle Empfänger 2-Leiter</name>
+        <name lang="ar">خليّة كهرو ضوئية - لاقط</name>
+        <name lang="en">Photo-electric sensor receptor</name>
+        <name lang="it">Sensore foto-elettrico - Ricevitore</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="30" x="-15" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="0.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="13" y2="2" x2="8"/>
-        <line length1="1.5" length2="0.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="13" y2="-1" x2="8"/>
-        <text x="-10" y="-15.6667" size="4" text="BN"/>
-        <text x="-8" y="18.3333" size="4" text="BU"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" x1="30" y2="-4" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="3" y2="-8" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="0" y2="-10" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="4" x1="30" y2="4" x2="18"/>
-        <line 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="3" y2="5" x2="3"/>
-        <polygon x4="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-2" y2="-5" x2="8" y3="5" x3="3" y4="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="19" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-2" y2="5" x2="8"/>
-        <input x="-30" y="2.5" size="9" text="_" tagg="label"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <rect antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="20" x="-15" y="-10" ry="0" width="30"/>
+        <line antialias="true" y2="2" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="13" end2="triangle" y1="-1" x2="8" end1="none" length2="0.5"/>
+        <line antialias="true" y2="-1" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="13" end2="triangle" y1="-4" x2="8" end1="none" length2="0.5"/>
+        <text font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="BN" color="#000000" rotation="0" x="-10" y="-15.6667"/>
+        <text font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="BU" color="#000000" rotation="0" x="-8" y="18.3333"/>
+        <line antialias="false" y2="-4" length1="1.5" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="30" end2="triangle" y1="-4" x2="18" end1="none" length2="1.5"/>
+        <line antialias="false" y2="-8" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" end2="none" y1="-5" x2="3" end1="none" length2="1.5"/>
+        <line antialias="false" y2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" end2="none" y1="-19" x2="0" end1="none" length2="1.5"/>
+        <line antialias="false" y2="4" length1="1.5" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="30" end2="triangle" y1="4" x2="18" end1="none" length2="1.5"/>
+        <line antialias="false" y2="5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" end2="none" y1="8" x2="3" end1="none" length2="1.5"/>
+        <polygon antialias="true" y2="-5" y4="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" y3="5" x4="-2" y1="-5" x2="8" x3="3"/>
+        <line antialias="false" y2="19" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" end2="none" y1="10" x2="0" end1="none" length2="1.5"/>
+        <line antialias="false" y2="5" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" end2="none" y1="5" x2="8" end1="none" length2="1.5"/>
+        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{8392d7b5-c84f-474c-b526-50f9fd6fd1c4}" rotation="0" frame="false" Valignment="AlignTop" z="14" text_width="-1" x="-30" keep_visual_rotation="false" y="-9" text_from="ElementInfo" Halignment="AlignLeft">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal name="" uuid="{d3f5fc6e-f776-47ca-b785-53e385035fb4}" x="0" y="20" type="Generic" orientation="s"/>
+        <terminal name="" uuid="{bb0cce91-0c3f-4953-ac03-d81a7b20a078}" x="0" y="-20" type="Generic" orientation="n"/>
     </description>
 </definition>

elements/10_electric/10_allpole/390_sensors&instruments/04_sensors_optical/crepuscolar.elmt

@@ -1,51 +1,49 @@
-<definition width="60" height="60" hotspot_x="22" version="0.80" type="element" hotspot_y="35" link_type="simple">
-    <uuid uuid="{e7c496ba-a62b-4f5c-b6c3-86db410bf776}"/>
+<definition hotspot_y="35" type="element" height="60" hotspot_x="22" link_type="simple" width="60" version="0.90">
+    <uuid uuid="{e2ba97cf-996b-43c0-a434-7a1972539b91}"/>
     <names>
-        <name lang="fr">Relais crépusculaire</name>
-        <name lang="it">Relè crepuscolare</name>
+        <name lang="de">Dämmerungsschalter</name>
         <name lang="cs">Soumrakové relé</name>
+        <name lang="it">Relè crepuscolare</name>
+        <name lang="fr">Relais crépusculaire</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <dynamic_text x="-51" y="-15.8333" text_from="ElementInfo" Valignment="AlignTop" z="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{6c75da4f-d740-4374-90c8-e11bf3836108}" rotation="0" frame="false" Halignment="AlignLeft" text_width="-1">
+        <dynamic_text Valignment="AlignTop" keep_visual_rotation="true" rotation="0" text_from="ElementInfo" y="-15.8333" text_width="-1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{6c75da4f-d740-4374-90c8-e11bf3836108}" z="1" x="-51" Halignment="AlignLeft" frame="false">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <line end1="none" x1="-5" length1="1.5" antialias="false" y1="15" y2="17" length2="1.5" x2="-5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="12" antialias="true" y1="14" x3="3" closed="false" y3="16" y2="16" x2="7" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-5" length1="1.5" antialias="false" y1="11" y2="9" length2="1.5" x2="-5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="15" length1="1.5" antialias="false" y1="16" y2="16" length2="1.5" x2="13" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect x="-20" width="40" height="40" y="-20" antialias="false" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-3" length1="1.5" antialias="false" y1="13" y2="13" length2="1.5" x2="-1" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="5" y="9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" text="Lx>" color="#000000"/>
-        <line end1="none" x1="-7" length1="1.5" antialias="false" y1="13" y2="13" length2="1.5" x2="-9" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="11" antialias="true" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect x="25" width="8" height="4" y="-18" antialias="false" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-3" length1="1.5" antialias="false" y1="11" y2="10" length2="1.5" x2="-2" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="-16" y4="-4" antialias="false" y1="-10" x3="-4" closed="false" y3="-10" y2="-16" y5="-10" x2="-10" x4="-10" x5="-16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="20" length1="1.5" antialias="false" y1="-20" y2="20" length2="1.5" x2="-20" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-2" length1="1.5" antialias="false" y1="16" y2="15" length2="1.5" x2="-3" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-7" length1="1.5" antialias="false" y1="11" y2="10" length2="1.5" x2="-8" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="-8" length1="1.5" antialias="false" y1="16" y2="15" length2="1.5" x2="-7" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="26" y4="-15" antialias="false" y1="-17" x3="33" closed="false" y3="-17" y6="-16" y2="-17" y5="-15" y7="-16" x2="32" x4="33" x7="32" x5="25" x6="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="-10" y4="-4" antialias="false" y1="-16" x3="-12" closed="false" y3="-6" y6="-14" y2="-14" y5="-6" y7="-16" x2="-12" x4="-10" x7="-10" x5="-8" x6="-8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="21" length1="1.5" antialias="false" y1="-16" y2="-16" length2="1.5" x2="24" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="24" y="12" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" text="L1" color="#000000"/>
-        <text x="26" y="-4" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" text="L" color="#000000"/>
-        <text x="26" y="-20" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" text="N" color="#000000"/>
-        <rect x="25" width="8" height="4" y="-2" antialias="false" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect x="25" width="8" height="4" y="14" antialias="false" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="26" y4="17" antialias="false" y1="15" x3="33" closed="false" y3="15" y6="16" y2="15" y5="17" y7="16" x2="32" x4="33" x7="32" x5="25" x6="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="26" y4="1" antialias="false" y1="-1" x3="33" closed="false" y3="-1" y6="0" y2="-1" y5="1" y7="0" x2="32" x4="33" x7="32" x5="25" x6="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="21" length1="1.5" antialias="false" y1="16" y2="16" length2="1.5" x2="24" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end1="none" x1="21" length1="1.5" antialias="false" y1="0" y2="0" length2="1.5" x2="24" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text x="52" y="-3" text_from="UserText" Valignment="AlignTop" z="30" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{52be7143-81b5-45a0-b3c4-001ff3fc59b5}" rotation="0" frame="false" Halignment="AlignLeft" text_width="-1">
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17" length1="1.5" x1="-5" y1="15" length2="1.5" x2="-5" antialias="false"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y2="16" y3="16" x1="12" closed="false" y1="14" x2="7" antialias="true" x3="3"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9" length1="1.5" x1="-5" y1="11" length2="1.5" x2="-5" antialias="false"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="16" length1="1.5" x1="15" y1="16" length2="1.5" x2="13" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20" height="40" rx="0" x="-20" antialias="false" width="40" ry="0"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="13" length1="1.5" x1="-3" y1="13" length2="1.5" x2="-1" antialias="false"/>
+        <text text="Lx>" rotation="0" y="9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" x="5"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="13" length1="1.5" x1="-7" y1="13" length2="1.5" x2="-9" antialias="false"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" y="11" x="-7" antialias="true" diameter="4"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-18" height="4" rx="0" x="25" antialias="false" width="8" ry="0"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" length1="1.5" x1="-3" y1="11" length2="1.5" x2="-2" antialias="false"/>
+        <polygon y4="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" y3="-10" x4="-10" y5="-10" x1="-16" x5="-16" closed="false" y1="-10" x2="-10" antialias="false" x3="-4"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" length1="1.5" x1="20" y1="-20" length2="1.5" x2="-20" antialias="false"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" length1="1.5" x1="-2" y1="16" length2="1.5" x2="-3" antialias="false"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" length1="1.5" x1="-7" y1="11" length2="1.5" x2="-8" antialias="false"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" length1="1.5" x1="-8" y1="16" length2="1.5" x2="-7" antialias="false"/>
+        <polygon y4="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14" y3="-6" x4="-10" y5="-6" x1="-10" x5="-8" x7="-10" closed="false" y1="-16" x6="-8" y6="-14" y7="-16" x2="-12" antialias="false" x3="-12"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" length1="1.5" x1="21" y1="-16" length2="1.5" x2="24" antialias="false"/>
+        <text text="L1" rotation="0" y="12" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" x="24"/>
+        <text text="L" rotation="0" y="-4" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" x="26"/>
+        <text text="N" rotation="0" y="-20" font="Sans Serif,6,-1,5,50,0,0,0,0,0" color="#000000" x="26"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-2" height="4" rx="0" x="25" antialias="false" width="8" ry="0"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="14" height="4" rx="0" x="25" antialias="false" width="8" ry="0"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="16" length1="1.5" x1="21" y1="16" length2="1.5" x2="24" antialias="false"/>
+        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" length1="1.5" x1="21" y1="0" length2="1.5" x2="24" antialias="false"/>
+        <dynamic_text Valignment="AlignTop" keep_visual_rotation="true" rotation="0" text_from="UserText" y="-3" text_width="-1" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{52be7143-81b5-45a0-b3c4-001ff3fc59b5}" z="30" x="52" Halignment="AlignLeft" frame="false">
             <text>_</text>
         </dynamic_text>
-        <terminal x="33" name="" y="16" uuid="{18296c32-8291-41de-85ac-8ee71221d60e}" orientation="e"/>
-        <terminal x="33" name="" y="-16" uuid="{d3fb1f4c-3acb-4e24-89de-864cb3d8ce51}" orientation="e"/>
-        <terminal x="33" name="" y="0" uuid="{622be5b4-4bc6-447c-88f4-183b11f48438}" orientation="e"/>
+        <terminal y="-16" uuid="{d3fb1f4c-3acb-4e24-89de-864cb3d8ce51}" name="" type="Generic" x="33" orientation="e"/>
+        <terminal y="0" uuid="{622be5b4-4bc6-447c-88f4-183b11f48438}" name="" type="Generic" x="33" orientation="e"/>
+        <terminal y="16" uuid="{18296c32-8291-41de-85ac-8ee71221d60e}" name="" type="Generic" x="33" orientation="e"/>
     </description>
 </definition>

elements/10_electric/10_allpole/390_sensors&instruments/12_sensors_level/sonde_niveau.elmt

@@ -1,31 +1,39 @@
-<definition width="90" version="0.3" hotspot_x="20" hotspot_y="10" height="70" type="element">
-<uuid uuid="{7687BBA7-DCFA-4FCC-85A6-7850E264BD43}"/><names>
+<definition hotspot_x="25" link_type="simple" type="element" version="0.90" height="50" width="40" hotspot_y="24">
+    <uuid uuid="{432a77e8-0763-48b2-8efd-a00954940c5c}"/>
+    <names>
+        <name lang="pl">Czujnik poziomu cieczy</name>
+        <name lang="fr">Sonde de niveau</name>
+        <name lang="nl">vloeistofniveau sensor </name>
+        <name lang="en">Level sensor</name>
+        <name lang="es">Sensor de nivel</name>
         <name lang="ar">مجس مستوى</name>
         <name lang="de">Niveausensor 2-Leiter</name>
-        <name lang="en">Level sensor</name>
-        <name lang="it">Sensore di livello</name>
-        <name lang="fr">Sonde de niveau</name>
-        <name lang="pl">Czujnik poziomu cieczy</name>
-        <name lang="es">Sensor de nivel</name>
         <name lang="cs">Hladinový snímač</name>
-        <name lang="nl">vloeistofniveau sensor </name>
+        <name lang="it">Sensore di livello</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="20" y="35" size="8" rotate="true" text="Niveau&#xa;___"/>
-        <input x="23" y="12" size="14" rotate="true" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-4" y2="12" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-8" y2="16" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-10" y2="30" x2="-10"/>
-        <rect width="20" x="0" y="10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="10" y2="40" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="10" 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="26" x1="-8" y2="30" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-8" y2="28" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="-8" y2="24" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="-8" y2="20" x2="-2"/>
-        <terminal x="10" y="0" orientation="n"/>
-        <terminal x="10" y="40" orientation="s"/>
+        <dynamic_text frame="false" text_width="-1" z="1" Valignment="AlignTop" x="10" uuid="{6b3fdb08-01c3-455a-b269-834f18c5adca}" text_from="UserText" keep_visual_rotation="false" font="Sans Serif,8,-1,5,50,0,0,0,0,0" rotation="0" Halignment="AlignLeft" y="-3">
+            <text>Niveau
+___</text>
+        </dynamic_text>
+        <dynamic_text frame="false" text_width="-1" z="2" Valignment="AlignTop" x="13" uuid="{21d0aeca-2c01-4d53-9c0a-284c0a188abf}" text_from="ElementInfo" keep_visual_rotation="false" font="Sans Serif,14,-1,5,50,0,0,0,0,0" rotation="0" Halignment="AlignLeft" y="-23.5">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line x2="-12" y2="-8" y1="-10" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-14" length1="1.5" end2="none"/>
+        <line x2="-12" y2="-4" y1="-10" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-18" length1="1.5" end2="none"/>
+        <line x2="-20" y2="10" y1="-10" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-20" length1="1.5" end2="none"/>
+        <rect x="-10" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="false" y="-10" width="20" ry="0"/>
+        <line x2="0" y2="20" y1="10" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="0" length1="1.5" end2="none"/>
+        <line x2="0" y2="-10" y1="-20" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="0" length1="1.5" end2="none"/>
+        <line x2="-14" y2="10" y1="6" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-18" length1="1.5" end2="none"/>
+        <line x2="-12" y2="8" y1="2" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-18" length1="1.5" end2="none"/>
+        <line x2="-12" y2="4" y1="-2" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-18" length1="1.5" end2="none"/>
+        <line x2="-12" y2="0" y1="-6" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-18" length1="1.5" end2="none"/>
+        <terminal name="" x="0" uuid="{2342dca9-396d-4d09-a533-a8cf07f57eee}" type="Generic" orientation="n" y="-20"/>
+        <terminal name="" x="0" uuid="{49245402-cbca-4f73-9396-923acc84beb7}" type="Generic" orientation="s" y="20"/>
     </description>
 </definition>

elements/10_electric/10_allpole/390_sensors&instruments/14_sensors_humidity/humidite_relative_nf.elmt

@@ -1,29 +1,36 @@
-<definition width="50" version="0.4" hotspot_x="37" hotspot_y="25" height="50" link_type="simple" type="element">
-<uuid uuid="{C330CB17-919B-4262-A03F-13A857D90961}"/><names>
+<definition hotspot_x="37" type="element" width="50" version="0.90" height="50" link_type="simple" hotspot_y="24">
+    <uuid uuid="{e4b5947a-629f-4776-9338-d2aed41e0dc3}"/>
+    <names>
+        <name lang="es">Accionado por humedad relativa NC</name>
+        <name lang="cs">Spínač vlhkosti NC</name>
         <name lang="de">Feuchteschalter Öffner</name>
         <name lang="en">NC controlled relative humidity</name>
+        <name lang="nl">Relatieve Vochtigheid (NC)</name>
         <name lang="it">Controllato dall'umidità relativa NC</name>
         <name lang="fr">Actionné par humidité relative NF</name>
         <name lang="pl">Zestyk rozwierny sterowany poziomemi wilgotności względnej</name>
-        <name lang="es">Accionado por humedad relativa NC</name>
-        <name lang="nl">Relatieve Vochtigheid (NC)</name>
-        <name lang="cs">Spínač vlhkosti NC</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="22" x="-32" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-10" y="16" size="4" text="2" tagg="none"/>
-        <text x="-31" y="0" size="5" text="%H O"/>
-        <input x="-10" y="-16" size="4" text="1" tagg="none"/>
-        <text x="-24" y="2" size="3" text="2"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="6"/>
-        <circle x="-15" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0"/>
-        <input x="8" y="0.5" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="3"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <rect antialias="false" y="-7" width="22" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-32" ry="0" rx="0"/>
+        <dynamic_text rotation="0" text_from="UserText" keep_visual_rotation="false" y="8.5" z="2" Valignment="AlignTop" x="-10" uuid="{5f95b7b0-7771-4312-a802-a090371523a5}" Halignment="AlignLeft" frame="false" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_width="-1">
+            <text>2</text>
+        </dynamic_text>
+        <text rotation="0" y="0" color="#000000" text="% r.H." x="-31" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
+        <dynamic_text rotation="0" text_from="UserText" keep_visual_rotation="false" y="-23.5" z="4" Valignment="AlignTop" x="-10" uuid="{3c03b801-c793-47b2-aabd-a0b16e40154b}" Halignment="AlignLeft" frame="false" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_width="-1">
+            <text>1</text>
+        </dynamic_text>
+        <polygon antialias="true" x3="6" x1="0" closed="false" y3="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" y1="20" x2="0"/>
+        <circle diameter="2" antialias="true" y="3" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-15"/>
+        <dynamic_text rotation="0" text_from="ElementInfo" keep_visual_rotation="false" y="-11" z="10" Valignment="AlignTop" x="8" uuid="{225e9fa1-337e-409f-aafa-098ad7655449}" Halignment="AlignLeft" frame="false" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line antialias="false" end2="none" x1="-10" length1="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" y2="0" y1="0" x2="3" length2="1.5" end1="none"/>
+        <polygon antialias="false" x3="7" x1="0" closed="false" y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9" y1="-20" x2="0"/>
+        <terminal y="-20" type="Generic" x="0" name="" uuid="{e535c8ec-f595-474c-81ed-b76ba1605f7c}" orientation="n"/>
+        <terminal y="20" type="Generic" x="0" name="" uuid="{02cc6bf4-c015-4ad3-9985-b5fcacaa09d9}" orientation="s"/>
     </description>
 </definition>

elements/10_electric/10_allpole/390_sensors&instruments/14_sensors_humidity/humidite_relative_nf_no.elmt

@@ -1,32 +1,42 @@
-<definition width="50" version="0.4" hotspot_x="45" hotspot_y="25" height="50" link_type="simple" type="element">
-<uuid uuid="{AA25B7CF-ABF4-41DA-A5CD-492B67588B71}"/><names>
-        <name lang="de">Feuchteschalter Wechsler</name>
-        <name lang="en">NC/NO controlled relative humidity</name>
-        <name lang="it">Controllato dall'umidità relativa NC/NO</name>
+<definition width="60" hotspot_x="51" version="0.90" link_type="simple" type="element" height="50" hotspot_y="24">
+    <uuid uuid="{da1ff65b-f7d1-4b39-9618-1bda7f294402}"/>
+    <names>
         <name lang="fr">Actionné par humidité relative NF/NO</name>
-        <name lang="pl">Zestyk przełączny sterowany elektronicznie</name>
+        <name lang="it">Controllato dall'umidità relativa NC/NO</name>
+        <name lang="de">Feuchteschalter Wechsler</name>
+        <name lang="cs">Spínač vlhkosti NC/NO</name>
+        <name lang="en">NC/NO controlled relative humidity</name>
         <name lang="es">Accionado por humedad relativa NC/NO</name>
         <name lang="nl">Relatieve Vochtigheid (NC)/(NO)</name>
-        <name lang="cs">Spínač vlhkosti NC/NO</name>
+        <name lang="pl">Zestyk przełączny sterowany elektronicznie</name>
     </names>
+    <elementInformations/>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="22" x="-42" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-41" y="0" size="5" text="%H O"/>
-        <text x="-34" y="2" size="3" text="2"/>
-        <circle x="-25" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-20" y2="-9" x2="-7"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="-10"/>
-        <input x="-10" y="16" size="4" text="3" tagg="none"/>
-        <input x="-30" y="-16" size="4" text="1" tagg="none"/>
-        <input x="-10" y="-16" size="4" text="2" tagg="none"/>
-        <input x="1" y="0.5" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-20" y2="-9" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0"/>
-        <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="-20" y2="0" x2="-5"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="-20" y="-20" orientation="n"/>
+        <rect width="22" x="-45" y="-7" ry="0" height="14" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <text color="#000000" font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-44" y="0" text="% r.H." rotation="0"/>
+        <circle diameter="2" x="-28" y="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="true"/>
+        <line length1="1.5" end2="none" y2="-9" x1="-20" end1="none" y1="-9" x2="-14" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <polygon x3="-17" y2="10" x1="-10" y1="20" y3="-10" x2="-10" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
+        <dynamic_text Halignment="AlignLeft" frame="false" z="7" text_width="-1" uuid="{9747fd7c-95b1-42cd-bc10-bc83df548942}" font="Sans Serif,4,-1,5,25,0,0,0,0,0" x="-20" keep_visual_rotation="false" y="8.5" Valignment="AlignTop" text_from="UserText" rotation="0">
+            <text>3</text>
+        </dynamic_text>
+        <dynamic_text Halignment="AlignLeft" frame="false" z="8" text_width="-1" uuid="{9d6d51b1-d8f8-4544-905e-8e91d52dcbfa}" font="Sans Serif,4,-1,5,25,0,0,0,0,0" x="-30" keep_visual_rotation="false" y="-23.5" Valignment="AlignTop" text_from="UserText" rotation="0">
+            <text>1</text>
+        </dynamic_text>
+        <dynamic_text Halignment="AlignLeft" frame="false" z="9" text_width="-1" uuid="{b2e16c05-b7e3-42be-b878-ad8c23a419ac}" font="Sans Serif,4,-1,5,25,0,0,0,0,0" x="-10" keep_visual_rotation="false" y="-23.5" Valignment="AlignTop" text_from="UserText" rotation="0">
+            <text>2</text>
+        </dynamic_text>
+        <dynamic_text Halignment="AlignLeft" frame="false" z="10" text_width="-1" uuid="{0d2423af-fa1c-4252-bebf-84d23040d9ce}" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="1" keep_visual_rotation="false" y="-11" Valignment="AlignTop" text_from="ElementInfo" rotation="0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line length1="1.5" end2="none" y2="-9" x1="-20" end1="none" y1="-20" x2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <line length1="1.5" end2="none" y2="-10" x1="0" end1="none" y1="-20" x2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <line length1="1.5" end2="none" y2="0" x1="-23" end1="none" y1="0" x2="-14" length2="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <terminal name="" uuid="{52c1e639-f9d1-4668-932f-ed407c983bb6}" x="-10" y="20" orientation="s" type="Generic"/>
+        <terminal name="" uuid="{c2e5394d-2d8a-4e35-8d3f-1b9c1b6a2d5d}" x="0" y="-20" orientation="n" type="Generic"/>
+        <terminal name="" uuid="{021d023c-9082-40f5-8862-17f5cd23c9e5}" x="-20" y="-20" orientation="n" type="Generic"/>
     </description>
 </definition>

elements/10_electric/10_allpole/390_sensors&instruments/14_sensors_humidity/humidite_relative_no.elmt

@@ -1,27 +1,35 @@
-<definition width="40" version="0.4" hotspot_x="35" hotspot_y="25" height="50" link_type="simple" type="element">
-<uuid uuid="{AC85B079-3A8D-4D7A-A117-11923EB15FF3}"/><names>
+<definition height="50" version="0.90" hotspot_y="24" width="50" hotspot_x="41" type="element" link_type="simple">
+    <uuid uuid="{fec53881-20d3-41bb-acad-52532b7d0644}"/>
+    <names>
         <name lang="de">Feuchteschalter Schliesser</name>
-        <name lang="en">NO controlled relative humidity</name>
-        <name lang="it">Controllato dall'umidità relativa NO</name>
         <name lang="fr">Actionné par humidité relative NO</name>
-        <name lang="pl">Zestyk zwierny sterowany poziomemi wilgotności względnej</name>
-        <name lang="es">Accionado por humedad relativa NA</name>
+        <name lang="en">NO controlled relative humidity</name>
         <name lang="nl">Relatieve Vochtigheid (NO)</name>
+        <name lang="pl">Zestyk zwierny sterowany poziomemi wilgotności względnej</name>
         <name lang="cs">Spínač vlhkosti NO</name>
+        <name lang="it">Controllato dall'umidità relativa NO</name>
+        <name lang="es">Accionado por humedad relativa NA</name>
     </names>
+    <elementInformations/>
     <informations>License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="22" x="-32" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-10" y="16" size="4" text="4" tagg="none"/>
-        <input x="-10" y="-16" size="4" text="3" tagg="none"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-3"/>
-        <input x="1" y="0.5" size="9" text="_" tagg="label"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0"/>
-        <text x="-31" y="0" size="5" text="%H O"/>
-        <text x="-24" y="2" size="3" text="2"/>
-        <circle x="-15" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <rect y="-7" height="14" antialias="false" ry="0" width="22" x="-34" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <dynamic_text z="2" y="8.5" frame="false" text_width="-1" Halignment="AlignLeft" keep_visual_rotation="false" Valignment="AlignTop" rotation="0" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="UserText" uuid="{5e98218f-47ab-451f-b7c9-cbdf74701f55}" x="-10">
+            <text>4</text>
+        </dynamic_text>
+        <dynamic_text z="3" y="-23.5" frame="false" text_width="-1" Halignment="AlignLeft" keep_visual_rotation="false" Valignment="AlignTop" rotation="0" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="UserText" uuid="{fdc5c4f6-f938-42db-ba04-300cec50c91a}" x="-10">
+            <text>3</text>
+        </dynamic_text>
+        <line antialias="false" y2="0" length1="1.5" x1="-12" end2="none" x2="-3" length2="1.5" y1="0" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black"/>
+        <dynamic_text z="5" y="-11" frame="false" text_width="-1" Halignment="AlignLeft" keep_visual_rotation="false" Valignment="AlignTop" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo" uuid="{231fd876-19e3-45d2-a8f7-834314902384}" x="1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <polygon antialias="true" y2="10" x3="0" y3="20" x1="-5" x2="0" closed="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" y2="-10" length1="1.5" x1="0" end2="none" x2="0" length2="1.5" y1="-20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text y="0" color="#000000" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="-33" text="% r.H."/>
+        <circle diameter="2" y="3" antialias="true" x="-17" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <terminal y="20" orientation="s" name="" uuid="{ac82c996-75b1-4387-b5b5-bd9810848d17}" type="Generic" x="0"/>
+        <terminal y="-20" orientation="n" name="" uuid="{3178ef0d-3666-4647-9cc4-9ba53ad9b8ef}" type="Generic" x="0"/>
     </description>
 </definition>