Merge remote-tracking branch 'origin/master' into qt6_cmake_joshua

# Conflicts: # CMakeLists.txt
Merge pull request #470 from Kellermorph/makro-fix
2026-06-09 12:03:13 +02:00 · 2026-05-28 09:32:07 +02:00 · 2026-05-27 06:19:06 +02:00 · 2026-05-26 18:31:37 +02:00 · 2026-05-25 13:14:57 +02:00 · 2026-05-25 13:04:37 +02:00
112 changed files with 1932 additions and 1208 deletions
@@ -14,25 +14,30 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.

-include(cmake/hoto_update_cmake_message.cmake)
-
-cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5...4.2)

 project(qelectrotech
-        VERSION 0.100.1
-        DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
-        HOMEPAGE_URL "https://qelectrotech.org/"
-        LANGUAGES CXX)
+  VERSION 0.100.0
+  DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
+  HOMEPAGE_URL "https://qelectrotech.org/"
+  LANGUAGES CXX)

 include(cmake/copyright_message.cmake)

 set(QET_DIR ${PROJECT_SOURCE_DIR})
+include(cmake/qet_compilation_vars.cmake)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
+qt_standard_project_setup()

 # Add sub directories
-option(PACKAGE_TESTS "Build the tests" ON)
+option(PACKAGE_TESTS "Build the tests" NO)
 if(PACKAGE_TESTS)
-    message("Add sub directory tests")
-    add_subdirectory(tests)
+  message("Add sub directory tests")
+  add_subdirectory(tests)
 endif()

 include(cmake/paths_compilation_installation.cmake)
@@ -43,126 +48,98 @@ include(cmake/git_last_commit_sha.cmake)
 include(cmake/fetch_kdeaddons.cmake)
 include(cmake/fetch_singleapplication.cmake)
 include(cmake/fetch_pugixml.cmake)
-include(cmake/qet_compilation_vars.cmake)

 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
+
 set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-SET(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-find_package(
-    QT
-    NAMES
-    Qt5
-    COMPONENTS
-    ${QET_COMPONENTS}
-    REQUIRED
-)
-
-find_package(
-    Qt${QT_VERSION_MAJOR}
-    COMPONENTS
-    ${QET_COMPONENTS}
-    REQUIRED)
-
-find_package(SQLite3 REQUIRED)

 set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)

-qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
-set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
-qt5_add_translation(QM_FILES ${TS_FILES})
-
-# als laatse
 include(cmake/define_definitions.cmake)

-# On Windows, WIN32 sets /SUBSYSTEM:WINDOWS to suppress the console window.
-# Qt automatically links qtmain.lib which provides the WinMain entry point,
-# so no source code change is needed.
-if(WIN32)
-    add_executable(
-        ${PROJECT_NAME}
-        WIN32
-        ${QET_RES_FILES}
-        ${QET_SRC_FILES}
-        ${QM_FILES}
-        ${QET_DIR}/qelectrotech.qrc
-    )
+qt_add_executable(
+  ${PROJECT_NAME}
+  ${QET_RES_FILES}
+  ${QET_SRC_FILES}
+  ${QM_FILES}
+  ${QET_DIR}/qelectrotech.qrc
+  )
+
+if(QMFILES_AS_RESOURCE)
+  qt_add_translations(${PROJECT_NAME} TS_FILES ${TS_FILES} RESOURCE_PREFIX "/lang")
 else()
-    add_executable(
-        ${PROJECT_NAME}
-        ${QET_RES_FILES}
-        ${QET_SRC_FILES}
-        ${QM_FILES}
-        ${QET_DIR}/qelectrotech.qrc
-    )
+  qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+  set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
+  qt_add_translation(QM_FILES ${TS_FILES})
 endif()

+find_package(SQLite3 REQUIRED)
+
 target_link_libraries(
-    ${PROJECT_NAME}
-    PUBLIC
-    PRIVATE
-    pugixml::pugixml
-    SingleApplication::SingleApplication
-    SQLite::SQLite3
-    ${KF5_PRIVATE_LIBRARIES}
-    ${QET_PRIVATE_LIBRARIES}
-)
+  ${PROJECT_NAME}
+  PUBLIC
+  PRIVATE
+  pugixml::pugixml
+  SingleApplication::SingleApplication
+  SQLite::SQLite3
+  ${KF6_PRIVATE_LIBRARIES}
+  ${QET_PRIVATE_LIBRARIES}
+  )

 target_include_directories(
-    ${PROJECT_NAME}
-    PRIVATE
-    ${QET_DIR}/sources/titleblock
-    ${QET_DIR}/sources/ui
-    ${QET_DIR}/sources/qetgraphicsitem
-    ${QET_DIR}/sources/qetgraphicsitem/ViewItem
-    ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui
-    ${QET_DIR}/sources/richtext
-    ${QET_DIR}/sources/factory
-    ${QET_DIR}/sources/properties
-    ${QET_DIR}/sources/dvevent
-    ${QET_DIR}/sources/editor
-    ${QET_DIR}/sources/editor/esevent
-    ${QET_DIR}/sources/editor/graphicspart
-    ${QET_DIR}/sources/editor/ui
-    ${QET_DIR}/sources/editor/UndoCommand
-    ${QET_DIR}/sources/undocommand
-    ${QET_DIR}/sources/diagramevent
-    ${QET_DIR}/sources/ElementsCollection
-    ${QET_DIR}/sources/ElementsCollection/ui
-    ${QET_DIR}/sources/autoNum
-    ${QET_DIR}/sources/autoNum/ui
-    ${QET_DIR}/sources/ui/configpage
-    ${QET_DIR}/sources/SearchAndReplace
-    ${QET_DIR}/sources/SearchAndReplace/ui
-    ${QET_DIR}/sources/NameList
-    ${QET_DIR}/sources/NameList/ui
-    ${QET_DIR}/sources/utils
-    ${QET_DIR}/pugixml/src
-    ${QET_DIR}/sources/dataBase
-    ${QET_DIR}/sources/dataBase/ui
-    ${QET_DIR}/sources/factory/ui
-    ${QET_DIR}/sources/print
-)
+  ${PROJECT_NAME}
+  PRIVATE
+  ${QET_DIR}/sources/titleblock
+  ${QET_DIR}/sources/ui
+  ${QET_DIR}/sources/qetgraphicsitem
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem
+  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui
+  ${QET_DIR}/sources/richtext
+  ${QET_DIR}/sources/factory
+  ${QET_DIR}/sources/properties
+  ${QET_DIR}/sources/dvevent
+  ${QET_DIR}/sources/editor
+  ${QET_DIR}/sources/editor/esevent
+  ${QET_DIR}/sources/editor/graphicspart
+  ${QET_DIR}/sources/editor/ui
+  ${QET_DIR}/sources/editor/UndoCommand
+  ${QET_DIR}/sources/undocommand
+  ${QET_DIR}/sources/diagramevent
+  ${QET_DIR}/sources/ElementsCollection
+  ${QET_DIR}/sources/ElementsCollection/ui
+  ${QET_DIR}/sources/autoNum
+  ${QET_DIR}/sources/autoNum/ui
+  ${QET_DIR}/sources/ui/configpage
+  ${QET_DIR}/sources/SearchAndReplace
+  ${QET_DIR}/sources/SearchAndReplace/ui
+  ${QET_DIR}/sources/NameList
+  ${QET_DIR}/sources/NameList/ui
+  ${QET_DIR}/sources/utils
+  ${QET_DIR}/sources/dataBase
+  ${QET_DIR}/sources/dataBase/ui
+  ${QET_DIR}/sources/factory/ui
+  ${QET_DIR}/sources/print
+  ${QET_DIR}/sources/svg
+  )

 install(TARGETS ${PROJECT_NAME})
-
 if (NOT MINGW)
-    install(DIRECTORY ico/breeze-icons/16x16   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/22x22   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/32x32   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/48x48   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/64x64   DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
-    install(DIRECTORY elements    DESTINATION share/qelectrotech)
-    install(DIRECTORY examples    DESTINATION share/qelectrotech)
-    install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
-    install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
-    install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
-    install(FILES misc/qelectrotech.xml    DESTINATION share/mime/packages)
-    install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
-    install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+
+install(DIRECTORY ico/breeze-icons/16x16 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/22x22 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/32x32 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/48x48 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/64x64 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
+install(DIRECTORY elements DESTINATION share/qelectrotech)
+install(DIRECTORY examples DESTINATION share/qelectrotech)
+install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
+install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
+install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
+install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
+install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
+if(NOT QMFILES_AS_RESOURCE)
+  install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+endif()
 endif()
@@ -59,6 +59,9 @@ Here are the technical choices made for the software development:

 If you wish to be informed of the latest developments, browse the [archive](https://listengine.tuxfamily.org/lists.tuxfamily.org/qet/) of the project mailing list where all commits (changes) are registered. This archive is publicly available, you don't need any account to access it.

+### Build QElectroTech under Windows
+To build QElectroTech under microsoft Windows, please follow [these instructions (french)](md/fr/fr_window_build_summary.md)
+

 # Features

@@ -62,10 +62,15 @@ message("PROJECT_SOURCE_DIR        :" ${PROJECT_SOURCE_DIR})
 message("QET_DIR                   :" ${QET_DIR})
 message("GIT_COMMIT_SHA            :" ${GIT_COMMIT_SHA})

-if(BUILD_WITH_KF5)
-  message("KF5_GIT_TAG               :" ${KF5_GIT_TAG})
-else()
-  add_definitions(-DBUILD_WITHOUT_KF5)
+if(BUILD_WITH_KF6 AND BUILD_KF6)
+  message("KF6_GIT_TAG               :" ${KF6_GIT_TAG})
+endif()
+if(NOT BUILD_WITH_KF6)
+  add_definitions(-DBUILD_WITHOUT_KF6)
 endif()
 message("QET_COMPONENTS            :" ${QET_COMPONENTS})
-message("QT_VERSION_MAJOR          :" ${QT_VERSION_MAJOR})
+message("Qt version                :" ${Qt6_VERSION})
+
+if(QMFILES_AS_RESOURCE)
+  add_definitions(-DQMFILES_AS_RESOURCE)
+endif()
@@ -31,5 +31,8 @@ add_definitions(-DQT_MESSAGELOGCONTEXT)
 # In order to do so, uncomment the following line.
 #add_definitions(-DTODO_LIST)

-# Build with KF5
-option(BUILD_WITH_KF5 "Build with KF5" ON)
+# Build with KF6
+option(BUILD_WITH_KF6 "Build with KF6" ON)
+
+# Use translations as a Qt resource
+option(QMFILES_AS_RESOURCE "Use .qm files as Qt resource" ON)
@@ -1,4 +1,4 @@
-# Copyright 2006 The QElectroTech Team
+# Copyright 2006-2026 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -14,54 +14,42 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.

-message(" - fetch_kdeaddons")
+option(BUILD_KF6 "Build KF6 libraries, use system ones otherwise" OFF)
+if(BUILD_KF6)
+  block(PROPAGATE KF6_GIT_TAG)
+    message(STATUS " - fetch_kdeaddons")
+    set(KDE_SKIP_TEST_SETTINGS ON)
+    set(KCOREADDONS_USE_QML OFF)
+    set(KWIDGETSADDONS_USE_QML OFF)
+    set(BUILD_TESTING OFF)
+    set(BUILD_DESIGNERPLUGIN OFF)
+    set(BUILD_QCH OFF)
+    set(BUILD_SHARED_LIBS OFF)

-if(DEFINED BUILD_WITH_KF5)
-  Include(FetchContent)
+    Include(FetchContent)

-  option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES)
-
-  if(BUILD_KF5)
-
-    if(NOT DEFINED KF5_GIT_TAG)
-      #https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
-      set(KF5_GIT_TAG v5.77.0)
+    if(NOT DEFINED KF6_GIT_TAG)
+      set(KF6_GIT_TAG v6.22.0)
    endif()

-    # Fix stop the run autotests of kcoreaddons
-    # see
-    # https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98
-    # issue:
-    # CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
-    # Cannot find source file:
-    # see
-    # https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
-    set(KDE_SKIP_TEST_SETTINGS "TRUE")
-    set(BUILD_TESTING "0")
-    FetchContent_Declare(
-      ecm
-      GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
-      GIT_TAG        ${KF5_GIT_TAG})
-    FetchContent_MakeAvailable(ecm)
-
    FetchContent_Declare(
      kcoreaddons
      GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
-      GIT_TAG        ${KF5_GIT_TAG})
+      GIT_TAG        ${KF6_GIT_TAG})
    FetchContent_MakeAvailable(kcoreaddons)

    FetchContent_Declare(
      kwidgetsaddons
      GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
-      GIT_TAG        ${KF5_GIT_TAG})
+      GIT_TAG        ${KF6_GIT_TAG})
    FetchContent_MakeAvailable(kwidgetsaddons)
-  else()
-    find_package(KF5CoreAddons REQUIRED)
-    find_package(KF5WidgetsAddons REQUIRED)
-  endif()
-
-  set(KF5_PRIVATE_LIBRARIES
-    KF5::WidgetsAddons
-    KF5::CoreAddons
-    )
+  endblock()
+else()
+  find_package(KF6CoreAddons REQUIRED)
+  find_package(KF6WidgetsAddons REQUIRED)
 endif()
+
+set(KF6_PRIVATE_LIBRARIES
+  KF6::CoreAddons
+  KF6::WidgetsAddons
+)
@@ -1,4 +1,4 @@
-# Copyright 2006 The QElectroTech Team
+# Copyright 2006-2026 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -14,18 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.

-message(" - fetch_pugixml")
-
-Include(FetchContent)
-
-option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
-
+option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" OFF)
 if(BUILD_PUGIXML)
-
+  Include(FetchContent)
+  message(" - fetch pugixml")
  FetchContent_Declare(
    pugixml
    GIT_REPOSITORY https://github.com/zeux/pugixml.git
-    GIT_TAG        v1.11.4)
+    GIT_TAG        v1.15)

  FetchContent_MakeAvailable(pugixml)
 else()
@@ -1,4 +1,4 @@
-# Copyright 2006 The QElectroTech Team
+# Copyright 2006-2026 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -16,9 +16,6 @@

 message(" - fetch_singleapplication")

-# https://github.com/itay-grudev/SingleApplication/issues/18
-#qmake
-#DEFINES += QAPPLICATION_CLASS=QGuiApplication
 set(QAPPLICATION_CLASS QApplication)

 Include(FetchContent)
@@ -26,6 +23,6 @@ Include(FetchContent)
 FetchContent_Declare(
  SingleApplication
  GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
-  GIT_TAG        v3.2.0)
+  GIT_TAG        v3.5.4)

 FetchContent_MakeAvailable(SingleApplication)
@@ -1,25 +0,0 @@
-# Copyright 2006 The QElectroTech Team
-# This file is part of QElectroTech.
-#
-# QElectroTech is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# QElectroTech is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-
-if(${CMAKE_VERSION} VERSION_LESS 3.14)
-  message(
-    "_____________________________________________________________________")
-  message("to update Cmake on linux:")
-  message("https://github.com/Kitware/CMake/")
-  message("linux => cmake-3.19.1-Linux-x86_64.sh")
-  message("         sudo ./cmake.sh --prefix=/usr/local/ --exclude-subdir")
-  message("windows good luck :)")
-endif()
@@ -17,6 +17,8 @@
 message(" - qet_compilation_vars")

 set(QET_COMPONENTS
+  Core
+  Gui
  LinguistTools
  PrintSupport
  Xml
@@ -110,6 +112,12 @@ set(QET_SRC_FILES
  ${QET_DIR}/sources/borderproperties.h
  ${QET_DIR}/sources/bordertitleblock.cpp
  ${QET_DIR}/sources/bordertitleblock.h
+  # ${QET_DIR}/sources/colorbutton.cpp
+  # ${QET_DIR}/sources/colorbutton.h
+  # ${QET_DIR}/sources/colorcombobox.cpp
+  # ${QET_DIR}/sources/colorcombobox.h
+  # ${QET_DIR}/sources/colorcomboboxdelegate.cpp
+  # ${QET_DIR}/sources/colorcomboboxdelegate.h
  ${QET_DIR}/sources/conductorautonumerotation.cpp
  ${QET_DIR}/sources/conductorautonumerotation.h
  ${QET_DIR}/sources/conductornumexport.cpp
@@ -418,10 +426,6 @@ set(QET_SRC_FILES
  ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp
  ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h

-  ${QET_DIR}/pugixml/src/pugiconfig.hpp
-  ${QET_DIR}/pugixml/src/pugixml.cpp
-  ${QET_DIR}/pugixml/src/pugixml.hpp
-
  ${QET_DIR}/sources/qetgraphicsitem/conductor.cpp
  ${QET_DIR}/sources/qetgraphicsitem/conductor.h
  ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp
@@ -500,6 +504,9 @@ set(QET_SRC_FILES
  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
  ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.h

+  ${QET_DIR}/sources/svg/qetsvg.cpp
+  ${QET_DIR}/sources/svg/qetsvg.h
+
  ${QET_DIR}/sources/titleblock/dimension.cpp
  ${QET_DIR}/sources/titleblock/dimension.h
  ${QET_DIR}/sources/titleblock/dimensionwidget.cpp
@@ -713,6 +720,8 @@ set(QET_SRC_FILES

  ${QET_DIR}/sources/xml/terminalstripitemxml.cpp
  ${QET_DIR}/sources/xml/terminalstripitemxml.h
+  ${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.cpp
+  ${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.h
  )

 set(TS_FILES
@@ -733,19 +742,17 @@ set(TS_FILES
  ${QET_DIR}/lang/qet_mn.ts
  ${QET_DIR}/lang/qet_nb.ts
  ${QET_DIR}/lang/qet_nl.ts
-  ${QET_DIR}/lang/qet_nl_BE.ts  
+  ${QET_DIR}/lang/qet_nl_BE.ts
  ${QET_DIR}/lang/qet_no.ts
  ${QET_DIR}/lang/qet_pl.ts
  ${QET_DIR}/lang/qet_pt.ts
  ${QET_DIR}/lang/qet_pt_BR.ts
  ${QET_DIR}/lang/qet_ro.ts
-  ${QET_DIR}/lang/qet_rs.ts  
  ${QET_DIR}/lang/qet_ru.ts
  ${QET_DIR}/lang/qet_sk.ts
  ${QET_DIR}/lang/qet_sl.ts
  ${QET_DIR}/lang/qet_sr.ts
  ${QET_DIR}/lang/qet_sv.ts
  ${QET_DIR}/lang/qet_tr.ts
-  ${QET_DIR}/lang/qet_uk.ts
  ${QET_DIR}/lang/qet_zh.ts
  )
@@ -12938,22 +12938,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>تعديل إتجاه نقطة توصيل</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>تحريك نقطة توصيل</translation>
    </message>
@@ -14435,41 +14450,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>عر&amp;ض بالتقاطع</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>عرض بالصليب</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>علامة المراجع المتقاطعة</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>قائد</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>مُنقاد</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14486,27 +14506,27 @@ Longueur maximale : %2px
 %LM لم: الموقع</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>خيارالعرضبالصليب</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>عرض ملامسات القدرة في الصليب</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>بادئة مُلامسات القدرة :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>بادئة المُلامسات المُؤقتة :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>بادئة المُلامسات العاكسة :</translation>
    </message>
@@ -12971,22 +12971,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Bloc de borns exterior</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Modifica l&apos;orientació d&apos;un born</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Modifica el nom del born</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Modifica el tipus d&apos;un born</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Moure un born</translation>
    </message>
@@ -14476,41 +14491,46 @@ Longitud màxima : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>&amp;Mostra en contactes</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Mostra en creu</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Etiqueta de referència creuada</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Mestre</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Esclau</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14527,27 +14547,27 @@ Longitud màxima : %2px
 %LM : Ubicació </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Opció de visualització en creu</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Mostra els contactes de potència a la creu</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefix dels contactes de potència:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefix dels contactes temporitzats :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefix dels contactes inversors :</translation>
    </message>
@@ -12960,12 +12960,12 @@ Ostatní pole se nepoužívají.</translation>
        <translation>Západ</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Upravit natočení svorky</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Přesunout svorku</translation>
    </message>
@@ -12985,12 +12985,27 @@ Ostatní pole se nepoužívají.</translation>
        <translation>Vnější svorkovnice</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Změnit název svorky</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Změnit typ svorky</translation>
    </message>
@@ -14474,41 +14489,46 @@ Největší délka: %2px</translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>&amp;Zobrazit kontakty</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Zobrazit křížek</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Štítek křížových odkazů</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Nadřízený</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Podřízený</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14525,27 +14545,27 @@ Největší délka: %2px</translation>
 %LM: umístění</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Volba pro zobrazení křížku</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Zobrazit výkonové kontakty v křížku</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Předpona výkonových kontaktů:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Předpona zpožděných kontaktů:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Předpona přepínacích kontaktů:</translation>
    </message>
@@ -12921,12 +12921,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Venstre</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Ændre retning på terminal</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Flyt terminal</translation>
    </message>
@@ -12946,12 +12946,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Ekstern terminal</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Ændre terminalrække navn</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Ændre terminal type</translation>
    </message>
@@ -14436,41 +14451,46 @@ Maksimum længde: %2piksel
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Vis kontakte&amp;r</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Vis kors</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Referencekors etiket</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Overordnet</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Underordnet</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14487,27 +14507,27 @@ Maksimum længde: %2piksel
 %LM: placering </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Vis kors indstillinger</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Vis hovedkontakter i kors</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Præfiks hovedkontakter:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Præfiks tidskontakter:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Præfiks skiftekontakter:</translation>
    </message>
@@ -12952,12 +12952,12 @@ Andere Felder werden nicht verwendet.</translation>
        <translation>West</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Orientierung eines Anschlusses ändern</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Anschluss verschieben</translation>
    </message>
@@ -12977,12 +12977,27 @@ Andere Felder werden nicht verwendet.</translation>
        <translation>externer Kontakt</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Name des Anschlusses ändern</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Typ des Anschlusses ändern</translation>
    </message>
@@ -14467,41 +14482,46 @@ Maximale Länge: %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>als &amp;Kontakte anzeigen</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>als Tabelle anzeigen</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Querverweistexte</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Master</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Slave</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14518,27 +14538,27 @@ Maximale Länge: %2px
 %LM: Ort </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Optionen für die Darstellung als Tabelle</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Leistungskontakte anzeigen</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Präfix für Leistungskontakte:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Präfix für zeitverzögerte Kontakte:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Präfix für Wechslerkontakte:</translation>
    </message>
@@ -12910,12 +12910,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Δύση</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Επεξεργασία του προσανατολισμού ενός ακροδέκτη</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Μετακίνηση ενός ακροδέκτη</translation>
    </message>
@@ -12935,12 +12935,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Εξωτερική ομαδα ακροδεκτών</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Επεξεργασία ονόματος τερματικού</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Επεξεργασία του τύπου ενός ακροδέκτη</translation>
    </message>
@@ -14424,41 +14439,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Εμφάνιση επαφών</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Προβολή σε σταυρό</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Ετικέτα διασταυρούμενων αναφορών</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Κύριο</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Βοηθητικό</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14475,27 +14495,27 @@ Longueur maximale : %2px
 % LM: Τοποθεσία </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Επιλογές εμφάνισης στο σταυρό</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Εμφάνιση των επαφών ισχύος στο σταυρό</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Πρόθεμα των επαφών ισχύος:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Πρόθεμα των επαφών χρονικού:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Πρόθεμα των επαφών διακόπτη:</translation>
    </message>
@@ -12944,12 +12944,12 @@ The other fields are not used.</translation>
        <translation>West</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Change the orientation of a terminal</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Move a terminal</translation>
    </message>
@@ -12969,12 +12969,27 @@ The other fields are not used.</translation>
        <translation>External terminal block</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation>Common (contact SW)</translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Change the terminal name</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Change the type of a terminal</translation>
    </message>
@@ -14458,41 +14473,46 @@ Maximum length : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation>Display terminal numbers in Xrefs</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>&amp;View contacts</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>View cross</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Label cross reference</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Master</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Slave</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14509,27 +14529,27 @@ Maximum length : %2px
 % LM: Location </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Option display cross</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Show the power contacts in the cross</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefix of power contacts :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefix delayed contacts :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefix changeover contacts :</translation>
    </message>
@@ -12948,22 +12948,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Editar la orientación de una terminal</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translatorcomment>Mover un borne</translatorcomment>
        <translation>Mover un borne</translation>
@@ -14451,41 +14466,46 @@ Ancho máximo : %2xp
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Mostra&amp;r contactos</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Mostrar en cruz</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Etiqueta de referencia cruzada</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Maestro</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Esclavo</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14502,27 +14522,27 @@ Ancho máximo : %2xp
 %LM: Ubicación </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Opción de presentación en cruz</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Mostrar los contactos de potencia en la cruz</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefijo de los contactos de potencia:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefijo de contactos temporizados:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefijo de contactos inversores:</translation>
    </message>
@@ -12823,12 +12823,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation></translation>
    </message>
@@ -12848,12 +12848,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation></translation>
    </message>
@@ -14329,41 +14344,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14374,27 +14394,27 @@ Longueur maximale : %2px
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation></translation>
    </message>
@@ -12847,22 +12847,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14338,41 +14353,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14383,27 +14403,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation type="unfinished"></translation>
    </message>
@@ -12912,12 +12912,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Nyugat</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>A csatlakozó tájolásának megváltoztatása</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Csatlakozó mozgatása</translation>
    </message>
@@ -12937,12 +12937,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Külső sorkapocs</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Csatlakozó név változtatása</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>A csatlakozó típusának megváltoztatása</translation>
    </message>
@@ -14426,41 +14441,46 @@ Maximális hossz : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>&amp;Kapcsolatok megtekintése</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Kereszthivatkozások megtekintése</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Kereszthivatkozás címkéje</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Mester</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Alárendelt</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14477,27 +14497,27 @@ Maximális hossz : %2px
 %LM: Elhelyezkedés </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Kereszthivatkozás megjelenítésének lehetősége</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>A főáramköri érintkezők mutatása a kereszthivatkozásban</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>A főáramköri érintkezők előtagja :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>A késleltetett érintkezők előtagja :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translatorcomment>váltó vagy morze érintkező</translatorcomment>
        <translation>A váltóérintkezők előtagja :</translation>
@@ -12921,22 +12921,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Modifica l&apos;orientamento di un terminale</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Cambia il nome del terminale</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Sposta un terminale</translation>
    </message>
@@ -14387,7 +14402,7 @@ Lunghezza massima : %2px</translation>
        <translation>Sinistra</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefisso dei contatti temporizzati:</translation>
    </message>
@@ -14432,7 +14447,7 @@ Lunghezza massima : %2px</translation>
        <translation>Offset verticale XRef:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14449,7 +14464,7 @@ Lunghezza massima : %2px</translation>
 % LM: posizione</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Maestro</translation>
    </message>
@@ -14464,7 +14479,12 @@ Lunghezza massima : %2px</translation>
        <translation>10px corrisponde a 1 passo di movimentot</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Etichetta di riferimento incrociato</translation>
    </message>
@@ -14474,17 +14494,17 @@ Lunghezza massima : %2px</translation>
        <translation>Organo di protezione</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Opzione di visualizzazione incrociata</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefisso del contatto di alimentazione :</translation>
    </message>
@@ -14494,7 +14514,7 @@ Lunghezza massima : %2px</translation>
        <translation>Posizione XRef dello slave</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Mostra croce</translation>
    </message>
@@ -14509,7 +14529,7 @@ Lunghezza massima : %2px</translation>
        <translation>In fondo alla pagina</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
@@ -14519,7 +14539,7 @@ Lunghezza massima : %2px</translation>
        <translation>Default - Adatta all&apos;altezza XRef</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Schiavo</translation>
    </message>
@@ -14529,17 +14549,17 @@ Lunghezza massima : %2px</translation>
        <translation>Sotto l&apos;etichetta dell&apos;elemento</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Mostra i contatti di potenza nella croce</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Visualizza&amp;re come contatti</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefisso contatto in scambio :</translation>
    </message>
@@ -12898,12 +12898,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>西</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>端子の向きを変更</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>端子を移動</translation>
    </message>
@@ -12923,12 +12923,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14413,41 +14428,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>接点を表示 (&amp;V)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>相互参照を表示</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>相互参照のラベル</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>親</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>子</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14464,27 +14484,27 @@ Longueur maximale : %2px
 % LM: 場所 </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>相互参照の表示オプション</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>相互参照に動力接点を表示</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>動力接点の接頭辞 :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>限時接点の接頭辞 :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>切替接点 (c接点) の接頭辞 :</translation>
    </message>
@@ -12800,12 +12800,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>서</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>단자 방향 변경</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>단자 이동</translation>
    </message>
@@ -12825,12 +12825,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>외부 단자대</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>단자 이름 변경</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>단자 유형 변경</translation>
    </message>
@@ -14307,41 +14322,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>접점으로 보&amp;기</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>십자형으로 보기</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>교차 참조 라벨</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>마스터</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>슬레이브</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14352,27 +14372,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>십자형 표시 옵션</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>십자형에 전력 접점 표시</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>전력 접점 접두어 :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>지연 접점 접두어 :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>전환 접점 접두어 :</translation>
    </message>
@@ -12880,22 +12880,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Холболтын чигийг өөрчлөх</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Холболтыг зөөх</translation>
    </message>
@@ -14379,41 +14394,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Эзэн</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Боол</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14424,27 +14444,27 @@ Longueur maximale : %2px
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation></translation>
    </message>
@@ -12894,12 +12894,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Vest</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Endre retning av en tilkoblingspunkt</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Flytt/Skyv en tilkoblingspunkt</translation>
    </message>
@@ -12919,12 +12919,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14406,41 +14421,46 @@ Største lengde: %2px</translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Vis som &amp;kontakt</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Vis som tabell</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Kryssreferansetekster</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Master</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Slave</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14457,27 +14477,27 @@ Største lengde: %2px</translation>
 %LM: plassering/lokasjon</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Opsjoner ved visning som tabell</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Vis lastkontakter</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefiks for lastkontakter:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefiks for tidsforsinkede kontakter:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefiks for vekslerkontakter:</translation>
    </message>
@@ -12972,22 +12972,37 @@ De overige velden worden niet gebruikt.</translation>
        <translation>Externe klem</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Verander de orientatie van een klem</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Wijzig het type klem</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Verplaats een klem</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Verander de naam van de klem</translation>
    </message>
@@ -14472,41 +14487,46 @@ Maximale lengte : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Wee&amp;rgeven in contacten</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Weergeven in kruisverwijzing</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Weergave kruisverwijzing</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Master</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Slave</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14523,27 +14543,27 @@ Maximale lengte : %2px
 % LM: Location</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Eigenschappen kruisverwijzing</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Tonen de vermogen contacten in het kruis</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Voorvoegsel voor vermogen contact :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Voorvoegsel voor tijdsghestuurd contact :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Voorvoegsel voor omkeer contact :</translation>
    </message>
@@ -12847,22 +12847,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14308,41 +14323,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14353,27 +14373,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation type="unfinished"></translation>
    </message>
@@ -13028,12 +13028,12 @@ Pozostałe pola nie są używane.</translation>
        <translation>Zachód</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Zmiana orientacji terminala</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Przesunięcie zacisku</translation>
    </message>
@@ -13053,12 +13053,27 @@ Pozostałe pola nie są używane.</translation>
        <translation>Listwa zaciskowa zewnętrzna</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Zmień nazwę terminala</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Zmiana typu zacisku</translation>
    </message>
@@ -14548,41 +14563,46 @@ Długość maksymalna: %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Pokaż ze&amp;styki</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Pokaż krzyż</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Etykieta oznaczenia referencyjnego</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Nadrzędny</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Podrzędny</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14599,27 +14619,27 @@ Długość maksymalna: %2px
 %LM: lokalizacja </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Opcje wyświetlania krzyża</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Pokaż zestyki i krzyż</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefiks dla zestyków obwodów głównych:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefiks dla zestyków działających z opóźnieniem:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefiks dla zestyków przełącznych:</translation>
    </message>
@@ -12928,22 +12928,37 @@ form
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14437,41 +14452,46 @@ form
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14482,27 +14502,27 @@ form
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation type="unfinished"></translation>
    </message>
@@ -12947,12 +12947,12 @@ Os outros campos não são usados.</translation>
        <translation>Oeste</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Editar a orientação de um terminal</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Mover um terminal</translation>
    </message>
@@ -12972,12 +12972,27 @@ Os outros campos não são usados.</translation>
        <translation>Bloco de terminais externo</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Mudar o nome do terminal</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Mudar o tipo de terminal</translation>
    </message>
@@ -14463,41 +14478,46 @@ Comprimento máximo: %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Exibi&amp;r em contatos</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Exibir em cruz</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Legenda das referências cruzadas</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Mestre</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Escravo</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14514,27 +14534,27 @@ Comprimento máximo: %2px
 %LM: Localização </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Opção de visualização em cruz</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Exibir os contatos de potência na cruz</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefixo dos contatos de potência:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefixo dos contatos temporizados:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefixo dos contatos reversores:</translation>
    </message>
@@ -12854,22 +12854,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14346,41 +14361,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Vizualizare încrucișată</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished">Sclav</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14391,27 +14411,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Opțiuni afișare încrucișată</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Afișează contactele de putere în cruce</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefix contacte de putere :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefix contacte temporizate :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefix contacte inversoare :</translation>
    </message>
@@ -12864,22 +12864,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14325,41 +14340,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14370,27 +14390,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation type="unfinished"></translation>
    </message>
@@ -12988,22 +12988,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Внешняя клеммная колодка</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Переместить вывод</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Изменить ориентацию вывода</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Изменить имя вывода</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Изменить ориентацию вывода</translation>
    </message>
@@ -14487,41 +14502,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>По&amp;казывать контакты</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Показывать перекрестие</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Метка перекрестной ссылки</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Главный</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Подчинённый</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14538,27 +14558,27 @@ Longueur maximale : %2px
 % LM: расположение </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Настройки отображения перекрестия</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Показывать силовые контакты на перекрестии</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Префикс силовых контактов:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Префикс контактов с задержкой:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Префикс контактов переключения:</translation>
    </message>
@@ -12819,12 +12819,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -12844,12 +12844,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14325,41 +14340,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14370,27 +14390,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation type="unfinished"></translation>
    </message>
@@ -12881,22 +12881,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14342,41 +14357,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14387,27 +14407,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation type="unfinished"></translation>
    </message>
@@ -12864,22 +12864,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished"></translation>
    </message>
@@ -14325,41 +14340,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
-        <source>Affiche&amp;r en contacts</source>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <source>Affiche&amp;r en contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14370,27 +14390,27 @@ Longueur maximale : %2px
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation type="unfinished"></translation>
    </message>
@@ -12989,22 +12989,37 @@ De andra fälten används inte.</translation>
        <translation>Extern anslutning</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Flytta en anslutning</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Ändra orientering på en anslutning</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Ändra namn på en anslutning</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Ändra typ på en anslutning</translation>
    </message>
@@ -14459,41 +14474,46 @@ Maximal längd: %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>&amp;Visa kontakter</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Visa kors</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Etikett för korsreferenser</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Huvudfunktion:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Slavfunktion:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14510,27 +14530,27 @@ Maximal längd: %2px
 %LM: Placering (+) </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Alternativ för korsvisning</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Visa kraftkontakterna i korset</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Prefix för kraftkontakter:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Prefix för tidsinställda kontakter:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Prefix för växlande kontakter:</translation>
    </message>
@@ -12972,12 +12972,12 @@ Diğer alanlar kullanılmaz.</translation>
        <translation>Batı</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Bir terminalin yönünü değiştirin</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Bir terminali taşıyın</translation>
    </message>
@@ -12997,12 +12997,27 @@ Diğer alanlar kullanılmaz.</translation>
        <translation type="unfinished">Dış klemens bloğu</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation type="unfinished">Klemens adını değiştir</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation type="unfinished">Bir klemensin tipini değiştir</translation>
    </message>
@@ -14488,41 +14503,46 @@ Maksimum uzunluk :%2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>Kontakla&amp;rı görüntüle</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Çapraz görüntüle</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Çapraz referans etiketi</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Master</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Bağımlı</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14539,27 +14559,27 @@ Maksimum uzunluk :%2px
 %LM : Konum </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Çapraz ekran seçeneği</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Güç kontaklarını çapraz göster</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Güç kontaklarının ön eki:</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Zamanlı kontakların öneki :</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>İnvertör kontaklarının öneki :</translation>
    </message>
@@ -12990,22 +12990,37 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>Зовнішня клемна колодка</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>Перемістити вивід</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>Змінити орієнтацію вивода</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>Змінити ім&apos;я вивода</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>Змінити орієнтацію вивода</translation>
    </message>
@@ -14458,41 +14473,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>По&amp;казати контакти</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>Показати перехрестя</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>Мітка перехресного посилання</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>Головний</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>Пілпорядкований</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14509,27 +14529,27 @@ Longueur maximale : %2px
 % LM: розташування </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>Налаштування вd&apos;ідображення перехрестя</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>Показати силові контакти на перехресті</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>Префікс силових контактів: </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>Префікс контактів з затримкою: </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>Префікс контактів перемикання: </translation>
    </message>
@@ -12906,12 +12906,12 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>西</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="165"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="168"/>
        <source>Modifier l&apos;orientation d&apos;une borne</source>
        <translation>更改端子的方向</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="143"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="146"/>
        <source>Déplacer une borne</source>
        <translation>移动端子</translation>
    </message>
@@ -12931,12 +12931,27 @@ Les autres champs ne sont pas utilisés.</source>
        <translation>外部端子</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="187"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="125"/>
+        <source>NO (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="126"/>
+        <source>NC (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="127"/>
+        <source>Commun (contact SW)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="190"/>
        <source>Modifier le nom du terminal</source>
        <translation>更改端子名称</translation>
    </message>
    <message>
-        <location filename="../sources/editor/ui/terminaleditor.cpp" line="206"/>
+        <location filename="../sources/editor/ui/terminaleditor.cpp" line="209"/>
        <source>Modifier le type d&apos;une borne</source>
        <translation>修改端子类型</translation>
    </message>
@@ -14421,41 +14436,46 @@ Longueur maximale : %2px
    </message>
    <message>
        <location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
+        <source>Afficher les numéros de bornes dans les Xrefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
        <source>Affiche&amp;r en contacts</source>
        <translation>在联系人中显示(&amp;R)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="128"/>
        <source>Afficher en croix</source>
        <translation>显示十字</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="141"/>
        <source>Label des références croisées</source>
        <translation>交叉引用标签</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="154"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="161"/>
        <source>Maitre</source>
        <translation>掌握</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="164"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="171"/>
        <source>%f-%l%c</source>
        <translation>%f-%l%c</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="187"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="194"/>
        <source>Esclave</source>
        <translation>从属</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="197"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="204"/>
        <source>(%f-%l%c)</source>
        <translation>(%f-%l%c)</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="206"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="213"/>
        <source>Créer votre propre texte en vous aidant des variables suivantes :
 %f : le numéro de folio 
 %F: le label de folio
@@ -14472,27 +14492,27 @@ Longueur maximale : %2px
 %LM：位置 </translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="227"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="234"/>
        <source>Option d&apos;affichage en croix</source>
        <translation>十字线选项</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="233"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="240"/>
        <source>Afficher les contacts de puissance dans la croix</source>
        <translation>在十字中显示电源触点</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="242"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
        <source>Préfixe des contacts de puissance :</source>
        <translation>电源触点前缀：</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="249"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="256"/>
        <source>Préfixe des contacts temporisés :</source>
        <translation>延时触点前缀：</translation>
    </message>
    <message>
-        <location filename="../sources/ui/xrefpropertieswidget.ui" line="262"/>
+        <location filename="../sources/ui/xrefpropertieswidget.ui" line="269"/>
        <source>Préfixe des contacts inverseurs :</source>
        <translation>转换触点前缀：</translation>
    </message>
@@ -0,0 +1,101 @@
+Compiler QElectroTech sous microsoft Windows 10 et 11 avec MSYS2
+================================
+Ce document décrit les étapes nécessaire afin de compilé QElectroTech sous Windows avec Qt6 et cmake en utilisant MSYS2.
+
+# MSYS2
+L'ensemble des outils nécessaire au développement et à la compilation de QElectroTech sous Windows sera installé par l’intermédiaire de [MSYS2](https://www.msys2.org/). Cela comprend entre autre le framework [Qt6](https://www.qt.io/development/qt-framework/qt6), les outils cmake, les dépendances ([kde framework](https://develop.kde.org/docs/), [sqlite](https://sqlite.org/), [pugixml](https://pugixml.org/)), les outils de compilation [minGW](https://www.mingw-w64.org/)...
+
+>Il sera nécessaire d'utiliser [winget](https://learn.microsoft.com/fr-fr/windows/package-manager/winget/), celui-ci est présent par défaut sous Windows 11, dans le cas de Windows 10, winget peut necessité d'être activé manuellement
+
+# Installer GIT et MSYS2 avec winget
+Avec power shell.
+```
+winget install Git.Git
+```
+puis
+```
+winget install MSYS2.MSYS2
+```
+
+
+
+## Mise à jour de MSYS2
+Lors de la première utilisation de MSYS2 il est nécessaire de mettre celui-ci à jour.
+
+Lancer "MSYS2 MSYS" depuis le menu démarré de Windows.
+Une fenêtre avec un shell s'ouvre, dans celui-ci lancer la commande :
+```
+pacman -Syu
+```
+A la fin de la mise à jour MSYS2 MSYS se fermera automatiquement. Ouvrez le à nouveau et relancé la commande
+```
+pacman -Syu
+```
+
+## Installation des outils de devellopement
+Toujours dans le shell MSYS2 MSYS lancer la commande suivante.
+```
+pacman -S mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-qt6-svg mingw-w64-ucrt-x86_64-qt6-base mingw-w64-ucrt-x86_64-sqlite3 mingw-w64-ucrt-x86_64-pugixml mingw-w64-ucrt-x86_64-kcoreaddons mingw-w64-ucrt-x86_64-kwidgetsaddons mingw-w64-ucrt-x86_64-extra-cmake-modules mingw-w64-ucrt-x86_64-gdb mingw-w64-ucrt-x86_64-qt6-translations mingw-w64-ucrt-x86_64-qt6-tools
+```
+> La quantité de paquets à installer est conséquent, en fonction de votre connexion internet cela peut prendre plusieurs dizaine de minute
+
+L'ensemble des outils est mantenant installé 😀
+
+# Installer Qt creator
+Télécharger [l'installateur online de Qt](https://www.qt.io/development/download-qt-installer-oss) et lancer l'installation en suivant les indications de ce dernier.
+
+>Dans le cas où vous comptez utilisé Qt Creator uniquement pour développez QElectroTech, lors de l'installation choisissez l'option "installation personnalisée" puis dans la page suivante sélectionné uniquement Qt Creator.
+
+## Configurer Qt creator
+Ouvrir Qt creator puis rendez vous dans "édition -> préférence -> kit"
+
+### Versions de Qt
+
+- Cliquer sur _ajouter_
+- Renseigner _Chemin de qmake_ (exemple C:\\msys64\\ucrt64\\bin\\qmake.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/qt_version.png)
+
+### Compilateurs
+- Cliquer sur _ajouter_ puis choisir _MinGW_.
+- Renseigner _Emplacement du compilateur C_ (exemple C:\\msys64\\ucrt64\\bin\\g++.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/compiler.png)
+
+### Débogueurs
+- Cliquer sur _ajouter_
+- Renseigner  _Chemin :_ (exemple C:\\msys64\\ucrt64\\bin\\gdb.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/debugger.png)
+
+### cmake
+- Outils -> _Ajouter_
+- Renseigner  _Chemin :_ (exemple C:\\msys64\\ucrt64\\bin\\cmake.exe).
+- Dans le champ _Nom :_ ajouter (msys2).
+
+![](assets/windows_msys2_setup/cmake.png)
+
+### KIT
+Maintenant que tous les prérequis sont fait nous allons crée un kit utilisant les outils fournis par MSYS2. Cliquer sur _Ajouter_, un nouveau kit _manuel_ apparaît, nommer celui-ci par exemple _Qt6 msys2_ puis renseigner le compilateur, le débogueur, la version de Qt et Outils CMake en choisissant à chaque fois ceux que nous venons de créer.
+puis cliquer sur _appliquer_.
+
+![](assets/windows_msys2_setup/kit.png)
+
+Bravo 🥳🥳 vous avez terminé l'installation de la totalité des outils de développement.
+
+# Clonez le dépôts de QElectrotech
+Clonez le dépôt de QElectroTech comme vous le faite habituellement, sinon utilisez les commandes suivante dans power shell.
+
+Crée et/ou se rendre dans le dossier dans lequel vous voulez clonez le dépôt (dans l'exemple nous allons crée un dossier QElectroTech dans C:)
+
+```
+mkdir C:\QElectroTech
+cd C:\QElectroTech
+
+git clone --recursive https://github.com/qelectrotech/qelectrotech-source-mirror.git
+```
+
+Une fois le dépôt cloné lancer Qt creator puis choisir d'ouvrir un projet existant, en choisissant le _CMakeLists.txt_ se trouvant à la racine du projet QElectroTech, enfin dans l'assistant de création de projet choisir comme kit le kit que nous avons créer précédemment.
@@ -0,0 +1,13 @@
+Compiler QElectroTech sous microsoft Windows 10 et 11
+================================
+Compiler QElectroTech pour et/ou sous Windows peut être effectué avec plusieurs méthode différente.
+Ce document énumère uniquement les différentes méthode possible
+
+N'est mentionné que les étapes nécessaire afin de compilé QElectroTech sous Windows avec Qt6 et cmake. Ce document ne traite pas la compilation avec Qt5 et qmake.
+
+>QElectroTech 0.100 est la dernière version à utiliser Qt5. Les version suivante sont développé avec Qt6 et utilise cmake au lieu de qmake.
+
+Il existe deux méthodes pour cela :
+
+1. [Utiliser msys2 (méthode recommandé)](fr_window_build_msys2.md)
+2. Télécharger et compiler l'ensemble des dépendances (non rédigé)
@@ -26,12 +26,7 @@
 #include "xmlprojectelementcollectionitem.h"

 #include <QFutureWatcher>
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
 #include <QtConcurrentMap>
-#else
-#include <QtConcurrentRun>
-#endif
-
 /**
 	@brief ElementsCollectionModel::ElementsCollectionModel
 	Constructor
@@ -294,14 +289,14 @@ void ElementsCollectionModel::loadCollections(bool common_collection,
 	connect(watcher, &QFutureWatcher<void>::progressRangeChanged,
 			this, &ElementsCollectionModel::loadingProgressRangeChanged);
 	connect(watcher, &QFutureWatcher<void>::finished,
-			this, &ElementsCollectionModel::loadingFinished);
-	connect(watcher, &QFutureWatcher<void>::finished, watcher, &QFutureWatcher<void>::deleteLater);
+		this, &ElementsCollectionModel::loadingFinished);
+	connect(
+		watcher,
+		&QFutureWatcher<void>::finished,
+		watcher,
+		&QFutureWatcher<void>::deleteLater);

-	#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData);
-	#else
-	qDebug() << "Help code for QT 6 or later";
-	#endif
 	watcher->setFuture(m_future);
 }

@@ -835,14 +835,8 @@ void ElementsCollectionWidget::search()
 	}

 	hideCollection(true);
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	const QStringList text_list = text.split("+", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
+
 	const QStringList text_list = text.split("+", Qt::SkipEmptyParts);
-#endif
 	QModelIndexList match_index;
 	for (QString txt : text_list) {
 		match_index << m_model->match(m_showed_index.isValid()
@@ -803,13 +803,13 @@ bool ElementsLocation::setXml(const QDomDocument &xml_document) const
 			QString			   path_ = collectionPath(false);
 			QRegularExpression rx("^(.*)/(.*\\.elmt)$");

-			if (rx.exactMatch(path_))
+			if (auto regex_match = rx.match(path_); regex_match.hasMatch())
 			{
 				return project()
 					->embeddedElementCollection()
 					->addElementDefinition(
-						rx.cap(1),
-						rx.cap(2),
+						regex_match.captured(1),
+						regex_match.captured(2),
 						xml_document.documentElement());
 			}
 			else
@@ -20,7 +20,7 @@

 #include "../NameList/nameslist.h"
 #include "../diagramcontext.h"
-#include "pugixml/src/pugixml.hpp"
+#include "pugixml.hpp"

 #include <QIcon>
 #include <QString>
@@ -87,11 +87,7 @@ void ElementsTreeView::startElementDrag(const ElementsLocation &location)
 {
 	if (! location.exist()) return;

-#if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
-	QDrag* drag = new QDrag(this);
-#else
-	QScopedPointer<QDrag> drag(new QDrag(this));
-#endif
+	auto drag = new QDrag{this};

 	QString location_str = location.toString();
 	QMimeData *mime_data = new QMimeData();
@@ -361,7 +361,7 @@ void FileElementCollectionItem::setUpIcon()
 			setIcon(QET::Icons::Folder);
 		} else {
 			if (m_path.endsWith(".qetmak")) {
-				setIcon(QIcon());
+				setIcon(QET::Icons::PartRectangle);
 			} else {
 				ElementsLocation loc(collectionPath());
 				setIcon(loc.icon());
@@ -17,7 +17,7 @@
 */
 #ifndef NAMES_LIST_H
 #define NAMES_LIST_H
-#include "pugixml/src/pugixml.hpp"
+#include "pugixml.hpp"

 #include <QtXml>
 /**
@@ -18,6 +18,7 @@
 #include "terminalstripdrawer.h"

 #include <QPainter>
+#include <QHash>

 namespace TerminalStripDrawer {

@@ -130,12 +130,7 @@ bool PhysicalTerminal::setLevelOf(const QSharedPointer<RealTerminal> &terminal,
 	const int i = m_real_terminal.indexOf(terminal);
 	if (i >= 0)
 	{
-#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
-		m_real_terminal.swapItemsAt(i, std::min(level, m_real_terminal.size()-1));
-#else
-		auto j = std::min(level, m_real_terminal.size()-1);
-		std::swap(m_real_terminal.begin()[i], m_real_terminal.begin()[j]);
-#endif
+		m_real_terminal.swapItemsAt(i, std::min(static_cast<qsizetype>(level), m_real_terminal.size()-1));
 		return true;
 	}
 	return false;
@@ -64,11 +64,8 @@ bool TerminalStripData::fromXml(const QDomElement &xml_element)
 					"due to wrong tag name. Expected " << this->xmlTagName() << " used " << xml_element.tagName();
 		return false;
 	}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+
 	m_uuid = QUuid::fromString(xml_element.attribute(QStringLiteral("uuid")));
-#else
-	m_uuid = QUuid(xml_element.attribute(QStringLiteral("uuid")));
-#endif

 	for (auto &xml_info :
 		 QETXML::findInDomElement(xml_element.firstChildElement(QStringLiteral("informations")),
@@ -35,11 +35,7 @@ TerminalStripTreeDockWidget::TerminalStripTreeDockWidget(QETProject *project, QW
 	ui->setupUi(this);
    setProject(project);

-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
 	ui->m_tree_view->expandRecursively(ui->m_tree_view->rootIndex());
-#else
-	ui->m_tree_view->expandAll();
-#endif
 }

 TerminalStripTreeDockWidget::~TerminalStripTreeDockWidget()
@@ -93,11 +89,7 @@ void TerminalStripTreeDockWidget::reload()

 	buildTree();

-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
 	ui->m_tree_view->expandRecursively(ui->m_tree_view->rootIndex());
-#else
-	ui->m_tree_view->expandAll();
-#endif

 		//Reselect the tree widget item of the current edited strip
   auto item = m_item_strip_H.key(current_);
@@ -55,11 +55,7 @@ BorderTitleBlock::BorderTitleBlock(QObject *parent) :
 	m_titleblock_template_renderer = new TitleBlockTemplateRenderer(this);
 	m_titleblock_template_renderer -> setTitleBlockTemplate(QETApp::defaultTitleBlockTemplate());

-	// disable the QPicture-based cache from Qt 4.8 to avoid rendering errors and crashes
-#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)	// ### Qt 6: remove
-#else
 	m_titleblock_template_renderer -> setUseCache(false);
-#endif

 	// dimensions par defaut du schema
 	importBorder(BorderProperties());
@@ -72,14 +72,7 @@ bool ConductorNumExport::toCsv()
 		if (file.open(QIODevice::WriteOnly | QIODevice::Text))
 		{
 			QTextStream stream(&file);
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)	// ### Qt 6: remove
-			stream << wiresNum() << endl;
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.15 or later")
-#endif
 			stream << wiresNum() << &Qt::endl(stream);
-#endif
 		}
 		else {
 			return false;
@@ -811,14 +811,7 @@ void ConductorProperties::readStyle(const QString &style_string) {
 	if (style_string.isEmpty()) return;

 	// recupere la liste des couples style / valeur
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	QStringList styles = style_string.split(";", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code QString::SkipEmptyParts for QT 5.14 or later")
-#endif
 	QStringList styles = style_string.split(";", Qt::SkipEmptyParts);
-#endif

 	QRegularExpression Rx("^(?<name>[a-z-]+): (?<value>[a-z-]+)$");
 	if (!Rx.isValid())
@@ -47,14 +47,8 @@ ElementQueryWidget::ElementQueryWidget(QWidget *parent) :
 	m_button_group.addButton(ui->m_coil_cb, 4);
 	m_button_group.addButton(ui->m_protection_cb, 5);
 	m_button_group.addButton(ui->m_thumbnail_cb, 6);
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)	// ### Qt 6: remove
-	connect(&m_button_group, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), [this](int id)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.15 or later")
-#endif
+
 	connect(&m_button_group, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::idClicked), [this](int id)
-#endif
 	{
 		auto check_box = static_cast<QCheckBox *>(m_button_group.button(0));
 		if (id == 0)
@@ -1514,14 +1514,6 @@ bool Diagram::fromXml(QDomElement &document,
 	if (content_ptr) {
 		content_ptr -> m_elements           = added_elements;
 		content_ptr -> m_conductors_to_move = added_conductors;
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-		content_ptr -> m_text_fields        = added_texts.toSet();
-		content_ptr -> m_images			    = added_images.toSet();
-		content_ptr -> m_shapes			    = added_shapes.toSet();
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 		content_ptr -> m_text_fields	= QSet<IndependentTextItem *>(
 					added_texts.begin(),
 					added_texts.end());
@@ -1532,7 +1524,6 @@ bool Diagram::fromXml(QDomElement &document,
 					added_shapes.begin(),
 					added_shapes.end());
 		content_ptr->m_terminal_strip.swap(added_strips);
-#endif
 		content_ptr->m_tables.swap(added_tables);
 	}

@@ -17,7 +17,7 @@
 */
 #ifndef DIAGRAM_CONTEXT_H
 #define DIAGRAM_CONTEXT_H
-#include "pugixml/src/pugixml.hpp"
+#include "pugixml.hpp"

 #include <QDomElement>
 #include <QHash>
@@ -210,17 +210,10 @@ void DiagramView::handleElementDrop(QDropEvent *event)
 		return;
 	}

-	QPointF drop_pos;
-	#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	drop_pos = mapToScene(event->pos());
-	#else
-	drop_pos = event->position();
-	#endif
-
 	if (location.path().endsWith(".qetmak")) {
-		diagram()->setEventInterface(new DiagramEventAddMacro(location, diagram(), drop_pos));
+		diagram()->setEventInterface(new DiagramEventAddMacro(location, diagram(), event->position()));
 	} else {
-		diagram()->setEventInterface(new DiagramEventAddElement(location, diagram(), drop_pos));
+		diagram()->setEventInterface(new DiagramEventAddElement(location, diagram(), event->position()));
 	}

 	//Set focus to the view to get event
@@ -290,17 +283,8 @@ void DiagramView::handleTextDrop(QDropEvent *e) {
 		iti -> setHtml (e -> mimeData() -> text());
 	}

-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-
-	m_diagram->undoStack().push(new AddGraphicsObjectCommand(
-									iti, m_diagram, mapToScene(e->pos())));
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	m_diagram->undoStack().push(new AddGraphicsObjectCommand(
 									iti, m_diagram, e->position()));
-#endif
 }

 /**
@@ -458,14 +442,7 @@ void DiagramView::mousePressEvent(QMouseEvent *e)
 	if (m_event_interface && m_event_interface->mousePressEvent(e)) return;

 		//Start drag view when hold the middle button
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		m_drag_last_pos = e->pos();
 		viewport()->setCursor(Qt::ClosedHandCursor);
@@ -515,14 +492,7 @@ void DiagramView::mouseMoveEvent(QMouseEvent *e)
 	if (m_event_interface && m_event_interface->mouseMoveEvent(e)) return;

 		// Drag the view
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->buttons() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->buttons() == Qt::MiddleButton)
-#endif
 	{
 		QScrollBar *h = horizontalScrollBar();
 		QScrollBar *v = verticalScrollBar();
@@ -583,14 +553,7 @@ void DiagramView::mouseReleaseEvent(QMouseEvent *e)
 	if (m_event_interface && m_event_interface->mouseReleaseEvent(e)) return;

 		// Stop drag view
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		viewport()->setCursor(Qt::ArrowCursor);
 	}
@@ -624,14 +587,7 @@ void DiagramView::mouseReleaseEvent(QMouseEvent *e)
 			QMenu *menu = new QMenu(this);
 			menu->addAction(act);

-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-			menu->popup(e->globalPos());
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 			menu->popup(e->pos());
-#endif
 		}

 		m_free_rubberbanding = false;
@@ -1355,7 +1311,6 @@ void DiagramView::createTemplateFromSelection()
 	QFile file(full_path);
 	if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
 		QTextStream out(&file);
-		out.setCodec("UTF-8");
 		out << macro_doc.toString(4);
 		file.close();
 		qDebug() << "Template successfully saved to:" << full_path;
@@ -276,14 +276,7 @@ void ChangeZValueCommand::applyRaise(const QList<QGraphicsItem *> &items_list) {
 	for (int i = my_items_list.count() - 2 ; i >= 0 ; -- i) {
 		if (my_items_list[i] -> isSelected()) {
 			if (!my_items_list[i +1] -> isSelected()) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)	// ### Qt 6: remove
-				my_items_list.swap(i, i + 1);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.13 or later")
-#endif
 				my_items_list.swapItemsAt(i, i + 1);
-#endif
 			}
 		}
 	}
@@ -301,14 +294,7 @@ void ChangeZValueCommand::applyLower(const QList<QGraphicsItem *> &items_list) {
 	for (int i = 1 ; i < my_items_list.count() ; ++ i) {
 		if (my_items_list[i] -> isSelected()) {
 			if (!my_items_list[i - 1] -> isSelected()) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)	// ### Qt 6: remove
-				my_items_list.swap(i, i - 1);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.13 or later")
-#endif
 				my_items_list.swapItemsAt(i, i - 1);
-#endif
 			}
 		}
 	}
@@ -372,14 +372,7 @@ ElementContent ElementView::pasteWithOffset(const QDomDocument &xml_document) {
 */
 void ElementView::mousePressEvent(QMouseEvent* e)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		setCursor( (Qt::ClosedHandCursor));
 		reference_view_ = e->pos();
@@ -394,14 +387,7 @@ void ElementView::mousePressEvent(QMouseEvent* e)
 */
 void ElementView::mouseMoveEvent(QMouseEvent* e)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->buttons() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->buttons() == Qt::MiddleButton)
-#endif
 	{
 		QScrollBar *h = horizontalScrollBar();
 		QScrollBar *v = verticalScrollBar();
@@ -420,14 +406,7 @@ void ElementView::mouseMoveEvent(QMouseEvent* e)
 */
 void ElementView::mouseReleaseEvent(QMouseEvent* e)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
-	if (e->button() == Qt::MidButton)
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	if (e->button() == Qt::MiddleButton)
-#endif
 	{
 		setCursor(Qt::ArrowCursor);
 		adjustSceneRect();
@@ -519,14 +519,7 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 	resetStyles();

 		//Get the list of pair style/value
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	QStringList styles = qde.attribute("style").split(";", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 	QStringList styles = qde.attribute("style").split(";", Qt::SkipEmptyParts);
-#endif

 		//Check each pair of style
 	QRegularExpression rx("^\\s*([a-z-]+)\\s*:\\s*([a-zA-Z-]+)\\s*$");
@@ -291,11 +291,9 @@ void ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged(int in
 	ui->m_master_gb->setVisible(master);
 	ui->m_terminal_gb->setVisible(terminal);

-#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
 	ui->tabWidget->setTabVisible(1,
 								 (type_ == ElementData::Simple ||
 								  type_ == ElementData::Master));
-#endif

 	updateTree();
 }
@@ -61,7 +61,7 @@ void TerminalEditor::updateForm()
 	ui->m_y_dsb->setValue(m_part->property("y").toReal());
 	ui->m_orientation_cb->setCurrentIndex(ui->m_orientation_cb->findData(m_part->property("orientation")));
 	ui->m_name_le->setText(m_part->terminalName());
-	ui->m_type_cb->setCurrentIndex(ui->m_orientation_cb->findData(m_part->terminalType()));
+	ui->m_type_cb->setCurrentIndex(ui->m_type_cb->findData(m_part->terminalType()));

 	activeConnections(true);
 }
@@ -122,6 +122,9 @@ void TerminalEditor::init()
 	ui->m_type_cb->addItem(tr("Générique"),         TerminalData::Generic);
 	ui->m_type_cb->addItem(tr("Bornier intérieur"), TerminalData::Inner);
 	ui->m_type_cb->addItem(tr("Bornier extérieur"), TerminalData::Outer);
+	ui->m_type_cb->addItem(tr("NO (contact SW)"),   TerminalData::No);
+	ui->m_type_cb->addItem(tr("NC (contact SW)"),   TerminalData::Nc);
+	ui->m_type_cb->addItem(tr("Commun (contact SW)"), TerminalData::Common);
 }

 /**
@@ -335,6 +335,7 @@ void TextEditor::setUpWidget(QWidget *parent)

 	m_size_sb = new QSpinBox(parent);
 	m_size_sb->setObjectName(QString::fromUtf8("m_size_sb"));
+	m_size_sb->setMinimum(4);

 	gridLayout->addWidget(m_size_sb, 2, 1, 1, 1);

@@ -567,14 +567,7 @@ void ElementPictureFactory::setPainterStyle(const QDomElement &dom, QPainter &pa
 	pen.setCapStyle(Qt::SquareCap);

 		//Get the couples style/value
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	const QStringList styles = dom.attribute("style").split(";", QString::SkipEmptyParts);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 	const QStringList styles = dom.attribute("style").split(";", Qt::SkipEmptyParts);
-#endif

 	QRegularExpression rx("^(?<name>[a-z-]+):(?<value>[a-zA-Z-]+)$");
 	if (!rx.isValid())
@@ -188,10 +188,8 @@ void MachineInfo::send_info_to_debug()
 	QDirIterator it1(QETApp::commonElementsDir().toLatin1(),nameFilters,  QDir::Files, QDirIterator::Subdirectories);
 			while (it1.hasNext())
 			{
-				if(it1.next() > 0 )
-				{
+				it1.next();
 				commomElementsDir ++;
-				}
 			}
 	qInfo()<< " Common Elements count:"<< commomElementsDir << "Elements";
 	
@@ -200,10 +198,8 @@ void MachineInfo::send_info_to_debug()
 	QDirIterator it2(QETApp::customElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
 			while (it2.hasNext())
 			{
-				if(it2.next() > 0 )
-				{
+				it2.next();
 				customElementsDir ++;
-				}
 			}
 	qInfo()<< " Custom Elements count:"<< customElementsDir << "Elements";
 	
@@ -211,10 +207,8 @@ void MachineInfo::send_info_to_debug()
 	QDirIterator it3(QETApp::companyElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
 			while (it3.hasNext())
 			{
-				if(it3.next() > 0 )
-				{
+				it3.next();
 				companyElementsDir ++;
-				}
 			}
 	qInfo()<< " Company Elements count:"<< companyElementsDir << "Elements";
 	
@@ -174,24 +174,9 @@ int main(int argc, char **argv)
 	QCoreApplication::setApplicationName("QElectroTech");
 	//Creation and execution of the application
 	//HighDPI
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
-#endif

-
-#if QT_VERSION > QT_VERSION_CHECK(5, 7, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
-	QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
-
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-qputenv("QT_ENABLE_HIGHDPI_SCALING", "1");
-QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFactorRoundingPolicy());
-#endif
+	qputenv("QT_ENABLE_HIGHDPI_SCALING", "1");
+	QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFactorRoundingPolicy());


 	SingleApplication app(argc, argv, true);
@@ -190,25 +190,28 @@ ProjectPrintWindow::~ProjectPrintWindow()
 */
 void ProjectPrintWindow::requestPaint()
 {
-	#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-		#ifdef Q_OS_WIN
-			#ifdef QT_DEBUG
-			qDebug() << "--";
-			qDebug() << "DiagramPrintDialog::print  printer_->resolution() before " << m_printer->resolution();
-			qDebug() << "DiagramPrintDialog::print  screennumber " << QApplication::desktop()->screenNumber();
-			#endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#ifdef Q_OS_WIN
+	auto screen = this->screen();
+	if(screen)
+	{
+#ifdef QT_DEBUG
+		qDebug() << "--";
+		qDebug() << "DiagramPrintDialog::print  printer_->resolution() before " << m_printer->resolution();
+		qDebug() << "DiagramPrintDialog::print  screennumber " << screen->name();
+#endif

-			QScreen *srn = QApplication::screens().at(QApplication::desktop()->screenNumber());
-			qreal dotsPerInch = (qreal)srn->logicalDotsPerInch();
-			m_printer->setResolution(dotsPerInch);
+		qreal dotsPerInch = (qreal)screen->logicalDotsPerInch();
+		m_printer->setResolution(dotsPerInch);

-			#ifdef QT_DEBUG
-				qDebug() << "DiagramPrintDialog::print  dotsPerInch " << dotsPerInch;
-				qDebug() << "DiagramPrintDialog::print  printer_->resolution() after" << m_printer->resolution();
-			qDebug() << "--";
-			#endif
-		#endif
-	#endif
+#ifdef QT_DEBUG
+		qDebug() << "DiagramPrintDialog::print  dotsPerInch " << dotsPerInch;
+		qDebug() << "DiagramPrintDialog::print  printer_->resolution() after" << m_printer->resolution();
+		qDebug() << "--";
+#endif
+	}
+#endif
+#endif

 	if (!m_project->diagrams().count()) {
 		return;
@@ -265,9 +268,9 @@ void ProjectPrintWindow::printDiagram(Diagram *diagram, bool fit_page, QPainter
 #if TODO_LIST
 #pragma message("@TODO remove code for QT 6 or later")
 #endif
-	qDebug()<<"Help code for QT 6 or later";
-	auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) :
-									printer->pageRect(QPrinter::Millimeter);
+		qDebug()<<"Help code for QT 6 or later";
+		auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) :
+								printer->pageRect(QPrinter::Millimeter);
 #endif
 		auto used_width  = printed_rect.width();
 		auto used_height = printed_rect.height();
@@ -341,7 +344,7 @@ QRect ProjectPrintWindow::diagramRect(Diagram *diagram, const ExportProperties &
 		diagram_rect.setHeight(diagram_rect.height() - titleblock_height);
 	}

-		//Adjust the border of diagram to 1px (width of the line)
+	//Adjust the border of diagram to 1px (width of the line)
 	diagram_rect.adjust(0,0,1,1);

 	return (diagram_rect.toAlignedRect());
@@ -356,7 +359,7 @@ QRect ProjectPrintWindow::diagramRect(Diagram *diagram, const ExportProperties &
 * with the orientation and the paper format used by the actual printer
 */
 int ProjectPrintWindow::horizontalPagesCount(
-		Diagram *diagram, const ExportProperties &option, bool full_page) const
+	Diagram *diagram, const ExportProperties &option, bool full_page) const
 {
 	QRect printable_area;
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
@@ -385,7 +388,7 @@ int ProjectPrintWindow::horizontalPagesCount(
 * with the orientation and paper format used by the actual printer
 */
 int ProjectPrintWindow::verticalPagesCount(
-		Diagram *diagram, const ExportProperties &option, bool full_page) const
+	Diagram *diagram, const ExportProperties &option, bool full_page) const
 {
 	QRect printable_area;
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
@@ -511,7 +514,7 @@ void ProjectPrintWindow::loadPageSetupForCurrentPrinter()
 		QString value = settings.value("orientation", "landscape").toString();
 		m_printer->setPageOrientation(
 			value == "landscape" ? QPageLayout::Landscape :
-								   QPageLayout::Portrait);
+				QPageLayout::Portrait);
 	}
 	if (settings.contains("papersize"))
 	{
@@ -780,9 +783,9 @@ void ProjectPrintWindow::print()
 void ProjectPrintWindow::on_m_date_cb_userDateChanged(const QDate &date)
 {
 	auto index = ui->m_date_from_cb->currentIndex();
-		// 0 = all date
-		// 1 = from the date
-		// 2 = at the date
+	// 0 = all date
+	// 1 = from the date
+	// 2 = at the date

 	if (index) { on_m_uncheck_all_clicked();  }
 	else       { on_m_check_all_pb_clicked(); }
@@ -792,7 +795,7 @@ void ProjectPrintWindow::on_m_date_cb_userDateChanged(const QDate &date)
 	{
 		auto diagram_date = diagram->border_and_titleblock.date();
 		if ( (index == 1 && diagram_date >= date) ||
-			 (index == 2 && diagram_date == date) )
+			(index == 2 && diagram_date == date) )
 			m_diagram_list_hash.value(diagram)->setChecked(true);
 	}

@@ -174,6 +174,12 @@ QString TerminalData::typeToString(TerminalData::Type type)
 			return QString("Inner");
 		case Outer :
 			return QString("Outer");
+		case No :
+			return QString("No");
+		case Nc :
+			return QString("Nc");
+		case Common :
+			return QString("Common");
 	}
 	return QString("Generic");
 }
@@ -193,6 +199,12 @@ TerminalData::Type TerminalData::typeFromString(const QString &string)
 		return TerminalData::Inner;
 	} else if (string == "Outer") {
 		return TerminalData::Outer;
+	} else if (string == "No") {
+		return TerminalData::No;
+	} else if (string == "Nc") {
+		return TerminalData::Nc;
+	} else if (string == "Common") {
+		return TerminalData::Common;
 	} else {
 		qDebug() << "TerminalData::typeFromString, argument string is invalid"
 					" failsafe type 'TerminalData::Generic' is returned";
@@ -41,7 +41,10 @@ class TerminalData : public PropertiesInterface
 		enum Type {
 			Generic,
 			Inner,
-			Outer
+			Outer,
+			No,     ///< Normally Open terminal (for SW contacts)
+			Nc,     ///< Normally Closed terminal (for SW contacts)
+			Common  ///< Common terminal (for SW contacts)
 		};
 		Q_ENUM(Type)

@@ -29,6 +29,7 @@
 XRefProperties::XRefProperties()
 {
 	m_show_power_ctc = true;
+	m_show_terminal_name = true;
 	m_display = Cross;
 	m_snap_to = Bottom;
 	m_prefix_keys << "power" << "delay" << "switch";
@@ -48,6 +49,7 @@ void XRefProperties::toSettings(QSettings &settings,
 				const QString prefix) const
 {
 	settings.setValue(prefix % "showpowerctc", m_show_power_ctc);
+	settings.setValue(prefix % "showterminalname", m_show_terminal_name);
 	QString display = m_display == Cross? "cross" : "contacts";
 	settings.setValue(prefix % "displayhas", display);
 	QString snap = m_snap_to == Bottom? "bottom" : "label";
@@ -78,6 +80,7 @@ void XRefProperties::fromSettings(const QSettings &settings,
 				  const QString prefix)
 {
 	m_show_power_ctc = settings.value(prefix % "showpowerctc", true).toBool();
+	m_show_terminal_name = settings.value(prefix % "showterminalname", true).toBool();
 	QString display = settings.value(prefix % "displayhas", "cross").toString();
 	display == "cross"? m_display = Cross : m_display = Contacts;
 	QString snap = settings.value(prefix % "snapto", "label").toString();
@@ -107,6 +110,7 @@ QDomElement XRefProperties::toXml(QDomDocument &xml_document) const
 	xml_element.setAttribute("type", m_key);

 	xml_element.setAttribute("showpowerctc", m_show_power_ctc? "true" : "false");
+	xml_element.setAttribute("showterminalname", m_show_terminal_name? "true" : "false");
 	QString display = m_display == Cross? "cross" : "contacts";
 	xml_element.setAttribute("displayhas", display);
 	QString snap = m_snap_to == Bottom? "bottom" : "label";
@@ -137,6 +141,7 @@ QDomElement XRefProperties::toXml(QDomDocument &xml_document) const
 */
 bool XRefProperties::fromXml(const QDomElement &xml_element) {
 	m_show_power_ctc = xml_element.attribute("showpowerctc")  == "true";
+	m_show_terminal_name = xml_element.attribute("showterminalname", "true") == "true";
 	QString display = xml_element.attribute("displayhas", "cross");
 	display == "cross"? m_display = Cross : m_display = Contacts;
 	QString snap = xml_element.attribute("snapto", "label");
@@ -188,6 +193,7 @@ QHash<QString, XRefProperties> XRefProperties::defaultProperties()

 bool XRefProperties::operator ==(const XRefProperties &xrp) const{
 	return (m_show_power_ctc == xrp.m_show_power_ctc
+			&& m_show_terminal_name == xrp.m_show_terminal_name
 			&& m_display     == xrp.m_display
 			&& m_snap_to     == xrp.m_snap_to
 			&& m_prefix      == xrp.m_prefix
@@ -57,6 +57,9 @@ class XRefProperties : public PropertiesInterface
 	void setShowPowerContac (const bool a) {m_show_power_ctc = a;}
 	bool showPowerContact	() const	   {return m_show_power_ctc;}

+	void setShowTerminalName (const bool a) {m_show_terminal_name = a;}
+	bool showTerminalName	 () const		{return m_show_terminal_name;}
+
 	void setDisplayHas	  (const DisplayHas dh) {m_display = dh;}
 	DisplayHas displayHas () const				{return m_display;}

@@ -81,6 +84,7 @@ class XRefProperties : public PropertiesInterface

 	private:
 	bool m_show_power_ctc;
+	bool m_show_terminal_name;
 	DisplayHas m_display;
 	SnapTo m_snap_to;
 	Qt::AlignmentFlag m_xref_pos;
@@ -183,16 +183,7 @@ bool QET::orthogonalProjection(

 	// determine le point d'intersection des deux droites = le projete orthogonal
 	QPointF intersection_point;
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
-	QLineF::IntersectType it = line.
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-			intersect // ### Qt 6: remove
-#else
-			intersects
-#endif
-			(perpendicular_line, &intersection_point);
+	QLineF::IntersectType it = line.intersects(perpendicular_line, &intersection_point);

 	// ne devrait pas arriver (mais bon...)
 	if (it == QLineF::NoIntersection) return(false);
@@ -545,16 +536,8 @@ QString QET::joinWithSpaces(const QStringList &string_list) {
 QStringList QET::splitWithSpaces(const QString &string) {
 	// les chaines sont separees par des espaces non echappes
 	// = avec un nombre nul ou pair de backslashes devant
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 	QStringList escaped_strings = string.split(QRegularExpression("[^\\]?(?:\\\\)* "),
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-						   QString
-#else
-						   Qt
-#endif
-						   ::SkipEmptyParts);
+											   Qt::SkipEmptyParts);

 	QStringList returned_list;
 	foreach(QString escaped_string, escaped_strings) {
@@ -684,14 +667,7 @@ bool QET::writeXmlFile(QDomDocument &xml_doc, const QString &filepath, QString *
 	}

 	QTextStream out(&file);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	out.setCodec("UTF-8");
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	out.setEncoding(QStringConverter::Utf8);
-#endif
 	out.setGenerateByteOrderMark(false);
 	out << xml_doc.toString(4);
 	if  (!file.commit())
@@ -822,14 +798,7 @@ bool QET::writeToFile(QDomDocument &xml_doc, QFile *file, QString *error_message

 	QTextStream out(file);
 	out.seek(0);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	out.setCodec("UTF-8");
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	out.setEncoding(QStringConverter::Utf8);
-#endif
 	out.setGenerateByteOrderMark(false);
 	out << xml_doc.toString(4);
 	if (opened_here) {
@@ -204,14 +204,7 @@ void QETApp::setLanguage(const QString &desired_language) {
 	QString languages_path = languagesPath();

 	// load Qt library translations
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	QString qt_l10n_path = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	QString qt_l10n_path = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
-#endif
 	if (!qtTranslator.load("qt_" + desired_language, qt_l10n_path))
 	{
 		qWarning() << "failed to load"
@@ -451,16 +451,8 @@ void GraphicsTablePropertiesEditor::setUpEditConnection()
 		m_edit_connection << connect(ui->m_table_left_margin,    QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_table_right_margin,   QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_table_bottom_margin,  QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)	// ### Qt 6: remove
-		m_edit_connection << connect(m_table_button_group,       QOverload<int>::of(&QButtonGroup::buttonClicked), this, &GraphicsTablePropertiesEditor::apply);
-		m_edit_connection << connect(m_header_button_group,      QOverload<int>::of(&QButtonGroup::buttonClicked), this, &GraphicsTablePropertiesEditor::apply);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.15 or later")
-#endif
-		m_edit_connection << connect(m_table_button_group,       QOverload<int>::of(&QButtonGroup::idClicked), this, &GraphicsTablePropertiesEditor::apply);
-		m_edit_connection << connect(m_header_button_group,      QOverload<int>::of(&QButtonGroup::idClicked), this, &GraphicsTablePropertiesEditor::apply);
-#endif
+		m_edit_connection << connect(m_table_button_group,       QOverload<int>::of(&QButtonGroup::idClicked),     this, &GraphicsTablePropertiesEditor::apply);
+		m_edit_connection << connect(m_header_button_group,      QOverload<int>::of(&QButtonGroup::idClicked),     this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_display_n_row_sb,     QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::apply);
 		m_edit_connection << connect(ui->m_display_n_row_sb,     QOverload<int>::of(&QSpinBox::valueChanged),      this, &GraphicsTablePropertiesEditor::updateInfoLabel);
 	}
@@ -1725,14 +1725,7 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
 			for (Conductor *c : other_conductors_list_t) {
 				other_conductors += c->relatedPotentialConductors(all_diagram, t_list);
 			}
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-			other_conductors += other_conductors_list_t.toSet();
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 5.14 or later")
-#endif
 			other_conductors += QSet<Conductor*>(other_conductors_list_t.begin(),other_conductors_list_t.end());
-#endif
 		}
 	}

@@ -17,6 +17,8 @@
 */
 #include "crossrefitem.h"

+#include <QTimer>
+
 #include "../autoNum/assignvariables.h"
 #include "../diagram.h"
 #include "../diagramposition.h"
@@ -222,9 +224,12 @@ void CrossRefItem::updateLabel()
 	prepareGeometryChange();
 	m_bounding_rect = QRectF();

-		//init the painter
-	QPainter qp;
-	qp.begin(&m_drawing);
+	// Build geometry and m_hovered_contacts_map using a QImage-backed
+	// painter so font metrics match the screen painter in paint().
+	// m_update_map=true allows the draw functions to populate the map;
+	// paint() calls them with m_update_map=false so the map is stable.
+	QImage dummy(1, 1, QImage::Format_ARGB32_Premultiplied);
+	QPainter qp(&dummy);
 	QPen pen_;
 	pen_.setWidthF(0.5);
 	qp.setPen(pen_);
@@ -233,17 +238,21 @@ void CrossRefItem::updateLabel()
 		//Draw cross or contact, only if master element is linked.
 	if (! m_element->linkedElements().isEmpty())
 	{
+		m_update_map = true;
 		XRefProperties::DisplayHas dh = m_properties.displayHas();

 		if (dh == XRefProperties::Cross)
 			drawAsCross(qp);
 		else if (dh == XRefProperties::Contacts)
 			drawAsContacts(qp);
+		m_update_map = false;
 	}
-	qp.end();

 	autoPos();
 	update();
+	// Schedule a second update after the scene has finished laying out,
+	// so the initial render uses the correct bounding rect.
+	QTimer::singleShot(0, this, [this]{ update(); });
 }

 /**
@@ -311,7 +320,26 @@ void CrossRefItem::paint(
 {
 	Q_UNUSED(option)
 	Q_UNUSED(widget)
-	m_drawing.play(painter);
+	// Draw directly — no QPicture involved anywhere.
+	// QPicture::play() + nested drawPicture() (m_hdr_no_ctc/m_hdr_nc_ctc)
+	// caused a use-after-free crash (QRegion::begin, Qt5Gui+0x49af60)
+	// confirmed by analysis of 19+ coredumps.
+	// m_update_map=false: draw functions do not overwrite m_hovered_contacts_map.
+	if (m_element->linkedElements().isEmpty()) return;
+
+	QPen pen_;
+	pen_.setWidthF(0.5);
+	painter->save();
+	painter->setPen(pen_);
+	painter->setFont(QETApp::diagramTextsFont(5));
+
+	m_update_map = false;
+	XRefProperties::DisplayHas dh = m_properties.displayHas();
+	if (dh == XRefProperties::Cross)
+		drawAsCross(*painter);
+	else if (dh == XRefProperties::Contacts)
+		drawAsContacts(*painter);
+	painter->restore();
 }

 /**
@@ -321,7 +349,24 @@ void CrossRefItem::paint(
 void CrossRefItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
 	event->accept();
-	QetGraphicsItem::showItem(m_hovered_contact);
+
+	// Find the element under the click position directly from the map,
+	// rather than relying on m_hovered_contact which may have been reset
+	// by hoverMoveEvent between the two clicks of the double-click.
+	QPointF pos = event->pos();
+	Element *target = m_hovered_contact;
+
+	if (!target) {
+		for (auto it = m_hovered_contacts_map.begin();
+		     it != m_hovered_contacts_map.end(); ++it) {
+			if (it.value().contains(pos)) {
+				target = it.key();
+				break;
+			}
+		}
+	}
+
+	QetGraphicsItem::showItem(target);
 }

 /**
@@ -433,49 +478,41 @@ void CrossRefItem::linkedChanged()

 /**
 	@brief CrossRefItem::buildHeaderContact
-	Draw the QPicture of m_hdr_no_ctc and m_hdr_nc_ctc
+	Draw NO and NC contact symbols directly onto painter.
+	Previously used QPicture (m_hdr_no_ctc/m_hdr_nc_ctc) which caused
+	use-after-free crashes via nested QPicture::play() calls.
 */
-void CrossRefItem::buildHeaderContact()
+void CrossRefItem::buildHeaderContact(QPainter &painter, QPointF no_pos, QPointF nc_pos)
 {
-	if (!m_hdr_no_ctc.isNull() && !m_hdr_nc_ctc.isNull()) return;
-
-	//init the painter
-	QPainter qp;
 	QPen pen_;
 	pen_.setWidthF(0.2);
+	painter.save();
+	painter.setPen(pen_);

-	//draw the NO contact
-	if (m_hdr_no_ctc.isNull()) {
-		qp.begin(&m_hdr_no_ctc);
-		qp.setPen(pen_);
-		qp.drawLine(0, 3, 5, 3);
-		QPointF p1[3] = {
-			QPointF(5, 0),
-			QPointF(10, 3),
-			QPointF(15, 3),
-		};
-		qp.drawPolyline(p1,3);
-		qp.end();
-	}
+	//draw the NO contact header symbol
+	painter.drawLine(no_pos.x()+0, no_pos.y()+3, no_pos.x()+5, no_pos.y()+3);
+	QPointF p1[3] = {
+		QPointF(no_pos.x()+5,  no_pos.y()+0),
+		QPointF(no_pos.x()+10, no_pos.y()+3),
+		QPointF(no_pos.x()+15, no_pos.y()+3),
+	};
+	painter.drawPolyline(p1, 3);

-	//draw the NC contact
-	if (m_hdr_nc_ctc.isNull()) {
-		qp.begin(&m_hdr_nc_ctc);
-		qp.setPen(pen_);
-		QPointF p2[3] = {
-			QPointF(0, 3),
-			QPointF(5, 3),
-			QPointF(5, 0)
-		};
-		qp.drawPolyline(p2,3);
-		QPointF p3[3] = {
-			QPointF(4, 0),
-			QPointF(10, 3),
-			QPointF(15, 3),
-		};
-		qp.drawPolyline(p3,3);
-		qp.end();
-	}
+	//draw the NC contact header symbol
+	QPointF p2[3] = {
+		QPointF(nc_pos.x()+0, nc_pos.y()+3),
+		QPointF(nc_pos.x()+5, nc_pos.y()+3),
+		QPointF(nc_pos.x()+5, nc_pos.y()+0)
+	};
+	painter.drawPolyline(p2, 3);
+	QPointF p3[3] = {
+		QPointF(nc_pos.x()+4,  nc_pos.y()+0),
+		QPointF(nc_pos.x()+10, nc_pos.y()+3),
+		QPointF(nc_pos.x()+15, nc_pos.y()+3),
+	};
+	painter.drawPolyline(p3, 3);
+
+	painter.restore();
 }

 /**
@@ -493,11 +530,95 @@ void CrossRefItem::setUpCrossBoundingRect(QPainter &painter)

 	QStringList no_str, nc_str;

+	// Helper lambda: build "[13-14] pos" string for an element.
+	// For power contacts (e.g. 3-pole contactor), all named terminals
+	// are collected (e.g. "[1-2-3-4-5-6] pos").
+	// For other contacts (NO/NC/SW), only the first 2 named terminals
+	// are used — users are expected to name and order their terminals
+	// in the element editor.
+	// Helper lambda: build "[13-14] pos" for an element.
+	// - Power: all terminals sorted numerically → "[1-2-3-4-5-6] pos"
+	// - SW with typed terminals: show relevant pair per column (handled below)
+	// - Others: first 2 named terminals
+	auto buildLabel = [this](Element *elmt, bool is_no_col) -> QString {
+		const bool is_power =
+			elmt->kindInformations()["type"].toString() == "power";
+		const bool is_sw =
+			elmt->kindInformations()["state"].toString() == "SW";
+
+		QStringList tnames;
+
+		if (is_sw) {
+			// Check if terminals have explicit No/Nc/Common types
+			bool has_typed = false;
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				if (t->terminalType() == TerminalData::No ||
+					t->terminalType() == TerminalData::Nc ||
+					t->terminalType() == TerminalData::Common) {
+					has_typed = true; break;
+				}
+			}
+			if (has_typed) {
+				QString no_name, nc_name, common_name;
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					if (!t->name().isEmpty()) {
+						if      (t->terminalType() == TerminalData::No)     no_name     = t->name();
+						else if (t->terminalType() == TerminalData::Nc)     nc_name     = t->name();
+						else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+					}
+				}
+				// NO column: show NO+Common pair; NC column: show NC+Common pair
+				if (is_no_col)
+					tnames << no_name << common_name;
+				else
+					tnames << nc_name << common_name;
+			} else {
+				// Fallback: first 2 named terminals
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					const QString tn = t->name();
+					if (!tn.isEmpty()) { tnames << tn; if (tnames.size() >= 2) break; }
+				}
+			}
+		} else {
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				const QString tn = t->name();
+				if (!tn.isEmpty()) {
+					tnames << tn;
+					if (!is_power && tnames.size() >= 2) break;
+				}
+			}
+			if (is_power) {
+				std::sort(tnames.begin(), tnames.end(),
+					[](const QString &a, const QString &b){
+						int i_a = a.size();
+						while (i_a > 0 && a[i_a-1].isDigit()) --i_a;
+						int i_b = b.size();
+						while (i_b > 0 && b[i_b-1].isDigit()) --i_b;
+						bool a_ok = false, b_ok = false;
+						int ai = a.mid(i_a).toInt(&a_ok);
+						int bi = b.mid(i_b).toInt(&b_ok);
+						if (a_ok && b_ok && a.left(i_a) == b.left(i_b))
+							return ai < bi;
+						return a < b;
+					});
+			}
+		}
+
+		QString pos = elementPositionText(elmt, true);
+		if (!tnames.isEmpty() && m_properties.showTerminalName())
+			return QStringLiteral("[") + tnames.join("-") + QStringLiteral("] ") + pos;
+		return pos;
+	};
+
 	for (auto elmt : NOElements()) {
-		no_str.append(elementPositionText(elmt, true));
+		no_str.append(buildLabel(elmt, true));
 	}
 	for (auto elmt : NCElements()) {
-		nc_str.append(elementPositionText(elmt, true));
+		nc_str.append(buildLabel(elmt, false));
 	}

 	//There is no string to display, we return now
@@ -510,9 +631,10 @@ void CrossRefItem::setUpCrossBoundingRect(QPainter &painter)
 	QRectF no_bounding;
 	for (auto str : no_str)
 	{
-		QRectF bounding = painter.boundingRect(QRectF (), Qt::AlignCenter, str);
-		no_bounding = no_bounding.united(bounding);
+		QRectF bounding = painter.boundingRect(QRectF(0, 0, 500, 20), Qt::AlignLeft, str);
 		no_bounding.setHeight(no_bounding.height() + bounding.height());
+		if (bounding.width() > no_bounding.width())
+			no_bounding.setWidth(bounding.width());
 	}
 	//Adjust according to the NO
 	if (no_bounding.height() > default_bounding.height() - header)
@@ -524,9 +646,10 @@ void CrossRefItem::setUpCrossBoundingRect(QPainter &painter)
 	QRectF nc_bounding;
 	for (auto str : nc_str)
 	{
-		QRectF bounding = painter.boundingRect(QRectF (), Qt::AlignCenter, str);
-		nc_bounding = nc_bounding.united(bounding);
+		QRectF bounding = painter.boundingRect(QRectF(0, 0, 500, 20), Qt::AlignLeft, str);
 		nc_bounding.setHeight(nc_bounding.height() + bounding.height());
+		if (bounding.width() > nc_bounding.width())
+			nc_bounding.setWidth(bounding.width());
 	}
 	//Adjust according to the NC
 	if (nc_bounding.height() > default_bounding.height() - header)
@@ -550,7 +673,8 @@ void CrossRefItem::drawAsCross(QPainter &painter)
 {
 	//calculate the size of the cross
 	setUpCrossBoundingRect(painter);
-	m_hovered_contacts_map.clear();
+	m_drawed_contacts = 0;
+	if (m_update_map) m_hovered_contacts_map.clear();

 	//Bounding rect is empty that mean there's no contact to draw
 	if (boundingRect().isEmpty()) return;
@@ -560,12 +684,11 @@ void CrossRefItem::drawAsCross(QPainter &painter)
 	painter.drawLine(br.width()/2, 0, br.width()/2, br.height());	//vertical line
 	painter.drawLine(0, header, br.width(), header);	//horizontal line

-	//Add the symbolic contacts
-	buildHeaderContact();
-	QPointF p((m_bounding_rect.width()/4) - (m_hdr_no_ctc.width()/2), 0);
-	painter.drawPicture (p, m_hdr_no_ctc);
-	p.setX((m_bounding_rect.width() * 3/4) - (m_hdr_nc_ctc.width()/2));
-	painter.drawPicture (p, m_hdr_nc_ctc);
+	//Add the symbolic contacts (drawn directly, no QPicture)
+	static const qreal hdr_symbol_width = 15.0;
+	QPointF no_pos((m_bounding_rect.width()/4) - (hdr_symbol_width/2), 0);
+	QPointF nc_pos((m_bounding_rect.width() * 3/4) - (hdr_symbol_width/2), 0);
+	buildHeaderContact(painter, no_pos, nc_pos);

 	//and fill it
 	fillCrossRef(painter);
@@ -582,7 +705,7 @@ void CrossRefItem::drawAsContacts(QPainter &painter)
 		return;

 	m_drawed_contacts = 0;
-	m_hovered_contacts_map.clear();
+	if (m_update_map) m_hovered_contacts_map.clear();
 	QRectF bounding_rect;

 	//Draw each linked contact
@@ -606,7 +729,7 @@ void CrossRefItem::drawAsContacts(QPainter &painter)
 			else if (type == "delayOff") option += DelayOff;
 			else if (type == "delayOnOff") option += DelayOnOff;

-			QRectF br = drawContact(painter, option, elmt);
+			QRectF br = drawContact(painter, option, elmt, i);
 			bounding_rect = bounding_rect.united(br);
 		}
 	}
@@ -625,19 +748,81 @@ void CrossRefItem::drawAsContacts(QPainter &painter)
 	@param elmt : the element to display text (the position of the contact)
 	@return The bounding rect of the draw (contact + text)
 */
-QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
+QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt, int pole_index)
 {
 	QString str = elementPositionText(elmt);

 	// Collect terminal names from the element definition (.elmt)
 	// e.g. name="13" and name="14" on each terminal
+	// For power contacts, sort numerically and pick the pair for pole_index.
+	// For SW contacts with typed terminals (No/Nc/Common), filter by role.
 	QStringList terminal_names;
+	const bool is_power_ctc =
+		elmt->kindInformations()["type"].toString() == "power";
+	const bool is_sw = (flags & SW) && !(flags & NOC);
+
+	// Check if SW terminals have explicit No/Nc/Common types
+	bool sw_has_typed_terminals = false;
+	if (is_sw) {
+		for (Terminal *t : elmt->terminals()) {
+			if (!t) continue;
+			if (t->terminalType() == TerminalData::No ||
+				t->terminalType() == TerminalData::Nc ||
+				t->terminalType() == TerminalData::Common) {
+				sw_has_typed_terminals = true;
+				break;
+			}
+		}
+	}
+
 	for (Terminal *t : elmt->terminals()) {
+		if (!t) continue;
 		const QString tname = t->name();
 		if (!tname.isEmpty())
 			terminal_names << tname;
 	}

+	if (is_power_ctc) {
+		// Sort terminals alphanumerically so names like "R1","R2"... or "1","2"...
+		// are ordered correctly. Extract trailing digits for numeric comparison;
+		// fall back to full string comparison when no digits are found.
+		std::sort(terminal_names.begin(), terminal_names.end(),
+			[](const QString &a, const QString &b){
+				// Extract trailing numeric part
+				int i_a = a.size();
+				while (i_a > 0 && a[i_a-1].isDigit()) --i_a;
+				int i_b = b.size();
+				while (i_b > 0 && b[i_b-1].isDigit()) --i_b;
+				bool a_ok = false, b_ok = false;
+				int ai = a.mid(i_a).toInt(&a_ok);
+				int bi = b.mid(i_b).toInt(&b_ok);
+				if (a_ok && b_ok && a.left(i_a) == b.left(i_b))
+					return ai < bi;
+				return a < b;
+			});
+		// Pick the pair for this pole: pole 0 → [0,1], pole 1 → [2,3], etc.
+		int idx = pole_index * 2;
+		if (idx + 1 < terminal_names.size())
+			terminal_names = QStringList() << terminal_names[idx] << terminal_names[idx+1];
+		else
+			terminal_names.clear();
+	} else if (is_sw && sw_has_typed_terminals) {
+		// Build [NO_name, Common_name, NC_name] from typed terminals
+		QString no_name, nc_name, common_name;
+		for (Terminal *t : elmt->terminals()) {
+			if (!t) continue;
+			if (!t->name().isEmpty()) {
+				if      (t->terminalType() == TerminalData::No)     no_name     = t->name();
+				else if (t->terminalType() == TerminalData::Nc)     nc_name     = t->name();
+				else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+			}
+		}
+		// drawText expects: [0]=NC, [1]=NO, [2]=Common
+		// (drawText uses [1] for NO top-left, [0] for NC bottom-left, [2] for Common right)
+		terminal_names.clear();
+		terminal_names << nc_name << no_name << common_name;
+	}
+
 	int offset = m_drawed_contacts*10;
 	QRectF bounding_rect = QRectF(0, offset, 24, 10);
 	
@@ -656,10 +841,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)

 		// Draw terminal names on each side of the contact symbol
 		// terminal_names[0] on the left, terminal_names[1] on the right
-		if (!terminal_names.isEmpty()) {
-			QFont font = QETApp::diagramTextsFont(4);
-			font.setBold(true);
-			painter.setFont(font);
+		if (!terminal_names.isEmpty() && m_properties.showTerminalName()) {
+			painter.setFont(QETApp::diagramTextsFont(4));
 			QRectF bt(0, offset, 24, 10);
 			if (terminal_names.size() >= 1)
 				painter.drawText(bt, Qt::AlignLeft|Qt::AlignTop, terminal_names[0]);
@@ -744,14 +927,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 		painter.drawText(text_rect, Qt::AlignLeft | Qt::AlignVCenter, str);
 		bounding_rect = bounding_rect.united(text_rect);

-		if (m_hovered_contacts_map.contains(elmt))
-		{
+		if (m_update_map)
 			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
-		else
-		{
-			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}

 		++m_drawed_contacts;
 	}
@@ -787,21 +964,19 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 		// terminal_names[0] = NO side (top left)
 		// terminal_names[1] = NC side (bottom left)
 		// terminal_names[2] = common side (right)
-		if (!terminal_names.isEmpty()) {
-			QFont font = QETApp::diagramTextsFont(4);
-			font.setBold(true);
-			painter.setFont(font);
+		if (!terminal_names.isEmpty() && m_properties.showTerminalName()) {
+			painter.setFont(QETApp::diagramTextsFont(4));
 			// Sort order from parseTerminal (top->bottom, left->right):
 			// [0]=12 (NO, top-left), [1]=14 (common, top-center), [2]=13 (NC, bottom-center)
 			if (terminal_names.size() >= 1)
 				painter.drawText(QRectF(0, offset, 8, 8),
-						Qt::AlignLeft|Qt::AlignTop, terminal_names[0]);   // 12 NO left
+						Qt::AlignLeft|Qt::AlignTop, terminal_names[1]);   // 12 NO left
 			if (terminal_names.size() >= 2)
 				painter.drawText(QRectF(16, offset+4, 8, 6),
-						Qt::AlignRight|Qt::AlignTop, terminal_names[1]); // 14 common right
+						Qt::AlignRight|Qt::AlignTop, terminal_names[2]); // 14 common right
 			if (terminal_names.size() >= 3)
 				painter.drawText(QRectF(0, offset+9, 8, 6),
-						Qt::AlignLeft|Qt::AlignTop, terminal_names[2]); // 13 NC left-bottom
+						Qt::AlignLeft|Qt::AlignTop, terminal_names[0]); // 13 NC left-bottom
 			painter.setFont(QETApp::diagramTextsFont(5));
 		}

@@ -836,12 +1011,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 				 str);
 		bounding_rect = bounding_rect.united(text_rect);

-		if (m_hovered_contacts_map.contains(elmt)) {
+		if (m_update_map)
 			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
-		else {
-			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}

 			//a switch contact take place of two normal contact
 		m_drawed_contacts += 2;
@@ -872,12 +1043,8 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt)
 					str);
 		bounding_rect = bounding_rect.united(text_rect);

-		if (m_hovered_contacts_map.contains(elmt)) {
+		if (m_update_map)
 			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
-		else {
-			m_hovered_contacts_map.insert(elmt, bounding_rect);
-		}
 		++m_drawed_contacts;
 	}
 		return bounding_rect;
@@ -903,7 +1070,60 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 		m_hovered_contact == elmt ? pen.setColor(Qt::blue) :pen.setColor(Qt::black);
 		painter.setPen(pen);

+		// Collect terminal names for NO column.
+		// Power: all terminals sorted numerically.
+		// SW with typed terminals: NO+Common pair.
+		// Others: first 2 named terminals.
+		const bool is_power_no =
+			elmt->kindInformations()["type"].toString() == "power";
+		const bool is_sw_no =
+			elmt->kindInformations()["state"].toString() == "SW";
+		QStringList tnames;
+		if (is_sw_no) {
+			bool has_typed = false;
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				if (t->terminalType() == TerminalData::No ||
+					t->terminalType() == TerminalData::Nc ||
+					t->terminalType() == TerminalData::Common) {
+					has_typed = true; break;
+				}
+			}
+			if (has_typed) {
+				QString no_name, common_name;
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					if (!t->name().isEmpty()) {
+						if      (t->terminalType() == TerminalData::No)     no_name     = t->name();
+						else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+					}
+				}
+				tnames << no_name << common_name;
+			} else {
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					const QString tn = t->name();
+					if (!tn.isEmpty()) { tnames << tn; if (tnames.size() >= 2) break; }
+				}
+			}
+		} else {
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				const QString tn = t->name();
+				if (!tn.isEmpty()) {
+					tnames << tn;
+					if (!is_power_no && tnames.size() >= 2) break;
+				}
+			}
+		}
+		QString terminal_label;
+		if (!tnames.isEmpty() && m_properties.showTerminalName())
+			terminal_label = QStringLiteral("[") + tnames.join("-") + QStringLiteral("]");
+
 		QString str = elementPositionText(elmt, true);
+		if (!terminal_label.isEmpty())
+			str = terminal_label + QStringLiteral(" ") + str;
+
 		QRectF bounding = painter.boundingRect(
 					QRectF(no_top_left,
 					       QSize(middle_cross, 1)),
@@ -911,13 +1131,11 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 					str);
 		painter.drawText(bounding, Qt::AlignLeft, str);

-		if (m_hovered_contacts_map.contains(elmt))
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
-		}
-		else
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
+		if (m_update_map) {
+			QString pos_str = elementPositionText(elmt, true);
+			QRectF pos_rect = painter.boundingRect(bounding, Qt::AlignRight, pos_str);
+			pos_rect.adjust(-2, -1, 2, 1); // extend hit area slightly
+			m_hovered_contacts_map.insert(elmt, pos_rect);
 		}

 		no_top_left.ry() += bounding.height();
@@ -932,7 +1150,60 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 					  :pen.setColor(Qt::black);
 		painter.setPen(pen);

+		// Collect terminal names for NC column.
+		// Power: all terminals sorted numerically.
+		// SW with typed terminals: NC+Common pair.
+		// Others: first 2 named terminals.
+		const bool is_power_nc =
+			elmt->kindInformations()["type"].toString() == "power";
+		const bool is_sw_nc =
+			elmt->kindInformations()["state"].toString() == "SW";
+		QStringList tnames_nc;
+		if (is_sw_nc) {
+			bool has_typed = false;
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				if (t->terminalType() == TerminalData::No ||
+					t->terminalType() == TerminalData::Nc ||
+					t->terminalType() == TerminalData::Common) {
+					has_typed = true; break;
+				}
+			}
+			if (has_typed) {
+				QString nc_name, common_name;
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					if (!t->name().isEmpty()) {
+						if      (t->terminalType() == TerminalData::Nc)     nc_name     = t->name();
+						else if (t->terminalType() == TerminalData::Common) common_name = t->name();
+					}
+				}
+				tnames_nc << nc_name << common_name;
+			} else {
+				for (Terminal *t : elmt->terminals()) {
+					if (!t) continue;
+					const QString tn = t->name();
+					if (!tn.isEmpty()) { tnames_nc << tn; if (tnames_nc.size() >= 2) break; }
+				}
+			}
+		} else {
+			for (Terminal *t : elmt->terminals()) {
+				if (!t) continue;
+				const QString tn = t->name();
+				if (!tn.isEmpty()) {
+					tnames_nc << tn;
+					if (!is_power_nc && tnames_nc.size() >= 2) break;
+				}
+			}
+		}
+		QString terminal_label;
+		if (!tnames_nc.isEmpty() && m_properties.showTerminalName())
+			terminal_label = QStringLiteral("[") + tnames_nc.join("-") + QStringLiteral("]");
+
 		QString str = elementPositionText(elmt, true);
+		if (!terminal_label.isEmpty())
+			str = terminal_label + QStringLiteral(" ") + str;
+
 		QRectF bounding = painter.boundingRect(
 					QRectF(nc_top_left,
 					       QSize(middle_cross, 1)),
@@ -940,13 +1211,11 @@ void CrossRefItem::fillCrossRef(QPainter &painter)
 					str);
 		painter.drawText(bounding, Qt::AlignRight, str);

-		if (m_hovered_contacts_map.contains(elmt))
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
-		}
-		else
-		{
-			m_hovered_contacts_map.insert(elmt, bounding);
+		if (m_update_map) {
+			QString pos_str = elementPositionText(elmt, true);
+			QRectF pos_rect = painter.boundingRect(bounding, Qt::AlignRight, pos_str);
+			pos_rect.adjust(-2, -1, 2, 1); // extend hit area slightly
+			m_hovered_contacts_map.insert(elmt, pos_rect);
 		}

 		nc_top_left.ry() += bounding.height();
@@ -22,7 +22,6 @@

 #include <QGraphicsObject>
 #include <QMultiMap>
-#include <QPicture>

 class Element;
 class DynamicElementTextItem;
@@ -103,11 +102,11 @@ class CrossRefItem : public QGraphicsObject

 	private:
 		void linkedChanged();
-		void buildHeaderContact();
+		void buildHeaderContact(QPainter &painter, QPointF no_pos, QPointF nc_pos);
 		void setUpCrossBoundingRect(QPainter &painter);
 		void drawAsCross(QPainter &painter);
 		void drawAsContacts(QPainter &painter);
-		QRectF drawContact(QPainter &painter, int flags, Element *elmt);
+		QRectF drawContact(QPainter &painter, int flags, Element *elmt, int pole_index = 0);
 		void fillCrossRef(QPainter &painter);
 		void AddExtraInfo(QPainter &painter, const QString&);
 		QList<Element *> NOElements() const;
@@ -117,10 +116,10 @@ class CrossRefItem : public QGraphicsObject
 	private:
 		Element *m_element; //element to display the cross reference
 		QRectF m_bounding_rect;
-		QPicture m_drawing, m_hdr_no_ctc, m_hdr_nc_ctc;
 		QPainterPath m_shape_path;
 		XRefProperties m_properties;
 		int m_drawed_contacts;
+		bool m_update_map = false;
 		QMultiMap <Element *, QRectF> m_hovered_contacts_map;
 		Element *m_hovered_contact = nullptr;
 		DynamicElementTextItem *m_text = nullptr;
@@ -26,7 +26,7 @@
 #include "crossrefitem.h"
 #include "element.h"
 #include "elementtextitemgroup.h"
-
+#include <QTimer>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QGraphicsSceneMouseEvent>
@@ -1104,7 +1104,10 @@ void DynamicElementTextItem::updateLabel()
 void DynamicElementTextItem::conductorWasAdded(Conductor *conductor)
 {
 	Q_UNUSED(conductor)
-	setPotentialConductor();
+	QTimer::singleShot(100, this, [this]() {
+		setPotentialConductor();
+		conductorPropertiesChanged();
+	});
 }

 /**
@@ -753,6 +753,15 @@ QString Terminal::name() const
 	return d->m_name;
 }

+/**
+	@brief Terminal::terminalType
+	@return the type of this terminal (Generic, Inner, Outer, No, Nc, Common)
+*/
+TerminalData::Type Terminal::terminalType() const
+{
+	return d->m_type;
+}
+
 /**
 	@brief Conductor::relatedPotentialTerminal
 	Return terminal at the same potential from the same
@@ -18,13 +18,14 @@
 #ifndef TERMINAL_H
 #define TERMINAL_H
 #include "../qet.h"
+#include "../properties/terminaldata.h"

 #include <QtWidgets>
 #include <QtXml>
 class Conductor;
 class Diagram;
 class Element;
-class TerminalData;
+

 /**
 	@brief The Terminal class
@@ -75,6 +76,7 @@ class Terminal : public QGraphicsObject
 		Element  *parentElement       () const;
 		QUuid     uuid                () const;
 		QString   name                () const;
+		TerminalData::Type terminalType() const;

 		QList<Conductor *> conductors() const;
 		Qet::Orientation orientation() const;
@@ -276,14 +276,7 @@ bool QETXML::writeXmlFile(
 	}

 	QTextStream out(&file);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	out.setCodec("UTF-8");
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	out.setEncoding(QStringConverter::Utf8);
-#endif
 	out.setGenerateByteOrderMark(false);
 	out << xml_document.toString(4);
 	file.close();
@@ -20,6 +20,7 @@

 #include <QDomElement>
 #include <QPen>
+#include <QUuid>

 class QDomDocument;
 class QDir;
@@ -70,25 +70,6 @@ void QGIManager::release(QGraphicsItem *qgi) {
 	}
 }

-/**
-	Demande au QGIManager de gerer plusieurs QGI
-	@param qgis QGraphicsItems a gerer
-*/
-void QGIManager::manage(const QList<QGraphicsItem *> &qgis) {
-	foreach(QGraphicsItem *qgi, qgis) manage(qgi);
-}
-
-/**
-	Indique au QGIManager que pour chaque QGI fourni, une reference vers celui-ci
-	a ete detruite.
-	S'il n'y a plus de references vers un QGI et que celui-ci n'est pas present
-	sur la scene de ce QGIManager, alors il sera detruit.
-	@param qgis QGraphicsItems a ne plus gerer
-*/
-void QGIManager::release(const QList<QGraphicsItem *> &qgis) {
-	foreach(QGraphicsItem *qgi, qgis) release(qgi);
-}
-
 void QGIManager::manage(const QVector<QGraphicsItem *> &items) {
 	for (const auto &qgi : items) {
 		manage(qgi);
@@ -45,10 +45,6 @@ class QGIManager {
 	public:
 	void manage(QGraphicsItem *);
 	void release(QGraphicsItem *);
-	QT_DEPRECATED_X("Use QGIManager::manage(const QVector<QGraphicsItem *> &) instead")
-		void manage(const QList<QGraphicsItem *> &);
-	QT_DEPRECATED_X("Use QGIManager::release(const QVector<QGraphicsItem *> &) instead")
-		void release(const QList<QGraphicsItem *> &);
 	void manage(const QVector<QGraphicsItem *> &items);
 	void release(const QVector<QGraphicsItem *> &items);
 	void setDestroyQGIOnDelete(bool);
@@ -255,14 +255,7 @@ void QTextOrientationWidget::paintEvent(QPaintEvent *event) {
 */
 void QTextOrientationWidget::mouseMoveEvent(QMouseEvent *event) {
 	if (read_only_) return;
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	bool drawn_angle_hovered = positionIsASquare(event -> localPos(), &highlight_angle_);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	bool drawn_angle_hovered = positionIsASquare(event -> position(), &highlight_angle_);
-#endif

 	if (must_highlight_angle_ != drawn_angle_hovered) {
 		must_highlight_angle_ = drawn_angle_hovered;
@@ -278,14 +271,7 @@ void QTextOrientationWidget::mouseReleaseEvent(QMouseEvent *event) {
 	if (read_only_) return;

 	double clicked_angle;
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
-	bool drawn_angle_clicked = positionIsASquare(event -> localPos(), &clicked_angle);
-#else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
 	bool drawn_angle_clicked = positionIsASquare(event -> position(), &clicked_angle);
-#endif
 	if (drawn_angle_clicked) {
 		setOrientation(clicked_angle);
 		emit(orientationChanged(clicked_angle));
@@ -16,7 +16,6 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "recentfiles.h"
-#include "qeticons.h"
 #include <QMenu>

 /**
@@ -33,7 +32,7 @@ RecentFiles::RecentFiles(const QString &identifier, int size, QObject *parent) :
 	menu_(nullptr)
 {
 	mapper_ = new QSignalMapper(this);
-	connect(mapper_, SIGNAL(mapped(const QString &)), this, SLOT(handleMenuRequest(const QString &)));
+	connect(mapper_, &QSignalMapper::mappedString, this, &RecentFiles::fileOpeningRequested);

 	extractFilesFromSettings();
 	buildMenu();
@@ -103,13 +102,6 @@ void RecentFiles::save()
 	saveFilesToSettings();
 }

-/**
-	Gere les actions sur le menu
-*/
-void RecentFiles::handleMenuRequest(const QString &filepath) {
-	emit(fileOpeningRequested(filepath));
-}
-
 /**
 	Gere le fait qu'un fichier ait ete ouvert
 	@param filepath Chemin du fichier ouvert
@@ -193,6 +185,6 @@ void RecentFiles::buildMenu()

 		// lie l'action et le mapper
 		mapper_ -> setMapping(action, filepath);
-		connect(action, SIGNAL(triggered()), mapper_, SLOT(map()));
+		connect(action, &QAction::triggered, mapper_,  qOverload<>(&QSignalMapper::map));
 	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Trinques	f16cf7dac8	Merge remote-tracking branch 'origin/master' into qt6_cmake_joshua # Conflicts: # CMakeLists.txt	2026-05-28 09:32:07 +02:00
Laurent Trinques	471d1f2538	Merge pull request #470 from Kellermorph/makro-fix Fix: Wiring list filter and dynamic text timing	2026-05-27 06:19:06 +02:00
Kellermorph	dc52105868	Fix: Wiring list filter and dynamic text timing	2026-05-26 18:31:37 +02:00
Laurent Trinques	1b8dc5f410	texteditor: set font size spinbox minimum to 4pt to prevent SIGSEGV	2026-05-25 13:14:57 +02:00
Laurent Trinques	26d5d019cc	texteditor: fix SIGSEGV caused by font size spinbox reaching 0	2026-05-25 13:04:37 +02:00
Laurent Trinques	6dd7c2d926	crossrefitem: fix SIGSEGV crash + improve double-click navigation + fix PDF/SVG/print rendering Windows Build / build-windows (push) Has been cancelled Details Test Windows VS2026 migration / Build on windows-2025-vs2026 (push) Has been cancelled Details Windows Build / deploy-pages (push) Has been cancelled Details Fix a use-after-free crash (SIGSEGV in QRegion::begin, Qt5Gui+0x49af60) confirmed by analysis of 19 coredumps. The crash was triggered when the scene viewport clip region was freed during zoom/resize events while QPicture::play() replayed drawPolyline commands through the scene painter. Qt's raster engine then dereferenced a stale QRegionData pointer. Root cause: CrossRefItem used three nested QPicture objects (m_drawing, m_hdr_no_ctc, m_hdr_nc_ctc). The nested drawPicture() calls amplified the use-after-free risk on any repaint event. Fix: remove all QPicture from CrossRefItem entirely. - updateLabel() now uses a QImage-backed dummy painter to compute m_bounding_rect, m_shape_path and m_hovered_contacts_map geometry. A bool m_update_map flag prevents the map from being overwritten during paint(). - paint() calls drawAsCross()/drawAsContacts() directly on the scene painter — no QPicture::play() anywhere in the class. - buildHeaderContact() now draws NO/NC symbols directly onto the painter instead of recording them into QPicture members. Also fix mouseDoubleClickEvent: the element under the click is now found directly from m_hovered_contacts_map using the event position, rather than relying on m_hovered_contact which could be reset by hoverMoveEvent between the two clicks of a double-click. Also remove setBold(true) on terminal name labels: the Qt PDF/SVG/print engine rendered bold at 4pt as extremely thick glyphs, making exports unreadable. Normal weight at 4pt is correct and legible on all backends. Fixes: SIGSEGV in CrossRefItem::paint() on zoom/resize Fixes: double-click navigation unreliable on Xref contact symbols Fixes: terminal name labels unreadable in PDF/SVG/print export	2026-05-24 16:00:45 +02:00
Laurent Trinques	47796e183a	Update translation files	2026-05-23 19:28:22 +02:00
Laurent Trinques	ddf5ffcd89	xref: add option to hide terminal names in cross-references Add a new boolean property 'showTerminalName' (default: true) to XRefProperties, with full persistence in XML and QSettings. A new checkbox "Afficher les numéros de bornes dans les Xrefs" is added to the XRefPropertiesWidget in the main display group (not in the cross-only group), so it is active in both Cross and Contacts modes. When unchecked, terminal names are hidden in all three rendering paths: - drawContact() (Contacts mode: NO/NC/SW symbols) - fillCrossRef() (Cross mode: NO and NC columns) - setUpCrossBoundingRect() (Cross mode: bounding rect sizing) Backward compatible: existing project files without the attribute default to showTerminalName=true (no visual change). Files changed: sources/properties/xrefproperties.h sources/properties/xrefproperties.cpp sources/ui/xrefpropertieswidget.ui sources/ui/xrefpropertieswidget.cpp sources/qetgraphicsitem/crossrefitem.cpp	2026-05-23 19:23:43 +02:00
Laurent Trinques	7d718bb9a0	crossrefitem: fix terminal name sorting for power contacts The previous sort used QString::toInt() to order terminal names, which returns 0 for any string containing a non-numeric prefix (e.g. "R1", "R2", "L1", "L2"...). This caused undefined sort order and incorrect pole pairing in the Xref contact mirror. Example: a 4-pole NC power contact with terminals R1..R8 was displaying R1/R3, R5/R7, R2/R4, R6/R8 instead of the correct R1/R2, R3/R4, R5/R6, R7/R8. Fix: extract the trailing numeric part of each terminal name and compare prefixes separately. If both names share the same prefix and both have a trailing number, sort numerically on that number; otherwise fall back to full string comparison. This covers all naming conventions: "1"/"2"/"3", "R1"/"R2"/"R3", "L1"/"L2"/"L3", etc. Applied in both drawContact() and setUpCrossBoundingRect().	2026-05-23 15:50:11 +02:00
Laurent Trinques	d949e6eb8c	crossrefitem: fix SIGSEGV when dropping power NC contact on diagram Three bugs were causing a crash (SIGSEGV in QRegion::begin) when a power NC slave element was placed on a folio, even before linking it to a master element. 1. m_drawing (QPicture) was never reset between updateLabel() calls. QPicture accumulates paint commands — calling qp.begin() on an existing QPicture appends to it rather than replacing its content. After several updates (load, move, hover...) the picture became corrupted and crashed on play(). Fix: reset m_drawing = QPicture() at the start of updateLabel(). 2. m_drawed_contacts was only initialized to 0 in drawAsContacts(), but not in drawAsCross(). When drawing in Cross mode, fillCrossRef() called drawContact() with an uninitialized m_drawed_contacts value, producing a garbage offset. The NC contact symbol uses drawPolyline() with a sub-pixel Y coordinate (offset+2.5); with a random offset Qt generated an invalid QRegion and crashed. This explains why NC contacts crashed but NO contacts did not: the NO symbol only uses drawLine() which is more tolerant of bad coords. Fix: add m_drawed_contacts = 0 at the start of drawAsCross(). 3. setUpCrossBoundingRect() used QRectF() (null rect) as the reference rect for painter.boundingRect(), which can return invalid dimensions. Additionally, height was accumulated incorrectly: united() + setHeight() doubled the height at each iteration, causing an exponentially growing bounding rect with multiple contacts. Fix: use QRectF(0, 0, 500, 20) as reference rect and accumulate height and width independently.	2026-05-23 15:32:28 +02:00
Laurent Trinques	dbda958261	terminaldata: add No, Nc, Common types for SW contacts Extend TerminalData::Type enum with three new semantic values: - No : Normally Open terminal of a switch (SW) contact - Nc : Normally Closed terminal of a switch (SW) contact - Common : Common terminal of a switch (SW) contact Update typeToString() and typeFromString() accordingly. Fully backward compatible: existing Generic/Inner/Outer types are unchanged. Elements without typed terminals fall back to the previous behavior (first 2 named terminals). terminal: expose terminalType() as public accessor Add Terminal::terminalType() returning the TerminalData::Type of this terminal. This allows crossrefitem and other consumers to filter terminals by semantic role (No, Nc, Common) without accessing TerminalData internals directly. terminaleditor: add No, Nc, Common entries to type combobox Expose the three new TerminalData types (No, Nc, Common) in the element editor UI so users can assign a semantic role to each terminal of a SW contact element. Also fix a pre-existing bug in updateForm() where m_type_cb was incorrectly using m_orientation_cb->findData() instead of m_type_cb->findData(), preventing the type from being restored correctly when selecting a terminal. terminaleditor: add No, Nc, Common entries to type combobox Expose the three new TerminalData types (No, Nc, Common) in the element editor UI so users can assign a semantic role to each terminal of a SW contact element. Also fix a pre-existing bug in updateForm() where m_type_cb was incorrectly using m_orientation_cb->findData() instead of m_type_cb->findData(), preventing the type from being restored correctly when selecting a terminal.	2026-05-23 02:09:32 +02:00
joshua	2d4f968348	Fix crash when collapse root item of macro element tree view Add an icon to the macro type of FileElementCollectionItem. The first time the model (ElementsCollectionModel) ask for decoration role the FileElementCollectionItem check if icon is null, if true the icon is set, if false the function return. In the case of the macro type, befor this commit the macro have a null icon, and so the setIcon is call each time (many) the mouse move hover and cause a qet crash. This commit fix that, only by setUp an icon	2026-05-06 00:20:07 +02:00
joshua	6f669e1074	Merge branch 'master' into qt6_cmake_joshua	2026-05-05 20:11:05 +02:00
joshua	0b91318749	Remove several QT_VERSION_CHECK Remove several QT_VERSION_CHECK related to Qt5 and Qt4.	2026-03-19 19:54:51 +01:00
joshua	1ba97c7e92	Remove hoto_update_cmake_message.cmake	2026-03-03 21:45:48 +01:00
joshua	cd09fc0d32	Re-enable git_update_submodules.cmake Re-enable git_update_submodules.cmake, use for update the elements repo. Remove the unused include : fetch_elements.cmake	2026-03-03 21:44:35 +01:00
Laurent Trinques	924fe082fb	Update fr_window_build_msys2.md	2026-03-03 06:56:24 +01:00
joshua	ad37b0f9a5	Add documentation for build under Windows The documentation is available in french only. Contributors, feel free to create a new documentation in English (create a new directory named 'en' for this purpose).	2026-03-02 22:47:32 +01:00
joshua	fedc1cb092	Made available compilation on windows with msys2 The aim of this commit is to easily build qelectrotech under windows with qt6/cmake and the package tool MSYS2. -Update some cmake file. -Remove Git submodule for pugixml and single application -Use cmake find_package for pugi xml -Use cmake fetchContent for single application. -Use cmake find_package for KCoreAddons and KWidgetsAddons. -Minor change for pugi xml -Minor change on ProjectPrintWindow class to compatible with Qt6 API.	2026-03-02 22:34:16 +01:00
joshua	5f318e09c8	Add forgotten file and folder. Add folder and file to cmake.	2026-01-30 19:43:07 +01:00
joshua	27afeaefe2	Upgrade pugixml version. Upgrade pugixml to be compatible with cmake >= 4.0.0. Compatibility with CMake < 3.5 has been removed from CMake since 4.0.0. Pugixml V1.11.4 used cmake 3.4. Latest version V1.15 use cmake VERSION 3.5...3.30	2026-01-30 18:46:21 +01:00
joshua	ab2f933fdf	Re-enable multi-threading to load collection The name of the elements and folders of the collection are not displayed until we hover the item with the mouse. This due that QtConcurent::run was disabled at loading of collection in the goal of use QtConcurrent::run with Qt6. Run is made to run a function once. Map is made to run a fonction for each item of a sequence (what we need in this case). Remove code of run and re-enable code for map.	2026-01-28 19:47:04 +01:00
joshua	7f718f672f	Fix : can't open recent file	2026-01-28 00:15:09 +01:00
joshua	9ec02bc088	Build with qt6 and cmake First build with qt6 and cmake. QET compil, but a lot of things don't work. Build tested on debian sid and ubuntu 25.04. Dependency needed under debian and ubuntu : qtcreator cmake qt6-tools-dev qt6-svg-dev libsqlite3-dev libkf6coreaddons-dev extra-cmake-modules libkf6widgetsaddons-dev	2026-01-27 23:31:34 +01:00