Revert "some minor changes"

.gitattributes

@@ -1 +0,0 @@
-*.qch filter=lfs diff=lfs merge=lfs -text

.github/workflows/auto-doxygen.yml

@@ -1,68 +0,0 @@
-name: Auto-build doxygen docs
-on:
-  push:
-    tags:
-       - '**'
-   
-  
-  
-jobs:  
-  doxygen:
-    permissions:
-       contents: write    
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-        show-progress: ''
-    - name: Setup and run doxygen
-      run: sudo apt update && sudo apt install doxygen graphviz qhelpgenerator-qt5 -y
-    - name: Set up Git LFS
-      run: |
-          git lfs install
-          git lfs track "*.qch"  
-    - name: Run doxygen
-      run: doxygen Doxyfile
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8
-      with:
-        token: ${{ secrets.MR_TOKEN }}
-        commit-message: update QCH file
-        committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
-        title: Update QCH Help file
-        body: |
-         - Updating QT Help file following commit ${{ github.sha }}.
-         - Auto-generated by [create-pull-request][1]
-
-         [1]: https://github.com/peter-evans/create-pull-request
-        branch: update-qch
-        labels: | 
-          qch
-          cicd
-        delete-branch: true
-        add-paths: doc/*.qch
-    - uses: actions/upload-pages-artifact@v3
-      with: 
-       path: ${{ github.workspace }}/doc/html/
-  deploy:
-    # Add a dependency to the build job
-    needs: doxygen
-
-    # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
-    permissions:
-      pages: write      # to deploy to Pages
-      id-token: write   # to verify the deployment originates from an appropriate source
-
-    # Deploy to the github-pages environment
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-
-    # Specify runner + deployment step
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action

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

@@ -0,0 +1,22 @@
+name: Publish Edge Snap
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish_amd64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Checkout submodules
+      run: git submodule update --init --recursive
+    - uses: snapcore/action-build@v1
+      id: build
+    - uses: snapcore/action-publish@v1
+      env:
+        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+      with:
+        snap: ${{ steps.build.outputs.snap }}
+        release: stable

.github/workflows/windows-build.yml

@@ -1,288 +0,0 @@
-name: Windows Build
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build-windows:
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          update: true
-          cache: true
-          install: >-
-            mingw-w64-ucrt-x86_64-gcc
-            mingw-w64-ucrt-x86_64-cmake
-            mingw-w64-ucrt-x86_64-ninja
-            mingw-w64-ucrt-x86_64-qt5-base
-            mingw-w64-ucrt-x86_64-qt5-svg
-            mingw-w64-ucrt-x86_64-qt5-tools
-            mingw-w64-ucrt-x86_64-qt5-translations
-            mingw-w64-ucrt-x86_64-sqlite3
-            mingw-w64-ucrt-x86_64-pkg-config
-            mingw-w64-ucrt-x86_64-kwidgetsaddons
-            mingw-w64-ucrt-x86_64-kcoreaddons
-            mingw-w64-ucrt-x86_64-extra-cmake-modules
-            mingw-w64-ucrt-x86_64-nsis
-            mingw-w64-ucrt-x86_64-angleproject
-
-      - name: Force Qt5 — supprimer Qt6 cmake + tools
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          rm -rf /ucrt64/lib/cmake/Qt6
-          pacman -R --noconfirm mingw-w64-ucrt-x86_64-qt6-tools 2>/dev/null || true
-          echo "=== windeployqt binaries ==="
-          ls /ucrt64/bin/windeployqt* || echo "AUCUN windeployqt trouve !"
-
-      - name: Build with cmake
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          cd "$GITHUB_WORKSPACE"
-          mkdir build && cd build
-          cmake -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_PREFIX_PATH=/ucrt64 \
-            -DQt5_DIR=/ucrt64/lib/cmake/Qt5 \
-            -DQT_VERSION_MAJOR=5 \
-            -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON \
-            -DBUILD_TESTING=OFF \
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-            ..
-          ninja
-
-      - name: Verify exe was built
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1)
-          if [ -z "$EXE" ]; then
-            echo "ERROR: aucun qelectrotech.exe trouve dans build/"
-            find "$GITHUB_WORKSPACE/build" -maxdepth 3 -name "*.exe" || true
-            exit 1
-          fi
-          SIZE=$(stat -c%s "$EXE")
-          echo "Exe trouve : $EXE ($SIZE octets)"
-          [ "$SIZE" -gt 100000 ] || { echo "ERROR: exe trop petit"; exit 1; }
-
-      - name: Deploy — copie exe + windeployqt + DLLs
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          NSIS_ROOT="$GITHUB_WORKSPACE/nsis_root"
-          FILES="$NSIS_ROOT/files"
-          BIN="$FILES/bin"
-          mkdir -p "$BIN"
-
-          EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1)
-          echo "Copie exe : $EXE -> $BIN/QElectroTech.exe"
-          cp "$EXE" "$BIN/QElectroTech.exe"
-
-          cd "$BIN"
-          /ucrt64/bin/windeployqt-qt5 \
-            --release \
-            --no-translations \
-            --no-compiler-runtime \
-            --no-opengl-sw \
-            ./QElectroTech.exe || true
-          ls -lh "$BIN/QElectroTech.exe" || { echo "ERROR: exe absent de bin/"; exit 1; }
-          DLL_COUNT=$(find "$BIN" -name "*.dll" | wc -l)
-          echo "DLLs presentes : $DLL_COUNT"
-          [ "$DLL_COUNT" -gt 5 ] || { echo "ERROR: trop peu de DLLs"; exit 1; }
-          cd "$GITHUB_WORKSPACE"
-
-          # --- DLLs runtime compilateur (non copiées par windeployqt) ---
-          # --- DLLs runtime : copie automatique via ldd ---
-          # On copie d'abord les DLLs garanties (runtime GCC + KF5 + ICU)
-          # car ldd ne les liste pas toujours toutes (chargement dynamique).
-          echo "=== Copie DLLs runtime garanties ==="
-          UCRT=/ucrt64/bin
-          for dll in \
-            libgcc_s_seh-1.dll \
-            libstdc++-6.dll \
-            libwinpthread-1.dll \
-            libgomp-1.dll; do
-            [ -f "$UCRT/$dll" ] && cp -v "$UCRT/$dll" "$BIN/" || echo "WARN: $dll non trouve"
-          done
-          cp -v "$UCRT"/libicu*.dll "$BIN/" 2>/dev/null || echo "WARN: libicu*.dll non trouvees"
-          cp -v "$UCRT"/KF5*.dll   "$BIN/" 2>/dev/null || echo "WARN: KF5*.dll non trouvees"
-
-          # Copie automatique de toutes les dependances UCRT64 detectees par ldd
-          echo "=== Copie automatique dependances ldd ==="
-          ldd "$BIN/QElectroTech.exe" \
-            | grep -i '/ucrt64/bin/' \
-            | awk '{print $3}' \
-            | while read -r dep; do
-                cp -v "$dep" "$BIN/" 2>/dev/null || true
-              done
-
-          # Passe recursive : certaines DLLs ont elles-memes des dependances UCRT64
-          echo "=== Passe recursive sur les DLLs copiees ==="
-          find "$BIN" -maxdepth 1 -name "*.dll" | while read -r lib; do
-            ldd "$lib" 2>/dev/null \
-              | grep -i '/ucrt64/bin/' \
-              | awk '{print $3}' \
-              | while read -r dep; do
-                  [ -f "$BIN/$(basename "$dep")" ] || cp -v "$dep" "$BIN/" 2>/dev/null || true
-                done
-          done
-
-          echo "DLLs totales apres runtime : $(find "$BIN" -name '*.dll' | wc -l)"
-
-          # --- Diagnostic final ---
-          echo "=== ldd — dependances non resolues ==="
-          ldd "$BIN/QElectroTech.exe" | grep -i "not found" || echo "Aucune dependance manquante detectee"
-
-          cp -r "$GITHUB_WORKSPACE/elements"    "$FILES/elements"    || true
-          cp -r "$GITHUB_WORKSPACE/lang"        "$FILES/lang"        || true
-          cp -r "$GITHUB_WORKSPACE/titleblocks" "$FILES/titleblocks" || true
-          cp -r "$GITHUB_WORKSPACE/examples"    "$FILES/examples"    || true
-          cp -r "$GITHUB_WORKSPACE/fonts"       "$FILES/fonts"       || true
-          cp -r "$GITHUB_WORKSPACE/ico"         "$FILES/ico"         || true
-
-          for f in LICENSE ChangeLog CREDIT README ELEMENTS.LICENSE \
-                   qet_uninstall_file_associations.reg register_filetypes.bat; do
-            cp "$GITHUB_WORKSPACE/$f" "$FILES/$f" 2>/dev/null || true
-          done
-
-          cp "$GITHUB_WORKSPACE/build-aux/windows/QET64.nsi"              "$NSIS_ROOT/"
-          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra.nsh"         "$NSIS_ROOT/" || true
-          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_fr.nsh"      "$NSIS_ROOT/" || true
-          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_missing.nsh" "$NSIS_ROOT/" || true
-          cp -r "$GITHUB_WORKSPACE/build-aux/windows/images"              "$NSIS_ROOT/" || true
-
-          if [ -f "$GITHUB_WORKSPACE/build-aux/windows/Lancer QET.bat" ]; then
-            cp "$GITHUB_WORKSPACE/build-aux/windows/Lancer QET.bat" "$NSIS_ROOT/"
-          else
-            printf '@echo off\r\nstart "" "%%~dp0bin\\QElectroTech.exe" %%*\r\n' \
-              > "$NSIS_ROOT/Lancer QET.bat"
-          fi
-
-      - name: Ensure NSIS images (wizard.bmp + header.bmp)
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          IMG_SRC="$GITHUB_WORKSPACE/build-aux/windows/images"
-          IMG_DST="$GITHUB_WORKSPACE/nsis_root/images"
-          mkdir -p "$IMG_DST"
-
-          if [ -f "$IMG_SRC/wizard.bmp" ] && [ -f "$IMG_SRC/header.bmp" ]; then
-            echo "Images trouvees dans le repo, copie directe."
-            cp "$IMG_SRC/wizard.bmp" "$IMG_DST/wizard.bmp"
-            cp "$IMG_SRC/header.bmp" "$IMG_DST/header.bmp"
-          else
-            echo "Images absentes du repo — generation avec ImageMagick."
-            # wizard.bmp : 164x314 px, fond bleu QET, texte blanc
-            convert \
-              -size 164x314 \
-              gradient:"#1a3a5c"-"#2e6da4" \
-              -gravity Center \
-              -fill white \
-              -pointsize 13 \
-              -annotate 0 "QElectroTech" \
-              -type TrueColor \
-              BMP3:"$IMG_DST/wizard.bmp"
-            # header.bmp : 150x57 px, même palette
-            convert \
-              -size 150x57 \
-              gradient:"#1a3a5c"-"#2e6da4" \
-              -gravity Center \
-              -fill white \
-              -pointsize 11 \
-              -annotate 0 "QElectroTech" \
-              -type TrueColor \
-              BMP3:"$IMG_DST/header.bmp"
-            echo "BMPs generes."
-          fi
-
-          echo "Contenu de nsis_root/images/ :"
-          ls -lh "$IMG_DST/"
-
-      - name: Extract version for installer name
-        shell: msys2 {0}
-        id: qet_version
-        run: |
-          set -euo pipefail
-          VERSION=$(grep -A5 '^project(' "$GITHUB_WORKSPACE/CMakeLists.txt" \
-            | grep -oP '(?<=VERSION )[0-9]+\.[0-9]+[0-9.]*' | head -1 || true)
-          [ -z "$VERSION" ] && VERSION="dev"
-          GIT_SHORT=$(git -C "$GITHUB_WORKSPACE" rev-parse --short HEAD 2>/dev/null || echo "unknown")
-          FULL_VERSION="${VERSION}+git${GIT_SHORT}_x86_64-win64"
-          echo "version=$FULL_VERSION" >> "$GITHUB_OUTPUT"
-          echo "Detected version: $FULL_VERSION"
-
-      - name: Patch QET64.nsi — version uniquement
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          VERSION="${{ steps.qet_version.outputs.version }}"
-          NSI="$GITHUB_WORKSPACE/nsis_root/QET64.nsi"
-
-          # Patch version uniquement.
-          # Tous les chemins du .nsi sont relatifs (./files/, .\images\) et
-          # sont resolus par makensis depuis nsis_root/ — aucun patch necessaire.
-          sed -i "s|!define SOFT_VERSION .*|!define SOFT_VERSION \"${VERSION}\"|" "$NSI"
-
-          echo '=== SOFT_VERSION ==='
-          grep 'SOFT_VERSION' "$NSI"
-          echo '=== Structure nsis_root ==='
-          ls "$GITHUB_WORKSPACE/nsis_root/"
-          echo '=== Contenu files/bin (premiers fichiers) ==='
-          ls "$GITHUB_WORKSPACE/nsis_root/files/bin/" | head -10
-
-      - name: Build NSIS installer
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          cd "$GITHUB_WORKSPACE/nsis_root"
-          makensis QET64.nsi
-
-      - name: Move installer to dist/
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          mkdir -p "$GITHUB_WORKSPACE/dist"
-          mv "$GITHUB_WORKSPACE/nsis_root"/Installer_QElectroTech-*.exe \
-             "$GITHUB_WORKSPACE/dist/"
-
-      - name: Upload build logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs
-          path: |
-            build/CMakeFiles/*.log
-            nsis_root/files/bin/
-          if-no-files-found: warn
-
-      - name: Upload portable (files/ sans installeur)
-        uses: actions/upload-artifact@v4
-        with:
-          name: qelectrotech-windows-portable
-          path: nsis_root/files/
-          retention-days: 14
-
-      - name: Upload NSIS installer
-        uses: actions/upload-artifact@v4
-        with:
-          name: qelectrotech-windows-installer
-          path: dist/Installer_QElectroTech-*.exe
-          retention-days: 14

.gitignore

@@ -3,7 +3,5 @@
 # Qt build output
 *.user
 # doxygen Doxyfile output
-doc/*
-!doc/QElectroTech.qch
+doc/
 QElectroTech.tag
-!doc/doc-utils

.gitmodules

@@ -8,6 +8,3 @@
 	path = elements
 	url = https://github.com/qelectrotech/qelectrotech-elements.git
 
-[submodule "doxygen-awesome-css"]
-	path = doxygen-awesome-css
-	url = https://github.com/jothepro/doxygen-awesome-css.git

CMakeLists.txt

@@ -14,10 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 
-cmake_minimum_required(VERSION 3.5...4.2)
+include(cmake/hoto_update_cmake_message.cmake)
+
+cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
 
 project(qelectrotech
-  VERSION 0.100.0
+  VERSION 0.9.0
   DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
   HOMEPAGE_URL "https://qelectrotech.org/"
   LANGUAGES CXX)
@@ -25,16 +27,9 @@ project(qelectrotech
 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" NO)
+option(PACKAGE_TESTS "Build the tests" ON)
 if(PACKAGE_TESTS)
   message("Add sub directory tests")
   add_subdirectory(tests)
@@ -48,16 +43,42 @@ 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
+  Qt6
+  Qt5
+ COMPONENTS
+  ${QET_COMPONENTS}
+ REQUIRED
+ )
+
+find_package(
+  Qt${QT_VERSION_MAJOR}
+ COMPONENTS
+ ${QET_COMPONENTS}
+ 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)
 
-qt_add_executable(
+add_executable(
   ${PROJECT_NAME}
   ${QET_RES_FILES}
   ${QET_SRC_FILES}
@@ -65,24 +86,13 @@ qt_add_executable(
   ${QET_DIR}/qelectrotech.qrc
   )
 
-if(QMFILES_AS_RESOURCE)
-  qt_add_translations(${PROJECT_NAME} TS_FILES ${TS_FILES} RESOURCE_PREFIX "/lang")
-else()
-  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
-  ${KF6_PRIVATE_LIBRARIES}
+  ${KF5_PRIVATE_LIBRARIES}
   ${QET_PRIVATE_LIBRARIES}
   )
 
@@ -115,11 +125,11 @@ target_include_directories(
   ${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
-  ${QET_DIR}/sources/svg
   )
 
 install(TARGETS ${PROJECT_NAME})
@@ -136,10 +146,9 @@ 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.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()
+install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+
 endif()

CREDIT

@@ -1,33 +1,3 @@
-[ca]
-Gràcies a Qt Software per la biblioteca Qt ( http://www.qtsoftware.com/ ), amb llicència GNU/GPL.
-Gràcies al projecte KDE ( http://www.kde.org/ ).
-Gràcies a Loic per les seves explicacions d'ordre matemàtic.
-Gràcies a Remi Collet pels paquets Fedora.
-Gràcies a Laurent Trinques pels paquets Debian.
-Gràcies a `trem' pels paquets Mandriva.
-Gràcies a TuxFamily ( http://tuxfamily.org/ ) per a l'allotjament del projecte.
-Gràcies a `Nishiki' pels seus elements i el seu suport suport.
-Gràcies a qtcentre.org per la seva classe SingleApplication.
-Gràcies a Alfredo Carreto per les seves traduccions i correccions al castellà ( http://electronicosmx.net )
-Gràcies a 'Dr.Slump' et Sivio pour leurs traductions a l'italià
-Gràcies a Jose Carlos Martins per les seves traduccions al portuguès
-Gràcies a Pavel Fric per les seves traduccions al txec
-Gràcies a Pawel Smiech per les seves traduccions al polonès
-Gràcies a Yuriy Litkevich per les seves traduccions al rus
-Gràcies a Youssef Ouamalkran i Antoni Mirabete per les seves traduccions al català
-Gràcies a Gabi Mandoc per les seves traduccions al romanès
-Gràcies a Markus Budde i Jonas Stein et Noah Braden per les seves traduccions a l'alemany
-Gràcies a Mohamed Souabni per les seves traduccions a l'àrab
-Gràcies a Uroš Platiše per les seves traduccions a l'eslovè
-Gràcies a Antun Marakovic per les seves traduccions al croat
-Gràcies a Nikos Papadopoylos && Yannis Gyftomitros per les seves traduccions al grec
-Gràcies a Markos Chandras pels paquets Gentoo
-Gràcies a David pels paquets Slackware
-Gràcies a Chipsterjulien pels paquets  Archlinux AUR
-Gràcies a Elbert de NL pels paquets  OS/2
-Gràcies a Zloidemon pels paquets  (port GCC)
-Gràcies a Mrbit per ebuild els paquets Gentoo
-
 [en]
 Thanks to Qt Software for their Qt library ( http://www.qtsoftware.com/ ), licensed under GNU/GPL.
 Thanks to the KDE project ( http://www.kde.org/ ).
@@ -266,35 +236,3 @@ Dank aan Chipsterjulien voor de pakkette Archlinux AUR
 Dank aan Elbert voor de pakkette  OS/2
 Dank aan Zloidemon fvoor de pakkette  (port GCC)
 Dank aan Mrbit van ebuild voor de pakkette Gentoo 
-
-[ko]
-Qt 라이브러리(Qt Software, http://www.qtsoftware.com/)를 제공해 주신 Qt Software에 감사드립니다. (GNU/GPL 라이선스)
-KDE 프로젝트 ( http://www.kde.org/ )에 감사드립니다.
-수학적인 설명을 제공해 주신 Loic에게 감사드립니다.
-Fedora 패키지를 제공해 주신 Remi Collet에게 감사드립니다.
-Debian 패키지를 제공해 주신 Laurent Trinques에게 감사드립니다.
-Mandriva 패키지를 제공해 주신 `trem`에게 감사드립니다.
-프로젝트 호스팅을 지원해 주신 TuxFamily ( http://tuxfamily.org/ )에 감사드립니다.
-요소 제공 및 지원을 해주신 `Nishiki`에게 감사드립니다.
-SingleApplication 클래스를 제공해 준 qtcentre.org에 감사드립니다.
-스페인어 번역 및 번역 수정에 기여해 주신 Alfredo Carreto ( http://electronicosmx.net )에게 감사드립니다.
-이탈리아어 번역에 기여해 주신 'Dr.Slump'와 Silvio에게 감사드립니다.
-포르투갈어 번역에 기여해 주신 Jose Carlos Martins에게 감사드립니다.
-체코어 번역에 기여해 주신 Pavel Fric에게 감사드립니다.
-폴란드어 번역에 기여해 주신 Pawel Smiech에게 감사드립니다.
-러시아어 번역에 기여해 주신 Yuriy Litkevich에게 감사드립니다.
-카탈로니아어 번역에 기여해 주신 Youssef Ouamalkran에게 감사드립니다.
-루마니아어 번역에 기여해 주신 Gabi Mandoc에게 감사드립니다.
-독일어 번역에 기여해 주신 Markus Budde, Jonas Stein, Noah Braden에게 감사드립니다.
-아랍어 번역에 기여해 주신 Mohamed Souabni에게 감사드립니다.
-슬로베니아어 번역에 기여해 주신 Uroš Platiše에게 감사드립니다.
-크로아티아어 번역에 기여해 주신 Antun Marakovic에게 감사드립니다.
-그리스어 번역에 기여해 주신 Nikos Papadopoylos와 Yannis Gyftomitros에게 감사드립니다.
-한국어 번역에 기여해 주신 정광호 님께 감사드립니다.
-Gentoo 패키지를 제공해 주신 Markos Chandras에게 감사드립니다.
-Slackware 패키지를 제공해 주신 David에게 감사드립니다.
-Arch Linux AUR 패키지를 제공해 주신 Chipsterjulien에게 감사드립니다.
-OS/2 패키지를 제공해 주신 Elbert에게 감사드립니다.
-FreeBSD(GCC 포트) 패키지를 제공해 주신 zloidemon에게 감사드립니다.
-Gentoo ebuild 패키지를 제공해 주신 Mrbit에게 감사드립니다.
-

ChangeLog

@@ -1,128 +1,3 @@
-# QElectroTech - CHANGELOG
-
-## Version 0.100
-
-_Compiled from provided commit logs and contributor notes._
-
-## Overview
-
-This release (v0.100) collects a large set of new features, UI and editor improvements, element and symbol updates, build and packaging fixes, dependency upgrades, translations, and a broad set of bug fixes and stability improvements. It is intended as a stable, feature-rich stepping stone toward the next major workflows for symbol editing, terminal/strip handling and export improvements.
-
-## Highlights / Key Features
-
-- **Terminal Strip / Terminal Strip Editor**
-- New TerminalStripItem type and related editor workflow added.
-- Support for drawing and displaying terminal bridges and links in the editor.
-- Full editor support (layout preview, save/load into .qet files) and undo support for terminal strip operations.
-- **New Example Projects**
-- Several new example projects included, notably photovoltaic (PV) examples to help users getting started with PV designs.
-- **Improved Export / Print Handling**
-- Export limits adjusted and better handling of QPainter/printing boundaries to avoid export artefacts and out-of-range errors.
-- Export dialog updated to allow larger pixel limits where appropriate.
-- **Element & Symbol Additions**
-- New elements and symbols added (including vendor-specific elements and additional sensors/Arduino components).
-- Improvements to element import & metadata handling.
-- **Packaging & Multi-arch Support**
-- Updated packaging scripts for AppImage, Flatpak, Snap and macOS deployment. Improved aarch64/arm64 support.
-
-## Detailed Changes
-
-### Editor & UX
-
-- Better handling for **rotation, flip and mirror** operations in the element editor:
-- Primitives and text rotation behavior improved.
-- Finer rotation increments and predictable text orientation after flips/rotations.
-- **Wiring and conductor behavior**:
-- More robust creation and movement of wires and conductor bundles.
-- Improved text attachment and positioning for wires and improved stability while editing complex conductor networks.
-- **TerminalStrip editor**: see Highlights - includes drawing, preview, layout editing, persistent storage in the project file and undo support.
-- **Element Editor & Symbol Trim/Sort**:
-- Improved trimming/normalization of element metadata.
-- Better sorting and error handling for element imports (DXF and other formats).
-- Small UI improvements: About dialog updates, autosave spinbox ranges, improved tooltips and mouse-hover help for dynamic texts.
-
-### New & Updated Elements
-
-- New elements added for industrial and automation workflows (including Siemens-related elements, logic elements, sensors and Arduino components).
-- Symbol library additions and cleanup; improved defaults for newly added symbols.
-- Element meta-data cleanup: article numbers, descriptions, and manufacturer fields were normalized and trimmed on import.
-
-### Export / Printing / PDF
-
-- Adjusted internal export limits to avoid hitting QPainter size restrictions; users can now export larger, high-resolution images/prints in more cases.
-- Better handling of page sizes and printer-related geometry using QRectF improvements.
-- PDF export improvements to increase reliability of exported vector content.
-
-### Build, Dependencies, Packaging
-
-- Upgrades of core test and build dependencies:
-- Catch2 upgraded to v2.13.10.
-- googletest upgraded to v1.17.0.
-- CMake fixes and i18n handling corrected for nl_BE and other locales.
-- Packaging scripts updated across platforms (AppImage/Flatpak/Snap/macOS deploy) including fixes for aarch64/arm64.
-- Submodule updates (e.g., qelectrotech-elements, pugixml, SingleApplication) synchronized where needed.
-
-### Internationalization & Translations
-
-- Large translation updates across many languages: German (DE), French (FR), Dutch (NL, including nl_BE), Swedish (SV), Italian (IT), Polish (PL), Portuguese-BR (PT-BR), Serbian (SR), Chinese (Simplified) and others.
-- Fixes and corrections for many UI strings and localized resources.
-
-### Tests, QA & Logging
-
-- Improved logging and machine/config-path reporting; Git revision display refined to only show a revision when available.
-- Unit test updates and fixes to align with updated testing frameworks.
-
-## Bug Fixes (selected)
-
-- Fixed crashes and various null pointer access issues discovered by static and dynamic testing.
-- Resolved multiple reported bugs that caused build failures on some platforms (FTBFS fixes for macOS and others).
-- Fixed issues with automatic conductor/strand numbering in several edge cases (referenced Bug 293 in the commit logs).
-- Resolved text/summary headline issues in the German-language summary generator.
-- Fixes for a number of visually incorrect renderings and layout corner-cases during element transformation (rotate/flip/mirror).
-- Fixed issues that affected export sizes and caused export artifacts (referenced fixes for bug IDs around #329/#330 in commit notes).
-
-## Developer & Contributor Notes
-
-- Reworked parts of the codebase to use QRectF consistently for better compatibility with QPrinter and export pipelines.
-- Code-style cleanups and comment improvements applied throughout the project.
-- Expanded test coverage and dependency refresh to keep CI builds stable.
-
-## Contributors (selected)
-
-Thanks to the many contributors who made this release possible. Selected contributors mentioned in the commit logs include:
-
-- Laurent Trinques
-- joshua
-- plc-user
-- Achim
-- Pascal Sander
-- Andre Rummler
-- Magnus Hellströmer
-- Martin Marmsoler
-- Remi Collet
-
-(See the full commit history for the complete contributor list.)
-
-## Upgrade / Migration Notes
-
-- No database or project file format breaking changes were reported in the provided logs. As always, back up projects before opening them with a new version.
-- If you rely on custom element libraries or third-party submodules, verify submodule synchronization after upgrading.
-- If you are using custom packaging pipelines, review the updated packaging scripts for any changes required by new dependency versions, especially on aarch64/arm64.
-
-## Known Issues & Limitations
-
-- Some very large exports may still be limited by platform-specific rendering restrictions; the export dialog now allows larger pixel limits but extreme sizes may still hit system-level limits.
-- If you use niche element-import workflows (DXF → element import), occasionally metadata normalization may alter whitespace/trim rules - verify newly imported elements in the element editor.
-
-## How to get help / report bugs
-
-- Use the project issue tracker (see repository) to report regressions or new bugs with detailed reproduction steps and example .qet files where possible.
-- Include the output of Help → About (application version and Git revision) when reporting build/packaging issues.
-
-
-
-
-
 ====== ChangeLog from 0.8 to 0.9 ======
 
 

ChangeLog.MD

@@ -1,344 +0,0 @@
-# Changelog
-
-## [Unreleased](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/HEAD)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9...HEAD)
-
-**Closed issues:**
-
-- error in doxygen action code [\#414](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/414)
-- "NoName" is automatically inserted into empty text cells in title block [\#407](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/407)
-- Apple silicon download is not working [\#400](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/400)
-- Apple silicon download is not working [\#394](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/394)
-- Differenciating connector for proper labeling [\#390](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/390)
-- Non-perpendicular connections [\#368](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/368)
-- using the wrong Application Data folder on Windows [\#325](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/325)
-- Unclear which PPA to use [\#321](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/321)
-- missing group functionality [\#318](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/318)
-- segfault due to calling method of uninitialized object [\#311](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/311)
-- Cannot open qelectrotech.app on macOS Sequoia 15.0 [\#307](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/307)
-- Dark Mode [\#301](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/301)
-- README 404 Not Found URL: qelectrotech.org/download.html needs to be qelectrotech.org/download.php [\#298](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/298)
-- Malware warning when trying to install dev version 0.100 [\#290](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/290)
-- The page sorting of folio [\#279](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/279)
-- Bad file name for  translations [\#278](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/278)
-- Error using Portuguese Language [\#274](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/274)
-- Uninstaller [\#265](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/265)
-- New Maintainer [\#263](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/263)
-- crash on export project db \(sqlite\) [\#262](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/262)
-- https://qelectrotech.org/ is down for several days now ! [\#261](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/261)
-- right click on text crashes app [\#260](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/260)
-- broken link on github [\#259](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/259)
-- Build on Bullseye 11.5 fails [\#254](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/254)
-- Question about ARM target in future release [\#238](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/238)
-- Component library disappears completely after reset of program [\#87](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/87)
-- Can't change language in portable version [\#75](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/75)
-- Transformation Matrix for Element Editor [\#56](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/56)
-
-**Merged pull requests:**
-
-- Update QCH Help file [\#416](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/416) ([Int-Circuit](https://github.com/Int-Circuit))
-- no random hashes to have more constant order of XML-tags [\#415](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/415) ([plc-user](https://github.com/plc-user))
-- Delete outdated QET docs [\#412](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/412) ([Int-Circuit](https://github.com/Int-Circuit))
-- Fixing translation file list in CMake [\#404](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/404) ([arummler](https://github.com/arummler))
-- Update dependencies to fix compilation errors [\#403](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/403) ([arummler](https://github.com/arummler))
-- Minor corrections to prevent crashes [\#401](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/401) ([Evilscrack](https://github.com/Evilscrack))
-- Correct compositeText alignment on copying [\#399](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/399) ([ChuckNr11](https://github.com/ChuckNr11))
-- Better handling of conductors when moving [\#398](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/398) ([ChuckNr11](https://github.com/ChuckNr11))
-- A few small improvements [\#395](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/395) ([ChuckNr11](https://github.com/ChuckNr11))
-- Added updated automatic doxygen build on push +  theme to make it fit with docs page [\#389](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/389) ([Int-Circuit](https://github.com/Int-Circuit))
-- qet\_de updated [\#388](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/388) ([Bisku](https://github.com/Bisku))
-- only calculate grid-point-size, when min != max [\#387](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/387) ([plc-user](https://github.com/plc-user))
-- Mouse hover text for dynamic text items [\#386](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/386) ([elevatormind](https://github.com/elevatormind))
-- improvement: adjust size of grid-dots with zoom-factor [\#384](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/384) ([plc-user](https://github.com/plc-user))
-- adjust zoom-factor to use cosmetic-line and fixed comments [\#383](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/383) ([plc-user](https://github.com/plc-user))
-- element-editor: fix jumping positions when rotate, mirror or flip [\#382](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/382) ([plc-user](https://github.com/plc-user))
-- unify some more code for Qt5 & Qt6 \(and more\) [\#379](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/379) ([plc-user](https://github.com/plc-user))
-- same simplifications as in \#376 "use the same code for Qt5 & Qt6" [\#377](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/377) ([plc-user](https://github.com/plc-user))
-- simplify and use the same code for Qt5 & Qt6 [\#376](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/376) ([plc-user](https://github.com/plc-user))
-- bordertitleblock: use same code for Qt5 & Qt6 for "numbering" rows [\#375](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/375) ([plc-user](https://github.com/plc-user))
-- some minor changes [\#374](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/374) ([plc-user](https://github.com/plc-user))
-- implement setting of point-size of grids [\#372](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/372) ([plc-user](https://github.com/plc-user))
-- some small changes for selective move [\#370](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/370) ([plc-user](https://github.com/plc-user))
-- Added slovak translation to org.qelectrotech.qelectrotech.desktop [\#369](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/369) ([prescott66](https://github.com/prescott66))
-- unify calls to "setRotation" for element-primitives again [\#367](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/367) ([plc-user](https://github.com/plc-user))
-- Added option to only move dynamic texts [\#365](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/365) ([scorpio810](https://github.com/scorpio810))
-- New variables for conductor text formulas [\#364](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/364) ([scorpio810](https://github.com/scorpio810))
-- Fix typo widht to width [\#362](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/362) ([pkess](https://github.com/pkess))
-- element-editor: add mirror and flip for "text" [\#361](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/361) ([plc-user](https://github.com/plc-user))
-- Add Swedish translation [\#360](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/360) ([scorpio810](https://github.com/scorpio810))
-- German text for launcher and debian package code style [\#359](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/359) ([pkess](https://github.com/pkess))
-- some more rotation, mirror and flip [\#358](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/358) ([plc-user](https://github.com/plc-user))
-- BugFix: Flip and Mirror of terminals [\#357](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/357) ([plc-user](https://github.com/plc-user))
-- element-editor: fix rotation and more [\#356](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/356) ([plc-user](https://github.com/plc-user))
-- minor: mostly typos [\#355](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/355) ([plc-user](https://github.com/plc-user))
-- a few translated shortcuts were still there ... fixed! [\#354](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/354) ([plc-user](https://github.com/plc-user))
-- FIX: some shortcuts do not work with language set to local [\#353](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/353) ([plc-user](https://github.com/plc-user))
-- fix movement of element, when origin is outside of graphics [\#352](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/352) ([plc-user](https://github.com/plc-user))
-- FIX copy-and-paste in element-editor: set paste-position to meaningful values [\#351](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/351) ([plc-user](https://github.com/plc-user))
-- some cleaning for element-file [\#350](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/350) ([plc-user](https://github.com/plc-user))
-- fix: properties in project-file [\#348](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/348) ([plc-user](https://github.com/plc-user))
-- translation: update German and English [\#347](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/347) ([plc-user](https://github.com/plc-user))
-- export: set maximum width / height according limitations in QPainter [\#346](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/346) ([plc-user](https://github.com/plc-user))
-- export: set maximum width / height according specifications of export-type [\#345](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/345) ([plc-user](https://github.com/plc-user))
-- some clean-up for element-file and in code [\#344](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/344) ([plc-user](https://github.com/plc-user))
-- minor: typos, comments, whitespace, translation [\#343](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/343) ([plc-user](https://github.com/plc-user))
-- Sort names in element-file by language-code [\#342](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/342) ([plc-user](https://github.com/plc-user))
-- more precise Log-Text for search of "qet\_tb\_generator" [\#341](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/341) ([plc-user](https://github.com/plc-user))
-- machine\_info: add entry for QETApp::configDir\(\) also for win [\#340](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/340) ([plc-user](https://github.com/plc-user))
-- remove dead code \(local variables that were never used\) [\#339](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/339) ([plc-user](https://github.com/plc-user))
-- minor changes [\#338](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/338) ([plc-user](https://github.com/plc-user))
-- Update of qet\_de [\#337](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/337) ([Bisku](https://github.com/Bisku))
-- rewrite code for executing “qet\_tb\_generator” plugin [\#335](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/335) ([plc-user](https://github.com/plc-user))
-- build-aux/snap/snapcraft.yaml:  python3.8 -\> 3.10 [\#334](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/334) ([zultron](https://github.com/zultron))
-- corrected a few places where QETApp::documentDir\(\) should also be used [\#333](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/333) ([plc-user](https://github.com/plc-user))
-- add commandline-parameter "--data-dir" [\#332](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/332) ([plc-user](https://github.com/plc-user))
-- machine\_info: fix element-count and make static text a bit shorter [\#331](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/331) ([plc-user](https://github.com/plc-user))
-- formatting / whitespace - unify declarations [\#330](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/330) ([plc-user](https://github.com/plc-user))
-- Set default-location for projects to documents-dir. [\#329](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/329) ([plc-user](https://github.com/plc-user))
-- machine\_info.cpp: add explaining text for directory-list [\#328](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/328) ([plc-user](https://github.com/plc-user))
-- set config- and data-dir to system-specific paths [\#327](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/327) ([plc-user](https://github.com/plc-user))
-- Update qet\_cs.ts [\#326](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/326) ([pafri](https://github.com/pafri))
-- update German translation [\#324](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/324) ([plc-user](https://github.com/plc-user))
-- fix copyright-year [\#323](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/323) ([plc-user](https://github.com/plc-user))
-- PT-BR language update [\#322](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/322) ([gleissonjoaquim3](https://github.com/gleissonjoaquim3))
-- Fix: Only scroll diagram-view, when moved text leaves visible area [\#320](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/320) ([plc-user](https://github.com/plc-user))
-- Change Sorting of ElementInfo ComboBox [\#319](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/319) ([ChuckNr11](https://github.com/ChuckNr11))
-- Revert "ElementEditor elmt\_info\_cb sorting changed" [\#317](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/317) ([scorpio810](https://github.com/scorpio810))
-- Fix typo and some whitespace [\#316](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/316) ([plc-user](https://github.com/plc-user))
-- Fix missing company-titleblocks in properties-dialog [\#315](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/315) ([plc-user](https://github.com/plc-user))
-- ElementEditor elmt\_info\_cb sorting changed [\#314](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/314) ([ChuckNr11](https://github.com/ChuckNr11))
-- fix typos and whitespace [\#313](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/313) ([plc-user](https://github.com/plc-user))
-- Force light mode in collections like projects [\#312](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/312) ([Arusekk](https://github.com/Arusekk))
-- About QET: improvements in usability [\#310](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/310) ([plc-user](https://github.com/plc-user))
-- use MessageBox to inform user about additional info when importing scaled element [\#308](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/308) ([plc-user](https://github.com/plc-user))
-- make text for missing software "dxf2elmt" translatable [\#304](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/304) ([plc-user](https://github.com/plc-user))
-- QET\_ElementScaler: fix error for Qt 5.9 and added mirroring [\#303](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/303) ([plc-user](https://github.com/plc-user))
-- integrate "QET\_ElementScaler" as external software [\#302](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/302) ([plc-user](https://github.com/plc-user))
-- move code into else-clause to avoid possible crashes [\#300](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/300) ([plc-user](https://github.com/plc-user))
-- add terminal-names to connection in qet-file [\#297](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/297) ([plc-user](https://github.com/plc-user))
-- fix: editing SpinBoxes with keyboard lose focus [\#296](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/296) ([plc-user](https://github.com/plc-user))
-- Spanish lang update [\#295](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/295) ([joseyspain](https://github.com/joseyspain))
-- More spanish translations.Josey [\#294](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/294) ([joseyspain](https://github.com/joseyspain))
-- update German and English translations [\#293](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/293) ([plc-user](https://github.com/plc-user))
-- hide SVG background checkbox in print preferences [\#292](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/292) ([plc-user](https://github.com/plc-user))
-- fixed indentations of the remaining \*.cpp/\*.h files [\#291](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/291) ([plc-user](https://github.com/plc-user))
-- correct more indentations / whitespace [\#289](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/289) ([plc-user](https://github.com/plc-user))
-- update German and English translations [\#288](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/288) ([plc-user](https://github.com/plc-user))
-- some minor changes [\#286](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/286) ([plc-user](https://github.com/plc-user))
-- correct comments [\#285](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/285) ([plc-user](https://github.com/plc-user))
-- FIX SegFault: Disable menu-entry for DB-export when no project loaded [\#284](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/284) ([plc-user](https://github.com/plc-user))
-- changed some remaining "pt\_br" to "pt\_BR" [\#282](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/282) ([plc-user](https://github.com/plc-user))
-- add option "transparent background" in SVG-export [\#281](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/281) ([plc-user](https://github.com/plc-user))
-- Fix sizes [\#280](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/280) ([plc-user](https://github.com/plc-user))
-- added folder "company-titleblocks" \(incl. language-files\) [\#277](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/277) ([plc-user](https://github.com/plc-user))
-- update translations: de, en, nl [\#276](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/276) ([plc-user](https://github.com/plc-user))
-- fix: set default "company-element-dir" [\#275](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/275) ([plc-user](https://github.com/plc-user))
-- Fix Cmake build [\#273](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/273) ([De-Backer](https://github.com/De-Backer))
-- added "company-collection" as second user-collection [\#272](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/272) ([plc-user](https://github.com/plc-user))
-- corrected german texts for "line-style" [\#269](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/269) ([plc-user](https://github.com/plc-user))
-- Too many parts [\#268](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/268) ([scorpio810](https://github.com/scorpio810))
-- Merge Terminal strip to master [\#267](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/267) ([scorpio810](https://github.com/scorpio810))
-- Terminal strip [\#266](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/266) ([scorpio810](https://github.com/scorpio810))
-- Added new symbols [\#264](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/264) ([kamikazzyyyy](https://github.com/kamikazzyyyy))
-
-## [0.9](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9) (2023-01-03)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev-2022/12/30...0.9)
-
-## [0.9-dev-2022/12/30](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev-2022/12/30) (2022-12-30)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev-2022/08/15...0.9-dev-2022/12/30)
-
-## [0.9-dev-2022/08/15](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev-2022/08/15) (2022-08-13)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2022/04/22...0.9-dev-2022/08/15)
-
-**Closed issues:**
-
-- Polylines always closed on dxf export [\#228](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/228)
-- Refreshing after making changes to elements [\#168](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/168)
-
-## [9-dev-2022/04/22](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2022/04/22) (2022-04-09)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2021/09/09...9-dev-2022/04/22)
-
-**Closed issues:**
-
-- File dialog should enforce suffix [\#206](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/206)
-- snap: Update stable release to core20 & introduce branch for stable releases [\#201](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/201)
-- Can we submit Flatpak to Flathub? [\#143](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/143)
-
-## [9-dev-2021/09/09](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2021/09/09) (2021-09-08)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2021/06/28...9-dev-2021/09/09)
-
-## [9-dev-2021/06/28](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2021/06/28) (2021-07-06)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2021/05/09...9-dev-2021/06/28)
-
-## [9-dev-2021/05/09](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2021/05/09) (2021-05-09)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev-2021/05...9-dev-2021/05/09)
-
-## [0.9-dev-2021/05](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev-2021/05) (2021-04-30)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.8.0...0.9-dev-2021/05)
-
-**Merged pull requests:**
-
-- Rewrite how Properties are stored in the Project file [\#144](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/144) ([Murmele](https://github.com/Murmele))
-- Xml properties rebase2 [\#80](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/80) ([Murmele](https://github.com/Murmele))
-
-## [0.8.0](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.8.0) (2021-02-21)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev...0.8.0)
-
-## [0.9-dev](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev) (2021-02-21)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.8.rc...0.9-dev)
-
-**Closed issues:**
-
-- QET font [\#110](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/110)
-
-## [0.8.rc](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.8.rc) (2020-12-01)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.8-dev...0.8.rc)
-
-**Closed issues:**
-
-- overlapping comparisons always evaluate to true [\#78](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/78)
-- New snap break HiDPI [\#41](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/41)
-
-## [0.8-dev](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.8-dev) (2019-08-06)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.7.0...0.8-dev)
-
-## [0.7.0](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.7.0) (2019-07-17)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2a...0.7.0)
-
-## [0.2a](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2a) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2b...0.2a)
-
-## [0.2b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2b) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2rc1...0.2b)
-
-## [0.2rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2rc1) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2rc2...0.2rc1)
-
-## [0.2rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2rc2) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2...0.2rc2)
-
-## [0.2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3a...0.2)
-
-## [0.3a](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3a) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.11...0.3a)
-
-## [0.11](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.11) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.21...0.11)
-
-## [0.21](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.21) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.22...0.21)
-
-## [0.22](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.22) (2019-06-26)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.70rc2...0.22)
-
-## [0.70rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.70rc2) (2019-06-25)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.70rc1...0.70rc2)
-
-## [0.70rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.70rc1) (2019-04-12)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.61...0.70rc1)
-
-## [0.61](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.61) (2018-08-23)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6...0.61)
-
-## [0.6](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6) (2018-03-06)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc4...0.6)
-
-## [0.6rc4](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc4) (2018-01-12)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc3...0.6rc4)
-
-## [0.6rc3](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc3) (2017-09-20)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc2...0.6rc3)
-
-## [0.6rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc2) (2017-06-13)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc1...0.6rc2)
-
-## [0.6rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc1) (2017-04-23)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.5...0.6rc1)
-
-## [0.5](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.5) (2015-11-27)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.5rc1...0.5)
-
-## [0.5rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.5rc1) (2015-10-30)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.5b...0.5rc1)
-
-## [0.5b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.5b) (2015-10-04)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4...0.5b)
-
-## [0.4](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4) (2015-02-20)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4rc2...0.4)
-
-## [0.4rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4rc2) (2014-12-27)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4rc1...0.4rc2)
-
-## [0.4rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4rc1) (2014-11-10)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4b...0.4rc1)
-
-## [0.4b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4b) (2014-11-02)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3...0.4b)
-
-## [0.3](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3) (2013-09-28)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3rc...0.3)
-
-## [0.3rc](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3rc) (2013-09-10)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3b...0.3rc)
-
-## [0.3b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3b) (2013-06-18)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.1...0.3b)
-
-## [0.1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.1) (2008-03-08)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.1rc1...0.1)
-
-## [0.1rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.1rc1) (2008-03-02)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.1b...0.1rc1)
-
-## [0.1b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.1b) (2007-12-23)
-
-[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/5cadf173c7b73460b62409c81568fc8999177d52...0.1b)
-
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

ELEMENTS.LICENSE

@@ -41,9 +41,6 @@ fähigkeit zur Verfügung gestellt.
 Die Verwendung, Modifikation und Integration der Elemente in elektrische
 Schaltpläne ist uneingeschränkt erlaubt, unabhängig von der endgültigen Lizenz
 der Schaltpläne.
-Es ist nicht gestattet, diese Software oder eine der zugehörigen Dateien
-als Beispieldaten für die Erstellung von Modellen für maschinelles Lernen
-zu verwenden.
 Wenn Sie die gesamte QElectroTech-Sammlung oder Teile davon, mit oder ohne
 Modifikationen, aus einem Schaltplan weitergeben, müssen Sie die Bedingungen
 der CC-BY-Lizenz einhalten.
@@ -214,20 +211,3 @@ QElectroTech と一緒に提供される要素コレクションは現状のま
 ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、
 「Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.」に
 手紙を送ってください。
-
-[ko]
-QElectroTech와 함께 제공되는 요소 컬렉션은 “있는 그대로(as is)” 제공되며,
-특정 목적에 대한 적합성이나 정상 동작에 대한 어떠한 보증도 제공되지 않습니다.
-요소의 사용, 수정 및 전기 도면에의 통합은 도면의 최종 라이선스와 관계없이
-아무런 조건 없이 허용됩니다.
-
-본 소프트웨어 또는 관련 파일을 기계 학습(machine learning) 모델을 구축하기 위한
-샘플 데이터로 사용하는 것은 허용되지 않습니다.
-
-전기 도면과 분리된 형태로 QElectroTech 요소 컬렉션의 전부 또는 일부를,
-수정 여부와 관계없이 재배포하는 경우에는 CC-BY 라이선스 조건을 준수해야 합니다.
-본 저작물은 Creative Commons Attribution 3.0 라이선스에 따라 제공됩니다.
-라이선스 사본은 다음 주소에서 확인할 수 있습니다.
-http://creativecommons.org/licenses/by/3.0/
-또는 다음 주소로 서신을 보내실 수 있습니다.
-Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.

INSTALL

@@ -1,14 +1,3 @@
-[ca]
-Dependències:
-libQt5 (paquets libqt5*)
-cupsys-bsd per imprimir
-
-Com compilar:
-$ qmake (qmake-qt5 pels sistemes basats en Debian)
-$ make
-# umask 0022
-# make install
-
 [en]
 Requirements :
 libQt5 (see packages libqt5*)
@@ -75,6 +64,17 @@ $ make
 # umask 0022
 # make install
 
+[ca]
+Dependències:
+libQt5 (paquets libqt5*)
+cupsys-bsd per imprimir
+
+Com compilar:
+$ qmake (qmake-qt5 pels sistemes basats en Debian)
+$ make
+# umask 0022
+# make install
+
 [cs]
 Požadavky :
 libQt5 (viz balíček libqt5*)

LICENSE

@@ -7,6 +7,8 @@
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
+Permission is not granted to use this software or any of the associated files
+as sample data for the purposes of building machine learning models.
 
 			    Preamble
 

README

@@ -1,7 +1,3 @@
-[ca]
-QElectroTech és una aplicació Qt5 per crear esquemes elèctrics.
-QET utilitza el format XML per als seus elements i esquemes i inclou un editor d'esquemes, un editor d'elements i un editor de caixetins.
-
 [en]
 QElectroTech is a Qt5 application to design electric diagrams.
 It uses XML files for elements and diagrams, and includes both a diagram editor, a element editor, and an titleblock editor.

README.md

@@ -15,10 +15,10 @@ The main goal of the developers is to provide a libre, easy to use and effective
 
 ### Version
 
-The current stable version is 0.100 and was released on 2026.01.25.
+The current stable version is 0.90 and was released on 2023.01.06.
 Once it has been officially released, the stable version is always frozen and is no longer developed.
 
-New functionalities, bug and issue fixings are further made in the development version (currently 0.100.1 or 0.200.0 if based on new Qt6 port), which can also be [downloaded](https://qelectrotech.org/download.php).
+New functionalities, bug and issue fixings are further made in the development version (currently 0.100), which can also be [downloaded](https://qelectrotech.org/download.html).
 
 Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partially implemented until they are done!
 
@@ -26,7 +26,10 @@ Users who want to test and take benefits from the last software implementations
 
 The software is licensed under [GNU/GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).  
 You are free to use, copy, modify and redistribute it under the terms of the license.
-
+```txt
+Permission is not granted to use this software or any of the associated files
+as sample data for the purposes of building machine learning models.
+```
 Like many other open source software, QElectroTech is provided as is, without any warranty.
 
 ### Development / technical choices
@@ -48,8 +51,8 @@ Here are the technical choices made for the software development:
 *   Coding language: [C++](https://en.wikipedia.org/wiki/C%2B%2B)
 *   GUI translations: [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html)
 *   Version control: [GIT](https://github.com/qelectrotech/qelectrotech-source-mirror.git)
-*   Doxygen documentation :[Doxygen](https://qelectrotech.github.io/qelectrotech-source-mirror/)
-*   QtCreator qch doxygen :[QElectroTech.qch](https://github.com/qelectrotech/qelectrotech-source-mirror/blob/master/doc/QElectroTech.qch)
+*   Doxygen documentation :[Doxygen](https://download.qelectrotech.org/qet/doxygen/html/)
+*   QtCreator qch doxygen :[QElectroTech.qch](https://download.qelectrotech.org/qet/doxygen/)
 *   File format for projects, elements and titleblocks: [XML](http://www.w3schools.com/xml/xml_whatis.asp)
 *   Main development platform: [GNU/Linux](http://getgnulinux.org/en/linux/)
 *   Targeted platforms: Windows, GNU/Linux, Mac OS X, BSDs
@@ -59,9 +62,6 @@ 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
 
@@ -80,12 +80,12 @@ Take advantage of the modern GUI
 Toolbars and panels can be enabled/disabled, moved and displayed the way you want to work.  
 Panels can be stacked on each other (as tabs) or docked on the sides (as docks) or completely separated from the main window (as windows).  
 The GUI can fit to small or big screens, and even to multi-display configurations.
-![](https://download.qelectrotech.org/qet/images-features/0030.png "GUI overview")
+![](https://download.tuxfamily.org/qet/images-features/0030.png "GUI overview")
 
 
 The GUI of QElectroTech is translated in 25 languages.
 You only need to restart the application for the new selected language to take effect.
-![](https://download.qelectrotech.org/qet/images-features/0040.png "Lang menu")
+![](https://download.tuxfamily.org/qet/images-features/0040.png "Lang menu")
 
 Create technical documentation in professional quality
 
@@ -94,56 +94,56 @@ You can set vertical and horizontal headers (printed rulers) individually on and
 
 Titlebocks can be created and edited with the embedded titleblock editor to perfectly suit your needs.  
 Custom variables can be defined to display the informations you wish in the titleblock.
-![](https://download.qelectrotech.org/qet/images-features/0055.png "Titleblock editor")
+![](https://download.tuxfamily.org/qet/images-features/0055.png "Titleblock editor")
 
 With only 2 mouse clicks you can add a full automatic generated table of content.  
 Changes in the documentation are updated on the fly.
-![](https://download.qelectrotech.org/qet/images-features/0060.png "Table of content")
+![](https://download.tuxfamily.org/qet/images-features/0060.png "Table of content")
 
 Choose from more than 8.200 symbols...
 The embedded QET collection contains a rich library of electric, logic, pneumatic, hydraulic and fluid symbols.  
 The library grows at every new release thanks to an active user community.
-![](https://download.qelectrotech.org/qet/images-features/0070.png "Collections")
+![](https://download.tuxfamily.org/qet/images-features/0070.png "Collections")
 
 ...or create your own collection
 
 The embedded element editor is a nice tool to create your own elements (symbols or anything else).  
 Your own elements are stored in the user collection.
-![](https://download.qelectrotech.org/qet/images-features/0080.png "Element editor")
+![](https://download.tuxfamily.org/qet/images-features/0080.png "Element editor")
 
 Quickly find what you need
 
 All collections can quickly be searched with the integrated search engine.  
 Furthermore, the search request can be restricted to the folder of your choice.
-![](https://download.qelectrotech.org/qet/images-features/0090.png "Search engine")
+![](https://download.tuxfamily.org/qet/images-features/0090.png "Search engine")
 
 Easily draw complex schematics
 
 To add an element on the drawing area, it only needs a drag & drop from the collection panel.
-![](https://download.qelectrotech.org/qet/images-features/0102.png "Drag and drop")
+![](https://download.tuxfamily.org/qet/images-features/0102.png "Drag and drop")
 
 Elements are automatically connected if they are aligned, or connected from point to point by pulling a conductor with the mouse.
-![](https://download.qelectrotech.org/qet/images-features/0105.png "Conductor connections")
+![](https://download.tuxfamily.org/qet/images-features/0105.png "Conductor connections")
 
 The path of every conductor can be modified by moving its handles with the mouse.
-![](https://download.qelectrotech.org/qet/images-features/0107.png "Conductor handles")
+![](https://download.tuxfamily.org/qet/images-features/0107.png "Conductor handles")
 And of course, you can accurately zoom with the mouse wheel over the drawing area to catch the smallest details.
 
 Link elements together to create cross references
 
 Several types of element can be linked together to display a cross reference text.  
 All types of cross references are automatically updated on the fly, you don't need to think about them if you make changes.
-![](https://download.qelectrotech.org/qet/images-features/0112.png "Cross ref elements")
+![](https://download.tuxfamily.org/qet/images-features/0112.png "Cross ref elements")
 To speed up your work, linkable elements are easily searched and shown.
-![](https://download.qelectrotech.org/qet/images-features/0115.png  "Cross ref search")
+![](https://download.tuxfamily.org/qet/images-features/0115.png  "Cross ref search")
 
 
 Export informations to a parts list
 Informations of all elements in the project can be exported to a .csv file that can be read and edited by any spreadsheet application.
-![](https://download.qelectrotech.org/qet/images-features/0122.png "Element informations")
+![](https://download.tuxfamily.org/qet/images-features/0122.png "Element informations")
 
 This way, you can make your own parts list or bill of material using the full power of a spreadsheet program.
-![](https://download.qelectrotech.org/qet/images-features/0125.png "Spreadsheet")
+![](https://download.tuxfamily.org/qet/images-features/0125.png "Spreadsheet")
 Print to pdf and/or export your work to images
 
 Your whole documentation or only selected parts of it can be printed to a real printer or to a pdf file.  
@@ -168,7 +168,7 @@ The nomenclature is presented in the form of a configurable table separated into
 - Display: the size and position of the table, the margins between text and the table cell, the alignment of the text in the cells and the font. The configuration of the table headers and the table itself are separate.  
 - Content: the information to display in the table and the order in which it should be displayed.  
 
-![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
+![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
 
 In order to speed up the establishment of a nomenclature, it is possible to export / import the display and content configurations separately. This is the "Configuration" part that can be seen in the photos above.  
 
@@ -187,7 +187,7 @@ Finally two buttons are available in the property panel:
 - "Apply geometry to all tables linked to this one": applies the three properties mentioned above to all linked tables in order to save time and maintain aesthetic consistency.  
 
 And to finish a table   
-![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/tableau.png "table")
+![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/tableau.png "table")
 
 
 Summary

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

@@ -1,10 +1,11 @@
 {
   "id": "org.qelectrotech.QElectroTech",
+  "base-version": "5.15-22.08",
   "runtime": "org.kde.Platform",
-  "runtime-version": "5.15-25.08",
+  "runtime-version": "5.15-22.08",
   "sdk": "org.kde.Sdk",
   "command": "qelectrotech",
-  "rename-desktop-file": "org.qelectrotech.qelectrotech.desktop",
+  "rename-desktop-file": "qelectrotech.desktop",
   "rename-appdata-file": "qelectrotech.appdata.xml",
   "rename-icon": "qelectrotech",
   "copy-icon": true,
@@ -17,17 +18,51 @@
     "--socket=cups",
     "--filesystem=host"
   ],
-  "cleanup": [
-      "/include",
-      "/man",
-      "/share/doc",
-      "/share/man",
-      "*.la",
-      "*.a"
-  ],
   "modules": [
-    "tkinter.json",
-    "pypi-dependencies.json",
+    {
+      "name": "tkinter",
+      "buildsystem": "simple",
+      "build-commands": [
+         "pip3 install --prefix=${FLATPAK_DEST} ."
+            ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/iwalton3/tkinter-standalone",
+          "commit": "2301112d142ebaf7532b25600c77d1a2edc9ef04"
+        }
+            ],
+      "modules": [
+                {
+          "name": "tcl",
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tcl8.6.11-src.tar.gz",
+              "sha256": "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258"
+            }
+          ],
+          "subdir": "unix",
+          "post-install": [
+              "chmod +w ${FLATPAK_DEST}/lib/libtcl8.6.so"
+          ]
+                },
+                {
+          "name": "tk",
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tk8.6.11-src.tar.gz",
+              "sha256": "5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282"
+            }
+          ],
+          "subdir": "unix",
+          "post-install": [
+              "chmod +w ${FLATPAK_DEST}/lib/libtk8.6.so"
+          ]
+                }
+      ]
+    },
     {
       "name": "qelectrotech",
       "buildsystem": "qmake",
@@ -41,11 +76,37 @@
         },
         {
           "type": "patch",
-          "paths": [
-            "patches/fix-the-installation-paths.patch"
-          ]
+          "path": "patches/0001-build-Fix-the-installation-paths.patch"
         }
       ]
-    }
+    },
+    {
+    "name": "python3-PySimpleGUI",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
+            "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
+        }
+    ]
+},
+    {
+    "name": "python3-qet-tb-generator",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} qet-tb-generator"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/70/aa/ebde0dddfbde799a4e8cf0564e52f95089105a7f562739ee1d16ff5a495a/qet_tb_generator-1.3.1.tar.gz",
+            "sha256": "52c9836387d54bc30ea29272068ec156fc65c3905e0cb863afd9418abc3c0907"
+        }
+    ]
+}
   ]
 }

build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch

@@ -1,6 +1,16 @@
-diff -ruN a/qelectrotech.pro b/qelectrotech.pro
---- a/qelectrotech.pro	2023-04-20 11:47:07.695847458 +0200
-+++ b/qelectrotech.pro	2023-04-20 11:51:14.843611898 +0200
+From 14f0685ddcf3a7d64bb85a3e9a9ac97c369bb508 Mon Sep 17 00:00:00 2001
+From: Laurent Trinques <scorpio@qelectrotech.org>
+Date: Sat, 26 Sep 2020 22:52:52 +0200
+Subject: [PATCH] build: Fix the installation paths
+
+---
+ qelectrotech.pro | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/qelectrotech.pro b/qelectrotech.pro
+index 7baddbb08..5dcda04b6 100644
+--- a/qelectrotech.pro
++++ b/qelectrotech.pro
 @@ -5,18 +5,18 @@
  # Chemins utilises pour la compilation et l'installation de QET
  unix {
@@ -25,3 +35,6 @@ diff -ruN a/qelectrotech.pro b/qelectrotech.pro
          QET_APPDATA_PATH           = 'share/appdata'
  }
  win32 {
+-- 
+2.35.1
+

build-aux/flatpak/patches/fix-appdata.patch

@@ -1,54 +0,0 @@
-From 5cb80674cec7363ed00bab5248b3674ca5241c2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <yakushabb@gmail.com>
-Date: Fri, 20 Feb 2026 22:56:52 +0300
-Subject: [PATCH] Fix appdata paper cuts
-
----
- misc/qelectrotech.appdata.xml | 26 ++++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/misc/qelectrotech.appdata.xml b/misc/qelectrotech.appdata.xml
-index dd06ab7..eb02119 100644
---- a/misc/qelectrotech.appdata.xml
-+++ b/misc/qelectrotech.appdata.xml
-@@ -1,7 +1,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2006-2023 The QElectroTech Team -->
--<application>
-- <id type="desktop">qelectrotech.desktop</id>
-+<component type="desktop-application">
-+ <id>org.qelectrotech.QElectroTech</id>
-+ <launchable type="desktop-id">qelectrotech.desktop</launchable>
-  <metadata_license>MIT</metadata_license>
-  <project_license>GPL-2.0-or-later</project_license>
-  <name>QElectroTech</name>
-@@ -83,9 +84,22 @@
-    QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。
-    </p>
-  </description>
-- <url type="homepage">http://qelectrotech.org</url>
-+ <url type="homepage">https://qelectrotech.org</url>
-+ <url type="bugtracker">https://qelectrotech.org/bugtracker</url>
-+ <url type="vcs-browser">https://github.com/qelectrotech/qelectrotech-source-mirror</url>
-+ <developer id="org.qelectrotech">
-+   <name>QElectroTech</name>
-+ </developer>
-  <screenshots>
--  <screenshot type="default">http://download.tuxfamily.org/qet/screens/qelectrotech5.png</screenshot>
-+  <screenshot type="default">
-+    <image>https://qelectrotech.org/screenshots/qet_overview04.png</image>
-+ </screenshot>
-+  <screenshot>
-+    <image>https://qelectrotech.org/screenshots/qet_overview06.png</image>
-+ </screenshot>
-+  <screenshot>
-+    <image>https://qelectrotech.org/screenshots/qet_overview09.png</image>
-+ </screenshot>
-  </screenshots>
-- <updatecontact>qet@lists.tuxfamily.org</updatecontact>
--</application>
-+ <update_contact>qet@lists.tuxfamily.org</update_contact>
-+</component>
--- 
-2.53.0
-

build-aux/flatpak/patches/tkinter-build.patch

@@ -1,184 +0,0 @@
-commit 3bbb09a0598fc976d2bf8dac932b27740086c1bd
-Author: Hubert Figuière <hub@figuiere.net>
-Date:   Sun Dec 21 17:49:43 2025 -0500
-
-    Port to Python 3.13
-    
-    Signed-off-by: Hubert Figuière <hub@figuiere.net>
-
-diff --git a/_tkinter.c b/_tkinter.c
-index e537707..dfc5789 100644
---- a/_tkinter.c
-+++ b/_tkinter.c
-@@ -21,7 +21,6 @@ Copyright (C) 1994 Steen Lumholt.
- 
- */
- 
--#define PY_SSIZE_T_CLEAN
- #ifndef Py_BUILD_CORE_BUILTIN
- #  define Py_BUILD_CORE_MODULE 1
- #endif
-@@ -32,6 +31,9 @@ Copyright (C) 1994 Steen Lumholt.
- #  include "pycore_fileutils.h"   // _Py_stat()
- #endif
- 
-+#include "pycore_long.h"          // _PyLong_IsNegative()
-+#include "pycore_sysmodule.h"     // _PySys_GetOptionalAttrString()
-+
- #ifdef MS_WINDOWS
- #include <windows.h>
- #endif
-@@ -135,7 +137,7 @@ _get_tcl_lib_path()
-         struct stat stat_buf;
-         int stat_return_value;
- 
--        prefix = PyUnicode_FromWideChar(Py_GetPrefix(), -1);
-+        (void) _PySys_GetOptionalAttrString("base_prefix", &prefix);
-         if (prefix == NULL) {
-             return NULL;
-         }
-@@ -143,9 +145,11 @@ _get_tcl_lib_path()
-         /* Check expected location for an installed Python first */
-         tcl_library_path = PyUnicode_FromString("\\tcl\\tcl" TCL_VERSION);
-         if (tcl_library_path == NULL) {
-+            Py_DECREF(prefix);
-             return NULL;
-         }
-         tcl_library_path = PyUnicode_Concat(prefix, tcl_library_path);
-+        Py_DECREF(prefix);
-         if (tcl_library_path == NULL) {
-             return NULL;
-         }
-@@ -959,7 +963,8 @@ AsObj(PyObject *value)
-                                 (unsigned char *)(void *)&wideValue,
-                                 sizeof(wideValue),
-                                 PY_LITTLE_ENDIAN,
--                                /* signed */ 1) == 0) {
-+                                /* signed */ 1,
-+                                /* with_exceptions */ 1) == 0) {
-             return Tcl_NewWideIntObj(wideValue);
-         }
-         PyErr_Clear();
-@@ -1988,7 +1993,7 @@ _tkinter_tkapp_getboolean(TkappObject *self, PyObject *arg)
-     int v;
- 
-     if (PyLong_Check(arg)) { /* int or bool */
--        return PyBool_FromLong(Py_SIZE(arg) != 0);
-+        return PyBool_FromLong(!_PyLong_IsZero((PyLongObject *)arg));
-     }
- 
-     if (PyTclObject_Check(arg)) {
-diff --git a/clinic/_tkinter.c.h b/clinic/_tkinter.c.h
-index 9103565..f43510d 100644
---- a/clinic/_tkinter.c.h
-+++ b/clinic/_tkinter.c.h
-@@ -2,6 +2,8 @@
- preserve
- [clinic start generated code]*/
- 
-+#include "pycore_modsupport.h"    // _PyArg_BadArgument()
-+
- PyDoc_STRVAR(_tkinter_tkapp_eval__doc__,
- "eval($self, script, /)\n"
- "--\n"
-@@ -426,7 +428,7 @@ _tkinter_tkapp_createfilehandler(TkappObject *self, PyObject *const *args, Py_ss
-         goto exit;
-     }
-     file = args[0];
--    mask = _PyLong_AsInt(args[1]);
-+    mask = PyLong_AsInt(args[1]);
-     if (mask == -1 && PyErr_Occurred()) {
-         goto exit;
-     }
-@@ -490,7 +492,7 @@ _tkinter_tkapp_createtimerhandler(TkappObject *self, PyObject *const *args, Py_s
-     if (!_PyArg_CheckPositional("createtimerhandler", nargs, 2, 2)) {
-         goto exit;
-     }
--    milliseconds = _PyLong_AsInt(args[0]);
-+    milliseconds = PyLong_AsInt(args[0]);
-     if (milliseconds == -1 && PyErr_Occurred()) {
-         goto exit;
-     }
-@@ -524,7 +526,7 @@ _tkinter_tkapp_mainloop(TkappObject *self, PyObject *const *args, Py_ssize_t nar
-     if (nargs < 1) {
-         goto skip_optional;
-     }
--    threshold = _PyLong_AsInt(args[0]);
-+    threshold = PyLong_AsInt(args[0]);
-     if (threshold == -1 && PyErr_Occurred()) {
-         goto exit;
-     }
-@@ -558,7 +560,7 @@ _tkinter_tkapp_dooneevent(TkappObject *self, PyObject *const *args, Py_ssize_t n
-     if (nargs < 1) {
-         goto skip_optional;
-     }
--    flags = _PyLong_AsInt(args[0]);
-+    flags = PyLong_AsInt(args[0]);
-     if (flags == -1 && PyErr_Occurred()) {
-         goto exit;
-     }
-@@ -741,29 +743,29 @@ _tkinter_create(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
-     if (nargs < 4) {
-         goto skip_optional;
-     }
--    interactive = _PyLong_AsInt(args[3]);
--    if (interactive == -1 && PyErr_Occurred()) {
-+    interactive = PyObject_IsTrue(args[3]);
-+    if (interactive < 0) {
-         goto exit;
-     }
-     if (nargs < 5) {
-         goto skip_optional;
-     }
--    wantobjects = _PyLong_AsInt(args[4]);
--    if (wantobjects == -1 && PyErr_Occurred()) {
-+    wantobjects = PyObject_IsTrue(args[4]);
-+    if (wantobjects < 0) {
-         goto exit;
-     }
-     if (nargs < 6) {
-         goto skip_optional;
-     }
--    wantTk = _PyLong_AsInt(args[5]);
--    if (wantTk == -1 && PyErr_Occurred()) {
-+    wantTk = PyObject_IsTrue(args[5]);
-+    if (wantTk < 0) {
-         goto exit;
-     }
-     if (nargs < 7) {
-         goto skip_optional;
-     }
--    sync = _PyLong_AsInt(args[6]);
--    if (sync == -1 && PyErr_Occurred()) {
-+    sync = PyObject_IsTrue(args[6]);
-+    if (sync < 0) {
-         goto exit;
-     }
-     if (nargs < 8) {
-@@ -814,7 +816,7 @@ _tkinter_setbusywaitinterval(PyObject *module, PyObject *arg)
-     PyObject *return_value = NULL;
-     int new_val;
- 
--    new_val = _PyLong_AsInt(arg);
-+    new_val = PyLong_AsInt(arg);
-     if (new_val == -1 && PyErr_Occurred()) {
-         goto exit;
-     }
-diff --git a/setup.py b/setup.py
-index f379305..cf7b6ad 100644
---- a/setup.py
-+++ b/setup.py
-@@ -3,11 +3,11 @@ from distutils.core import setup, Extension
- module1 = Extension('_tkinter',
-                     libraries=['tcl8.6', 'tk8.6'],
-                     sources=['_tkinter.c'],
--                    include_dirs=['/app/include/'])
-+                    include_dirs=['/app/include/', '/usr/include/python3.13/internal/'])
- 
- setup(
-     name='tkinter-standalone',
--    version='3.11',
-+    version='3.13',
-     description='Tkinter packaged as an external package for flatpak.',
-     ext_modules=[module1],
-     packages=["tkinter"]

build-aux/flatpak/pypi-dependencies.json

@@ -1,40 +0,0 @@
-{
-    "name": "pypi-dependencies",
-    "buildsystem": "simple",
-    "build-commands": [],
-    "modules": [
-        {
-            "name": "python3-PySimpleGUI",
-            "buildsystem": "simple",
-            "build-commands": [
-                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"PySimpleGUI\" --no-build-isolation"
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/4d/d9/3de4b7ca71a7779e4f4a160088621b072a29d9b814a7fa9b5411571f4849/pysimplegui-5.0.8.3-py3-none-any.whl",
-                    "sha256": "67e35ad6dd76e9369051261114f4711308e87815a0488f7fa28b37c29a546f8b"
-                }
-            ]
-        },
-        {
-            "name": "python3-qet-tb-generator",
-            "buildsystem": "simple",
-            "build-commands": [
-                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"qet-tb-generator\" --no-build-isolation"
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/4d/d9/3de4b7ca71a7779e4f4a160088621b072a29d9b814a7fa9b5411571f4849/pysimplegui-5.0.8.3-py3-none-any.whl",
-                    "sha256": "67e35ad6dd76e9369051261114f4711308e87815a0488f7fa28b37c29a546f8b"
-                },
-                {
-                    "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/63/d6/81de49a3ccec259583241fec4d79c668eff4acf9eb4d0226db36e1399f2d/qet_tb_generator-1.3.1-py3-none-any.whl",
-                    "sha256": "80fb4af229edfd5774e61f96fa387ff394d5060abd0ca45c3c74d29de1ce9b53"
-                }
-            ]
-        }
-    ]
-}

build-aux/flatpak/tkinter.json

@@ -1,58 +0,0 @@
-{
-    "//note": "The `tkinter` module is missing from the Freedesktop Sdk's Python installation",
-    "name": "tkinter",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --prefix=${FLATPAK_DEST} --no-build-isolation ."
-    ],
-    "sources": [
-        {
-            "type": "git",
-            "url": "https://github.com/iwalton3/tkinter-standalone",
-            "commit": "88aa05075d90d393a29a484bce676e237d311082"
-        },
-        {
-            "type": "patch",
-            "path": "patches/tkinter-build.patch"
-        }
-    ],
-    "modules": [
-        {
-            "name": "tcl",
-            "buildsystem": "autotools",
-            "subdir": "unix",
-            "post-install": [
-                "chmod 755 /app/lib/libtcl*.so"
-            ],
-            "cleanup": [
-                "/bin"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://prdownloads.sourceforge.net/tcl/tcl8.6.17-src.tar.gz",
-                    "sha256": "a3903371efcce8a405c5c245d029e9f6850258a60fa3761c4d58995610949b31"
-                }
-            ]
-        },
-        {
-            "name": "tk",
-            "buildsystem": "autotools",
-            "subdir": "unix",
-            "post-install": [
-                "chmod 755 /app/lib/libtk*.so"
-            ],
-            "cleanup": [
-                "/bin",
-                "/lib/tk*/demos"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://prdownloads.sourceforge.net/tcl/tk8.6.17-src.tar.gz",
-                    "sha256": "e4982df6f969c08bf9dd858a6891059b4a3f50dc6c87c10abadbbe2fc4838946"
-                }
-            ]
-        }
-    ]
-}

build-aux/linux/fedora/README.elements

@@ -1,6 +1,3 @@
-[ca]
-Col·lecció d'elements per a QElectroTech.
-
 [fr]
 Collection d'éléments pour QElectroTech.
 
@@ -13,7 +10,6 @@ Bauteilsammlung für QElectroTech.
 [es]
 Collección de elementos para QElectroTech.
 
-
 [pt]
 Colecção de elementos para QElectroTech.
 

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

@@ -9,6 +9,8 @@ if [ ! -d "$to" ] && [ -d "$from" ]; then
   cp -av "$from/." "$to"
 fi
 
-
+# link DXFtoQET so that QET finds it
+mkdir -p "$HOME/.qet"
+ln -snf "$SNAP/bin/DXFtoQET" "$HOME/.qet/DXFtoQET"
 
 exec "${@}"

build-aux/snap/snapcraft.yaml

@@ -29,11 +29,11 @@ apps:
     common-id: qelectrotech.desktop
     extensions: 
      - kde-neon
-    plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control, wayland, x11]
+    plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
     environment: &env
       TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
       HOME: $SNAP_USER_COMMON
-      PYTHONPATH: $SNAP:$SNAP/lib/python3.10/site-packages:$SNAP/usr/lib/python3.10:$SNAP/usr/lib/python3.10/lib-dynload
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3.8:$SNAP/usr/lib/python3.8/lib-dynload
 
   qet-tb-generator:
     command: bin/qet_tb_generator
@@ -42,7 +42,13 @@ apps:
     plugs: *plugs
     environment: *env
       
-  
+  dxf-to-qet:
+    command: bin/DXFtoQET
+    extensions: 
+     - kde-neon
+    plugs: *plugs
+    environment: *env
+
 parts:
   launchers:
     plugin: dump
@@ -71,7 +77,16 @@ parts:
     override-build: |
       rsync -a --ignore-existing /snap/kf5-5-110-qt-5-15-11-core22-sdk/current/ /
 
-  
+  dxf-to-qet:
+    after: [kde-sdk-setup]
+    plugin: nil
+    source: https://github.com/qelectrotech/DXFtoQET-2020.git
+    override-build: |
+      qmake "$CRAFT_PART_SRC/DXFtoQET.pro"
+      make -j$(nproc)
+      mkdir -p "$CRAFT_PART_INSTALL/bin"
+      cp DXFtoQET "$CRAFT_PART_INSTALL/bin/"
+
   qelectrotech:
     after: [kde-sdk-setup]
     plugin: nil
@@ -81,7 +96,7 @@ parts:
       - git
       - libsqlite3-dev
     override-build: |
-      displayed_version=$(cat sources/qetversion.cpp | grep "return QVersionNumber{"| head -n 1| awk -F "{" '{ print $2 }' | awk -F "}" '{ print $1 }' | sed -e 's/,/./g' -e 's/ //g')
+      displayed_version=$(cat sources/qetversion.cpp | grep "return QVersionNumber{ 0, "| head -n 1| cut -c32-40| sed -e 's/,/./g' -e 's/ //g')
       snap_version="${displayed_version}-g$(git rev-parse --short=8 HEAD)"
       modified_displayed_version="${snap_version}.snap"
       sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
@@ -93,10 +108,10 @@ parts:
       craftctl default
       # patch desktop file with correct icon path
       SED_CMD="sed -i -E s|^Icon=(.*)|Icon=\${SNAP}/usr/local/share/icons/hicolor/128x128/apps/\1.png|g" 
-      $SED_CMD usr/local/share/applications/org.qelectrotech.qelectrotech.desktop
+      $SED_CMD usr/local/share/applications/qelectrotech.desktop
 
   cleanup:
-    after: [qelectrotech, qet-tb-generator]
+    after: [qelectrotech, dxf-to-qet, qet-tb-generator]
     plugin: nil
     build-snaps: [kf5-5-110-qt-5-15-11-core22]
     override-prime: |

build-aux/windows/Contrib/Dutch_Belgium.nlf

@@ -0,0 +1,191 @@
+# Header, don't edit
+NLF v6
+# Start editing here
+# Language ID
+2067
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ANSI code page
+1252
+# RTL - anything else than RTL means LTR
+-
+# Translation by Ronny Desmedt (any credits should go here)
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+$(^Name) Installatie
+# ^UninstallCaption
+$(^Name) Deïnstallatie
+# ^LicenseSubCaption
+: Licentie overeenkomst
+# ^ComponentsSubCaption
+: Installatie Opties
+# ^DirSubCaption
+: Installatie Map
+# ^InstallingSubCaption
+: Installeren
+# ^CompletedSubCaption
+: Voltooid
+# ^UnComponentsSubCaption
+: Deïnstallatie Opties
+# ^UnDirSubCaption
+: Deïnstallatie Map
+# ^ConfirmSubCaption
+: Bevestigen
+# ^UninstallingSubCaption
+: Deïnstalleren
+# ^UnCompletedSubCaption
+: Voltooid
+# ^BackBtn
+< &Terug
+# ^NextBtn
+&Volgende >
+# ^AgreeBtn
+Ik ben &Akkoord
+# ^AcceptBtn
+Ik &Accepteer de licentie overeenkomst
+# ^DontAcceptBtn
+Ik &Accepteer de licentie overeenkomst niet
+# ^InstallBtn
+&Installeer
+# ^UninstallBtn
+&Deïnstalleer
+# ^CancelBtn
+Afbreken
+# ^CloseBtn
+&Sluiten
+# ^BrowseBtn
+B&laderen...
+# ^ShowDetailsBtn
+Toon &details
+# ^ClickNext
+Klik op volgende om verder te gaan.
+# ^ClickInstall
+Klik op installeren om de installatie te starten.
+# ^ClickUninstall
+Klik op deïnstalleren om de installatie te verwijderen.
+# ^Name
+Naam
+# ^Completed
+Voltooid
+# ^LicenseText
+Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te installeren. Als u akkord bent met de licentie overeenkomst, klik op akkoord.
+# ^LicenseTextCB
+Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te installeren. Als u akkord bent met de licentie overeenkomst, klik op onderstaande selectievakje. $_CLICK
+# ^LicenseTextRB
+Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te installeren. Als u akkord bent met de licentie overeenkomst, selecteer de eerste onderstaande optie. $_CLICK
+# ^UnLicenseText
+Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te deïnstalleren. Als u akkord bent met de licentie overeenkomst, klik op akkoord.
+# ^UnLicenseTextCB
+Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te deïnstalleren. Als u akkord bent met de licentie overeenkomst, klik op onderstaande selectievakje. $_CLICK
+# ^UnLicenseTextRB
+Gelieve de licentie overeenkomst te lezen alvorens $(^NameDA) te deïnstalleren. Als u akkord bent met de licentie overeenkomst, selecteer de eerste onderstaande optie. $_CLICK
+# ^Custom
+Aangepast
+# ^ComponentsText
+Selecteer de onderdelen die u wilt installeren en deselecteer de onderdelen die u niet wilt installeren. $_CLICK
+# ^ComponentsSubText1
+Selecteer een installatie type:
+# ^ComponentsSubText2_NoInstTypes
+Selecteer de onderdelen om te installeren:
+# ^ComponentsSubText2
+Of, selecteer optionelen onderdelen die u wilt installeren:
+# ^UnComponentsText
+Selecteer de onderdelen die u wilt deïnstalleren en deselecteer de onderdelen die u niet wilt deïinstalleren. $_CLICK
+# ^UnComponentsSubText1
+Selecteer een deïnstallatie type:
+# ^UnComponentsSubText2_NoInstTypes
+Selecteer de onderdelen om te deïnstalleren:
+# ^UnComponentsSubText2
+Of, selecteer optionelen onderdelen die u wilt deïnstalleren:
+# ^DirText
+De installatie van $(^NameDA) wordt in volgende map uitgevoerd. Om in een andere map te installeren, klik op bladeren om een andere map te selecteren. $_CLICK
+# ^DirSubText
+Installatie map
+# ^DirBrowseText
+Selecteerd de map om $(^NameDA) in te installeren:
+# ^UnDirText
+De deïnstallatie van $(^NameDA) in de volgende map. Om een andere map te deïnstalleren, klik op bladren om een andere map te selecteren. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+Selecteer en map om $(^NameDA) van te deînstalleren:
+# ^SpaceAvailable
+"Beschikbare ruimte: "
+# ^SpaceRequired
+"Benodigde ruimte: "
+# ^UninstallingText
+$(^NameDA) wordt gedeïnstalleerd uit volgende map. $_CLICK
+# ^UninstallingSubText
+Deïnstalleren van:
+# ^FileError
+Fout bij openen van bestand om te schrijven: \r\n\r\n$0\r\n\r\nKlik op afbreken om de installatie te stoppen,\r\nOpnieuw om te proberen, of\r\nNegeren om dit bestand over te slaan.
+# ^FileError_NoIgnore
+Fout bij openen van bestand om te schrijven: \r\n\r\n$0\r\n\r\nOpnieuw om te proberen, of\r\nAfbreken om de installatie te stoppen.
+# ^CantWrite
+"Kan niet schrijven: "
+# ^CopyFailed
+Kopieren mislukt
+# ^CopyTo
+"Copier naar "
+# ^Registering
+"Registreren: "
+# ^Unregistering
+"Deregistreren: "
+# ^SymbolNotFound
+"Kan symbool niet vinden: "
+# ^CouldNotLoad
+"Kan niet laden: "
+# ^CreateFolder
+"Map maken: "
+# ^CreateShortcut
+"Snelkoppeling maken: "
+# ^CreatedUninstaller
+"Doe deïnstallatie: "
+# ^Delete
+"Verwijder bestanden: "
+# ^DeleteOnReboot
+Verwijder bij herstarten: "
+# ^ErrorCreatingShortcut
+"Fout bij maken snelkoppeling: "
+# ^ErrorCreating
+"Fout bij maken: "
+# ^ErrorDecompressing
+Fout bij uitpakken gegevens! Beschadigd bestand?
+# ^ErrorRegistering
+Fout bij registreren DLL
+# ^ExecShell
+"ExecShell: "
+# ^Exec
+"Uitvoeren: "
+# ^Extract
+"Extract: "
+# ^ErrorWriting
+Fout: fout bij schrijven naar bestand "
+# ^InvalidOpcode
+Installie beschadigd: niet toegestane opcode
+# ^NoOLE
+"Geen OLE voor: "
+# ^OutputFolder
+"Bestemmings map: "
+# ^RemoveFolder
+"Verwijder mapr: "
+# ^RenameOnReboot
+"Hernoem bij opstarten: "
+# ^Rename
+"Hernoem: "
+# ^Skipped
+Overgeslagen: "
+# ^CopyDetails
+Copier details naar klembord
+# ^LogInstall
+Log instaltie proces
+# ^Byte
+B
+# ^Kilo
+K
+# ^Mega
+M
+# ^Giga
+G

build-aux/windows/Contrib/Dutch_Belgium.nsh

@@ -0,0 +1,128 @@
+;Language:Dutch_Belgium (2067)
+;By Ronny Desmedt
+
+!insertmacro LANGFILE "Dutch_Belgium" "Dutch_Belgium"
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welkom bij $(^NameDA) installatie Wizard"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Deze wizard zal u begeleiden bij de installatie van $(^NameDA).$\r$\n$\r$\nHet is aanbevol dat u alle andere programmas afsluit voordat u deze installatie uitvoerd. Dit geeft de mogelijkheid om relevante systeem bestanden bij te werken zonder dat uw systeem terug moet opstarten.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Welkom bij de $(^NameDA) deïnstallatie wizard"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Deze wizard zal u begeleiden bij de deïnstallatie van $(^NameDA).$\r$\n$\r$\nControleer of $(^NameDA) is afgesloten alvorens de deïnstallatie te starten.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licentie overeenkomst"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Gelieve de licentie te lezen alvorens U $(^NameDA) installeert."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Klik op akkoord om de overeenkomst te aanvaarden. U moet de overeenkomst aanvaarden om $(^NameDA) te installeren."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Als u de voorwaarden van de overeenkomst aanvaard, Klik op onderstaande selectievakje. U moet de overeenkomst aanvaarden om $(^NameDA) te installeren. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Als u de voorwaarden van de overeenkomst aanvaard, selecteer de eerste onderstaande optie. U moet de overeenkomst aanvaarden om $(^NameDA) te installeren. $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licentie overeenkomst"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Gelieve de licentie overeenkomst te herlezen alvorens met de deïnstallatie van $(^NameDA) verder te doen."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Klik op akkoord om de overeenkomst te aanvaarden. U moet de overeenkomst aanvaarden om $(^NameDA) te deïnstalleren."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Als u de voorwaarden van de overeenkomst aanvaard, Klik op onderstaande selectievakje. U moet de overeenkomst aanvaarden om  $(^NameDA) te deïnstalleren. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Als u de voorwaarden van de overeenkomst aanvaard, selecteer de eerste onderstaande optie. U moet de overeenkomst aanvaarden om $(^NameDA) te deïnstalleren. $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Gebruik pagina neer om de rest van de overeenkomst te lezen."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Kies onderdelen"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Kies de onderdelen van $(^NameDA) die u wilt installeren."
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Kies onderdelen"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Kies de onderdelen van $(^NameDA) die u wilt deïnstalleren."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschrijving"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg de muisaanwijzer over de onderdelen om de beschrijving te zien."
+  !else
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg de muisaanwijzer over de onderdelen om de beschrijving te zien."
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Kies een installatie locatie"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Kies een map waar U $(^NameDA) wilt installeren."
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Kies een deïnstallatie locatie"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Kies een map waar U $(^NameDA) wilt deïnstalleren."
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installeren"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Even gedult terwijl $(^NameDA) wordt geinstalleerd."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installatie voltooid"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "De installatie is succesvol afgerond."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Installatie is afgebroken"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "De installatie is niet voltooid."
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "DeïnEven geduld terwijl $(^NameDA) wordt gedeïnstalleerd."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Deïnstallatie  voltooid"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Deïnstallatie succesvol afgerond."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Deïnstallatie onderbroken"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Deïnstallatie is niet voltooid."
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Voltooien van de $(^NameDA) installatie Wizard"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) is geinstalleerd op uw computer.$\r$\n$\r$\nKlik op einde om de installatie wizard af te sluiten."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Uw computer moet herstarten op de installatie van $(^NameDA) te voltooien. Wilt u nu opnieuw opstarten?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Voltooien van de $(^NameDA) deïnstallatie wizard"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) is gedeïnstalleerd op uw computer.$\r$\n$\r$\nKlik op einde om de installatie wizard af te sluiten."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Uw computer moet herstarten op de deïnstallatie van $(^NameDA)te voltooien. Wilt u nu opnieuw opstarten?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Nu herstarten"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ik wil later herstarten"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Starten $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Toon leesmij"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Einde"  
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Kies start menu map"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Kies een map in start menu voor de snelkoppeling van $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Kies een map in start menu waar u de programma snelkoppelingen wilt aanmaken. U kan ook de naam van een nieuwe map opgeven."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Maak geen snelkoppelingen"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Deïnstalleer$(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Verwijder $(^NameDA) van uw computer."
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Weet u zeker dat U installatie van $(^Name) wilt afbreken?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Weet u zeker dat U de deïnstallatie van $(^Name)wilt afbreken?"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Kies gebruikers"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Kies voor welke gebruikers U $(^NameDA) wilt installeren."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Kies of U $(^NameDA) alleen voor u zelf of voor alle gebruikers op deze computer wilt installeren. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installeer voor iedereen die deze computer gebruikt"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installeer alleen voor mij"
+!endif

build-aux/windows/Lancer QET.bat

@@ -5,10 +5,7 @@ set current_dir=%~dp0
 cd /d %current_dir%
 
 rem lance QElectroTech
-rem Sans option --config-dir, la configuration de QElectroTech seront dans
-rem "C:/Users/<USER>/AppData/Local/QElectroTech/QElectroTech"
-rem Sans l'option --data-dir, les données utilisateur (elements, titleblocks,
-rem log, ...) de QElectroTech sont stockées dans
-rem "C:/Users/<USER>/AppData/Roaming/QElectroTech/QElectroTech"
+rem Sans option --config-dir, la configuration de QElectroTech ainsi que la
+rem collection d'elements perso seront dans "%APPDATA%\qet"
 set command=bin\qelectrotech.exe --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ -style windowsvista %*
 @start %command%

build-aux/windows/MIGRATION_NOTES.md

@@ -1,118 +0,0 @@
-# Migration NSIS 2.x → 3.x — QElectroTech
-
-## Fichiers modifiés
-
-| Fichier | Changement |
-|---|---|
-| `QET64.nsi` | Migration complète (voir détails ci-dessous) |
-| `lang_extra_fr.nsh` | Réencodé ISO-8859-1 → UTF-8 |
-| `lang_extra.nsh` | Inchangé (déjà UTF-8) |
-
----
-
-## Détail des changements dans `QET64.nsi`
-
-### 1. `SetCompressor` déplacé en tête de fichier
-**NSIS 3 exige** que `SetCompressor` apparaisse avant toute `Section` ou `Function`.  
-Avant il était après les `!include` et `!define` — cela fonctionnait en NSIS 2 mais
-génère un avertissement/erreur en NSIS 3.
-
-```nsis
-; ✅ NSIS 3 — en tout premier
-SetCompressor /FINAL /SOLID lzma
-```
-
-### 2. `XPStyle on` supprimé → remplacé par `ManifestSupportedOS`
-`XPStyle on` est **retiré en NSIS 3**. Il était utilisé pour activer les styles visuels
-Windows XP/Vista. NSIS 3 gère cela via le manifeste de l'exécutable :
-
-```nsis
-; ✅ NSIS 3
-ManifestSupportedOS all
-ManifestDPIAware true
-```
-
-### 3. `Var /GLOBAL` déclarées au niveau global
-En NSIS 2, des `Var /GLOBAL` à l'intérieur d'une `Section` compilaient sans erreur.
-En NSIS 3, les variables doivent être déclarées **au niveau du script** (avant toute section).
-
-```nsis
-; ✅ NSIS 3 — déclaration globale
-Var final_qet_exe
-Var final_project_ico
-Var final_element_ico
-Var final_titleblock_ico
-```
-
-### 4. `SetRegView 64` ajouté dans `.onInit`, section cachée, et `un.onInit`
-En NSIS 3, sur un système 64 bits, **la redirection de registre WOW6432Node est active
-par défaut**. Sans `SetRegView 64`, les clés HKLM atterrissent dans
-`HKLM\SOFTWARE\Wow6432Node\` au lieu de `HKLM\SOFTWARE\`.
-
-Ajouté à trois endroits :
-- `Function .onInit` → pour lire la clé d'installation existante
-- Section cachée (registry/shortcuts) → avant les `WriteRegStr`
-- `Section "Uninstall"` → pour supprimer les bonnes clés
-- `Function un.onInit` → cohérence avec l'installation
-
-### 5. Icônes MUI mises à jour
-Les icônes `XPUI-install.ico` / `XPUI-uninstall.ico` sont remplacées par les nouvelles
-icônes NSIS 3 :
-
-```nsis
-; ✅ NSIS 3
-!define MUI_ICON   "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico"
-```
-> Les anciennes icônes XPUI sont encore présentes pour compatibilité ascendante, mais
-> les nouvelles sont recommandées.
-
-### 6. `${IfNot} ${RunningX64}` — syntaxe clarifiée
-Remplacement du bloc `${If}/${Else}/${EndIf}` moins lisible par `${IfNot}` plus concis :
-
-```nsis
-; ✅ NSIS 3 — idiome recommandé
-${IfNot} ${RunningX64}
-    MessageBox MB_OK|MB_ICONSTOP $(wrongArch)
-    Abort
-${EndIf}
-```
-
-### 7. URLs HTTP → HTTPS
-Les URLs `http://qelectrotech.org/` ont été mises à jour en `https://qelectrotech.org/`
-(cosmétique, sans impact sur la compilation).
-
-### 8. `lang_extra_fr.nsh` — Réencodage ISO-8859-1 → UTF-8
-NSIS 3 est **Unicode natif** : tous les fichiers `.nsh` doivent être encodés en UTF-8
-(avec ou sans BOM). Le fichier `lang_extra_fr.nsh` était en ISO-8859-1 — il a été
-converti en UTF-8.
-
-> **Commande utilisée :** `iconv -f ISO-8859-1 -t UTF-8 lang_extra_fr.nsh`
-
----
-
-## Ce qui N'A PAS changé (déjà compatible NSIS 3)
-
-- `!include "MUI2.nsh"` — inchangé ✅
-- `!define MUI_LANGDLL_ALLLANGUAGES` — toujours supporté ✅
-- `!insertmacro MUI_RESERVEFILE_LANGDLL` — inchangé ✅
-- `FileFunc.nsh` / macro `Locate` — inchangé ✅
-- `RequestExecutionLevel admin` — inchangé ✅
-- `InstallDir "$PROGRAMFILES64\..."` — inchangé ✅
-- Structure Sections / SubSections — inchangée ✅
-- `!insertmacro MUI_FUNCTION_DESCRIPTION_*` — inchangé ✅
-- Toutes les `LangString` — inchangées ✅
-- `Dutch_Belgium` via `Contrib/` — inchangé ✅
-
----
-
-## Checklist avant compilation avec NSIS 3
-
-- [ ] NSIS 3.x installé (https://nsis.sourceforge.io/)
-- [ ] Tous les plugins utilisés sont la version Unicode/NSIS3
-  - `FileFunc.nsh` : fourni avec NSIS 3 ✅
-  - `x64.nsh` : fourni avec NSIS 3 ✅
-  - `MUI2.nsh` : fourni avec NSIS 3 ✅
-- [ ] `lang_extra.nsh` et `lang_extra_fr.nsh` encodés en UTF-8
-- [ ] Le fichier `Contrib/Dutch_Belgium.nlf` / `.nsh` est placé dans
-  `%NSIS%\Contrib\Language files\` ou référencé via un chemin relatif

build-aux/windows/QET64.nsi

@@ -1,505 +1,406 @@
-; this file is part of installer for QElectroTech
-; Copyright (C)2015 QElectroTech Team <scorpio@qelectrotech.org>
-;
-; This program 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.
-;
-; This program 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 this program; if not, write to the Free Software
-; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-; WebSite : https://qelectrotech.org/
-
-;==============================================================================
-; NSIS 3.x compatibility notes:
-;   - Unicode is native in NSIS 3 (no need for Unicode installer plugin)
-;   - XPStyle is deprecated/removed; ManifestSupportedOS replaces it
-;   - SetCompressor must appear before any Section/Function
-;   - SetRegView 64 moved to top of the hidden section (before WriteRegStr)
-;   - x64.nsh is still available but ${RunningX64} is now also in x64.nsh
-;   - MUI2.nsh is unchanged; MUI_LANGDLL_ALLLANGUAGES is still valid
-;   - FileFunc.nsh / Locate macro: unchanged
-;   - Var /GLOBAL must be declared at global scope, not inside a Section
-;==============================================================================
-
-;--------------------------------
-; NSIS 3 requires SetCompressor BEFORE any Section or Function
-SetCompressor /FINAL /SOLID lzma
-
-;--------------------------------
-; Includes
-!include x64.nsh
-!include "MUI2.nsh"
-!include "FileFunc.nsh"
-!insertmacro Locate
-!insertmacro GetParameters
-!insertmacro GetOptions
-
-;--------------------------------
-; NSIS 3: Unicode is the default. The installer binary will be Unicode.
-; No extra plugin needed.
-
-!ifndef PROC
-    !define PROC 64
-!endif
-
-;--------------------------------
-; General Product Description Definitions
-!define SOFT_NAME     "QElectroTech"
-!define SOFT_VERSION  "0.5-dev_x86_64-win64+4094"
-!define SOFT_WEB_SITE "https://qelectrotech.org/"
-!define SOFT_BUILD    "1"
-
-;--------------------------------
-; General settings
-CRCCheck force
-BrandingText "${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}"
-
-; NSIS 3: XPStyle is removed. Use ManifestSupportedOS to declare modern OS support.
-; This replaces "XPStyle on" and enables proper DPI awareness + visual styles.
-ManifestSupportedOS all
-ManifestDPIAware true
-
-; Name and output file
-Name "${SOFT_NAME} ${SOFT_VERSION}"
-OutFile "Installer_${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}.exe"
-
-; Default installation folder
-InstallDir "$PROGRAMFILES64\${SOFT_NAME}"
-
-; Get installation folder from registry if available
-; NSIS 3: InstallDirRegKey still works, but SetRegView 64 must be set at
-; runtime (in .onInit) to read 64-bit registry hive correctly.
-InstallDirRegKey HKCU "Software\${SOFT_NAME}" ""
-
-; Request admin privileges (required for HKLM / file associations)
-RequestExecutionLevel admin
-
-;--------------------------------
-; Declare global variables at script scope (NSIS 3 requirement)
-; In NSIS 2 these could be declared inside a Section; that still compiles
-; in NSIS 3 but triggers a warning. Declare them here.
-Var final_qet_exe
-Var final_project_ico
-Var final_element_ico
-Var final_titleblock_ico
-
-;--------------------------------
-; MUI Interface Settings
-!define MUI_ABORTWARNING
-
-; NSIS 3 ships updated icons; XPUI icons are still present for compatibility.
-; You may switch to the modern ones:
-!define MUI_ICON   "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico"
-
-!define MUI_WELCOMEFINISHPAGE_BITMAP          ".\images\wizard.bmp"
-!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP ".\images\header.bmp"
-
-;--------------------------------
-; Language Selection Dialog Settings (remember chosen language in registry)
-!define MUI_LANGDLL_REGISTRY_ROOT      "HKCU"
-!define MUI_LANGDLL_REGISTRY_KEY       "Software\${SOFT_NAME}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-;--------------------------------
-; Pages
-!define MUI_COMPONENTSPAGE_SMALLDESC
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Finish page – checkbox to launch QElectroTech
-!define MUI_FINISHPAGE_RUN             "$INSTDIR\Lancer QET.bat"
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_RUN_TEXT        "$(Check)"
-!insertmacro MUI_PAGE_FINISH
-
-;--------------------------------
-; Languages
-; NSIS 3: MUI_LANGDLL_ALLLANGUAGES is still supported and works as before.
-!define MUI_LANGDLL_ALLLANGUAGES
-
-!insertmacro MUI_LANGUAGE "English"   ; first = default
-    !insertmacro MUI_LANGUAGE "Korean"
-    !insertmacro MUI_LANGUAGE "French"
-    !insertmacro MUI_LANGUAGE "Spanish"
-    !insertmacro MUI_LANGUAGE "Russian"
-    !insertmacro MUI_LANGUAGE "Portuguese"
-    !insertmacro MUI_LANGUAGE "Czech"
-    !insertmacro MUI_LANGUAGE "Polish"
-    !insertmacro MUI_LANGUAGE "Greek"
-    !insertmacro MUI_LANGUAGE "Arabic"
-    !insertmacro MUI_LANGUAGE "German"
-    !insertmacro MUI_LANGUAGE "Italian"
-    !insertmacro MUI_LANGUAGE "Romanian"
-    !insertmacro MUI_LANGUAGE "Catalan"
-    !insertmacro MUI_LANGUAGE "Croatian"
-    !insertmacro MUI_LANGUAGE "Dutch"
-    !insertmacro MUI_LANGUAGE "Danish"
-    !insertmacro MUI_LANGUAGE "Hungarian"
-    !insertmacro MUI_LANGUAGE "Japanese"
-    !insertmacro MUI_LANGUAGE "Mongolian"
-    !insertmacro MUI_LANGUAGE "Norwegian"
-    !insertmacro MUI_LANGUAGE "PortugueseBR"
-    !insertmacro MUI_LANGUAGE "Serbian"
-    !insertmacro MUI_LANGUAGE "Slovak"
-    !insertmacro MUI_LANGUAGE "Slovenian"
-    !insertmacro MUI_LANGUAGE "Swedish"
-    !insertmacro MUI_LANGUAGE "Turkish"
-    !insertmacro MUI_LANGUAGE "Ukrainian"
-    !insertmacro MUI_LANGUAGE "SimpChinese"
-!insertmacro MUI_RESERVEFILE_LANGDLL
-
-; Language strings for all supported locales
-!include lang_extra.nsh
-!include lang_extra_fr.nsh
-!include lang_extra_missing.nsh
-; NOTE: The string "uninstFailed" must be defined in lang_extra.nsh and
-; lang_extra_fr.nsh (and any other lang_extra_*.nsh) like so:
-;   LangString uninstFailed ${LANG_ENGLISH} "Uninstallation of the previous version failed.$\nPlease uninstall QElectroTech manually before continuing."
-;   LangString uninstFailed ${LANG_FRENCH}  "La désinstallation de la version précédente a échoué.$\nVeuillez désinstaller QElectroTech manuellement avant de continuer."
-
-;==============================================================================
-; SECTIONS
-;==============================================================================
-
-SetOverwrite on
-
-Section "Main Program"
-SectionIn RO  ; Read-only – always installed
-
-    SetOutPath "$INSTDIR\bin\"
-    File "./files/bin/${SOFT_NAME}.exe"
-
-    SetOutPath "$INSTDIR"
-    File "./files/ChangeLog"
-    File "./files/CREDIT"
-    File "./files/ELEMENTS.LICENSE"
-    File "./files/LICENSE"
-    File "./files/qet_uninstall_file_associations.reg"
-    File "./files/README"
-    File "./files/register_filetypes.bat"
-    File "Lancer QET.bat"
-
-    SetOutPath "$INSTDIR"
-    File /r "./files/ico"
-
-SectionEnd
-
-;---------------------------
-SetOverwrite on
-SubSection "$(Elements)" SEC01
-
-    SetOverwrite on
-    Section "$(Electric)"
-        SetOutPath "$INSTDIR\elements"
-        File /r "./files/elements/10_electric"
-    SectionEnd
-
-    SetOverwrite on
-    Section "$(Logic)"
-        SetOutPath "$INSTDIR\elements"
-        File /r "./files/elements/20_logic"
-    SectionEnd
-
-    SetOverwrite on
-    Section "$(Hydraulic)"
-        SetOutPath "$INSTDIR\elements"
-        File /r "./files/elements/30_hydraulic"
-    SectionEnd
-
-    SetOverwrite on
-    Section "$(Pneumatic)"
-        SetOutPath "$INSTDIR\elements"
-        File /r "./files/elements/50_pneumatic"
-    SectionEnd
-
-    ;---------------------------------
-    SubSection "$(Energy)"
-
-        SetOverwrite on
-        Section "$(water)"
-            SetOutPath "$INSTDIR\elements\60_energy"
-            File /r "./files/elements/60_energy/11_water"
-            File /r "./files/elements/60_energy/"
-        SectionEnd
-
-        SetOverwrite on
-        Section "$(Refrigeration)"
-            SetOutPath "$INSTDIR\elements\60_energy"
-            File /r "./files/elements/60_energy/21_refrigeration"
-            File /r "./files/elements/60_energy/"
-        SectionEnd
-
-        SetOverwrite on
-        Section "$(Solar_thermal)"
-            SetOutPath "$INSTDIR\elements\60_energy"
-            File /r "./files/elements/60_energy/31_solar_thermal"
-            File /r "./files/elements/60_energy/"
-        SectionEnd
-
-    SubSectionEnd
-
-SubSectionEnd
-
-;-------------------------------
-SetOverwrite on
-Section "$(Lang)" SEC02
-    SetOutPath "$INSTDIR\lang"
-    File "./files/lang/*.qm"
-SectionEnd
-
-SetOverwrite on
-Section "$(Titleblocks)" SEC03
-    SetOutPath "$INSTDIR"
-    File /r "./files/titleblocks"
-SectionEnd
-
-SetOverwrite on
-Section "$(Examples)" SEC04
-    SetOutPath "$INSTDIR"
-    File /r "./files/examples"
-SectionEnd
-
-SetOverwrite on
-Section "$(Fonts)" SEC05
-    SetOutPath "$INSTDIR"
-    File /r "./files/fonts"
-SectionEnd
-
-;--------------------------------
-; Component descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $(var1)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(var2)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(var3)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $(var4)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $(var5)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-; Hidden section: registry, shortcuts, file associations
-Section ""
-    SetOutPath "$INSTDIR"
-
-    ; NSIS 3 on 64-bit Windows: set 64-bit registry view BEFORE any WriteRegStr
-    ; so keys land in HKLM\SOFTWARE (not the Wow6432Node redirect).
-    SetRegView 64
-
-    ; Store installation folder
-    WriteRegStr HKCU "Software\${SOFT_NAME}" "" $INSTDIR
-
-    ; Uninstall registry entries
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
-        "DisplayName"     "${SOFT_NAME} (remove only)"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
-        "UninstallString" '"$INSTDIR\Uninstall.exe"'
-
-    ; Create uninstaller
-    WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-    ; Build paths for icons and launch script
-    StrCpy $final_qet_exe          "$INSTDIR\Lancer QET.bat"
-    StrCpy $final_project_ico      "$INSTDIR\ico\application-x-qet-project.ico"
-    StrCpy $final_element_ico      "$INSTDIR\ico\application-x-qet-element.ico"
-    StrCpy $final_titleblock_ico   "$INSTDIR\ico\application-x-qet-titleblock.ico"
-
-    ; File associations – .qet
-    WriteRegStr   HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" "" \
-        '"$final_qet_exe" "%1"'
-    WriteRegStr   HKEY_CLASSES_ROOT ".qet"                                              "" "qet_diagram_file"
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                  "" "Diagram QET"
-    WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                  "EditFlags"    0x00000000
-    WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                  "BrowserFlags" 0x00000008
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon"                      "" "$final_project_ico"
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command"               "" '"$final_qet_exe" "%1"'
-
-    ; File associations – .elmt
-    WriteRegStr   HKEY_CLASSES_ROOT ".elmt"                                             "" "qet_element_file"
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                  "" "Element QET"
-    WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                  "EditFlags"    0x00000000
-    WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                  "BrowserFlags" 0x00000008
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon"                      "" "$final_element_ico"
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\shell\open\command"               "" '"$final_qet_exe" "%1"'
-
-    ; File associations – .titleblock
-    WriteRegStr   HKEY_CLASSES_ROOT ".titleblock"                                       "" "qet_titleblock_file"
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file"                               "" "Titleblock QET"
-    WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                               "EditFlags"    0x00000000
-    WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                               "BrowserFlags" 0x00000008
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\DefaultIcon"                   "" "$final_titleblock_ico"
-    WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\shell\open\command"            "" '"$final_qet_exe" "%1"'
-
-    SetShellVarContext all  ; apply shortcuts for all users
-
-    ; Start Menu shortcuts
-    CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
-    CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Manual"
-    CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Upgrade"
-    CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\QElectroTech.lnk" \
-        "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
-    CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\Uninstall QElectroTech.lnk" \
-        "$INSTDIR\Uninstall.exe"
-
-    ; Desktop shortcut
-    CreateShortCut "$DESKTOP\QElectroTech.lnk" \
-        "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
-
-    ; Internet shortcuts
-    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" \
-        "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/manual_0.7/build/index.html"
-    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" \
-        "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/joshua/html/QET_ru.html"
-    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url" \
-        "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/builds/nightly/"
-    WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url" \
-        "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
-
-    ; Mark installed elements as read-only
-    ${Locate} "$INSTDIR\elements\" "/L=FD /M=*.elmt" "LocateCallback"
-    IfErrors 0 +2
-    ; MessageBox MB_OK "Error in Locate"  ; uncomment for debugging
-
-SectionEnd
-
-;--------------------------------
-; Locate callback – sets FILE_ATTRIBUTE_READONLY on each .elmt file
-Function LocateCallback
-    SetFileAttributes $R9 FILE_ATTRIBUTE_READONLY
-    Push $0
-FunctionEnd
-
-;==============================================================================
-; INSTALLER FUNCTIONS
-;==============================================================================
-
-Function .onInit
-    ; NSIS 3: SetRegView in .onInit ensures InstallDirRegKey reads the right hive
-    SetRegView 64
-
-    !insertmacro MUI_LANGDLL_DISPLAY
-
-    ; Abort if not running on a 64-bit OS
-    ${IfNot} ${RunningX64}
-        MessageBox MB_OK|MB_ICONSTOP $(wrongArch)
-        Abort
-    ${EndIf}
-
-    ; ----------------------------------------------------------------
-    ; Auto-uninstall previous version before installing new one
-    ; ----------------------------------------------------------------
-    ReadRegStr $R0 HKLM \
-        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
-        "UninstallString"
-
-    ; No previous installation found → proceed normally
-    StrCmp $R0 "" done
-
-    ; Also read the install dir of the previous version
-    ReadRegStr $R1 HKCU "Software\${SOFT_NAME}" ""
-
-    ; Ask user whether to uninstall the existing version
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(installed)" IDOK uninst
-    Abort   ; user clicked Cancel → stop the installer
-
-uninst:
-    ; Remove surrounding quotes from the UninstallString if present
-    ; (some installers write: "C:\path\Uninstall.exe" — ExecWait needs clean path)
-    StrCpy $R2 $R0 1        ; first character
-    StrCmp $R2 '"' 0 unquoted
-        ; Strip leading and trailing quote
-        StrCpy $R0 $R0 "" 1                 ; remove leading "
-        StrLen $R3 $R0
-        IntOp $R3 $R3 - 1
-        StrCpy $R0 $R0 $R3                  ; remove trailing "
-unquoted:
-
-    ; Run the uninstaller silently, keeping it in its own directory
-    ; _?= prevents NSIS from copying the uninstaller to a temp folder,
-    ; so it can delete itself and the whole $INSTDIR tree.
-    ClearErrors
-    ${If} $R1 != ""
-        ExecWait '"$R0" /S _?=$R1'         ; silent uninstall using saved install dir
-    ${Else}
-        ExecWait '"$R0" /S'                 ; fallback if install dir unknown
-    ${EndIf}
-
-    IfErrors uninstall_failed
-
-    ; Verify the old installation is gone before continuing
-    ${If} $R1 != ""
-        IfFileExists "$R1\${SOFT_NAME}.exe" uninstall_failed
-        IfFileExists "$R1\bin\${SOFT_NAME}.exe" uninstall_failed
-    ${EndIf}
-
-    Goto done
-
-uninstall_failed:
-    MessageBox MB_OK|MB_ICONSTOP "$(uninstFailed)"
-    Abort
-
-done:
-
-FunctionEnd
-
-;==============================================================================
-; UNINSTALLER SECTION
-;==============================================================================
-
-Section "Uninstall"
-    SetRegView 64   ; NSIS 3: required so we delete from the correct hive
-    SetShellVarContext all
-
-    ; Remove Start Menu shortcuts
-    RMDir /r "$SMPROGRAMS\${SOFT_NAME}"
-
-    ; Remove Desktop shortcut
-    Delete "$DESKTOP\QElectroTech.lnk"
-
-    ; Remove application files
-    Delete "$INSTDIR\*.*"
-    RMDir /r "$INSTDIR"
-
-    ; Remove installation registry keys
-    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}"
-    DeleteRegKey /ifempty HKCU "Software\${SOFT_NAME}"
-
-    ; Remove file associations registry keys
-    DeleteRegKey HKEY_CLASSES_ROOT "Applications\qelectrotech.exe"
-    DeleteRegKey HKEY_CLASSES_ROOT ".qet"
-    DeleteRegKey HKEY_CLASSES_ROOT "qet_diagram_file"
-    DeleteRegKey HKEY_CLASSES_ROOT ".elmt"
-    DeleteRegKey HKEY_CLASSES_ROOT "qet_element_file"
-    DeleteRegKey HKEY_CLASSES_ROOT ".titleblock"
-    DeleteRegKey HKEY_CLASSES_ROOT "qet_titleblock_file"
-
-    IfFileExists "$INSTDIR" 0 NoErrorMsg
-    ; MessageBox MB_OK "Note: $INSTDIR could not be removed!"
-    NoErrorMsg:
-
-SectionEnd
-
-;==============================================================================
-; UNINSTALLER FUNCTIONS
-;==============================================================================
-
-Function un.onInit
-    SetRegView 64   ; NSIS 3: match the view used during install
-    !insertmacro MUI_UNGETLANGUAGE
-FunctionEnd
+; this file is part of installer for QElectroTech
+; Copyright (C)2015 QElectroTech Team <scorpio@qelectrotech.org>
+;
+; This program 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.
+;
+; This program 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 this program; if not, write to the Free Software
+; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+; WebSite : http://qelectrotech.org/
+
+;--------------------------------
+;Include Modern UI
+	!include x64.nsh
+	!include "MUI2.nsh"
+	!include "FileFunc.nsh"
+	!insertmacro Locate
+	!include FileFunc.nsh
+	!insertmacro GetParameters
+	!insertmacro GetOptions
+	
+	
+!ifndef PROC
+	!define PROC 32 ; 
+!endif
+
+
+	
+; MUI Settings
+;--------------------------------
+;General
+	; General Product Description Definitions
+	!define SOFT_NAME     "QElectroTech"
+	!define SOFT_VERSION  "0.5-dev_x86_64-win64+4094"
+	!define SOFT_WEB_SITE "http://qelectrotech.org/"
+	!define SOFT_BUILD    "1"
+
+	
+	SetCompressor /final /solid lzma
+	CRCCheck force
+	XPStyle on
+	BrandingText "${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}"   ; Shows in the Bottom Left of the installer
+	
+	
+	;Name and file
+	Name "${SOFT_NAME} ${SOFT_VERSION}"
+	OutFile "Installer_${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}.exe"
+
+	;Default installation folder
+	InstallDir "$PROGRAMFILES64\${SOFT_NAME}"
+	
+	;Get installation folder from registry if available
+	InstallDirRegKey HKCU "Software\${SOFT_NAME}" ""
+
+	;Request application privileges for Windows Vista
+	; we request for admin because we write stuff into the registry
+	RequestExecutionLevel admin
+
+;--------------------------------
+;Interface Settings
+	!define MUI_ABORTWARNING
+	!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico"
+	!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico"
+	
+	!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp"
+	!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+
+	!define MUI_HEADERIMAGE
+	!define MUI_HEADERIMAGE_BITMAP ".\images\header.bmp" ; optional
+;--------------------------------
+;Language Selection Dialog Settings
+
+	;Remember the installer language
+	!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
+	!define MUI_LANGDLL_REGISTRY_KEY "Software\${SOFT_NAME}" 
+	!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+;--------------------------------
+;Pages
+
+	!define MUI_COMPONENTSPAGE_SMALLDESC
+	!insertmacro MUI_PAGE_WELCOME
+	!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
+	!insertmacro MUI_PAGE_COMPONENTS
+	!insertmacro MUI_PAGE_DIRECTORY
+	!insertmacro MUI_PAGE_INSTFILES
+
+	!insertmacro MUI_UNPAGE_CONFIRM
+	!insertmacro MUI_UNPAGE_INSTFILES
+	
+; Finish page and checkbox to run QElectroTech
+	!define MUI_FINISHPAGE_RUN "$INSTDIR\Lancer QET.bat"
+	!define MUI_FINISHPAGE_RUN_NOTCHECKED
+	!define MUI_FINISHPAGE_RUN_TEXT "$(Check)"
+	!insertmacro MUI_PAGE_FINISH
+;--------------------------------
+;Languages
+	;Since NSIS 2.26, the language selection dialog of Modern UI hides languages unsupported by the user's selected codepage by default.
+	;To revert to the old behavior and display all languages, no matter what the user will see when they're selected, use MUI_LANGDLL_ALLLANGUAGES.
+	!define MUI_LANGDLL_ALLLANGUAGES
+	
+	; For consistency, we limit the installer to languages supported by QElectroTech itself
+	!insertmacro MUI_LANGUAGE "English" ;first language is the default language
+        !insertmacro MUI_LANGUAGE "French"
+        !insertmacro MUI_LANGUAGE "Spanish"
+        !insertmacro MUI_LANGUAGE "Russian"
+        !insertmacro MUI_LANGUAGE "Portuguese"
+        !insertmacro MUI_LANGUAGE "Czech"
+        !insertmacro MUI_LANGUAGE "Polish"
+        !insertmacro MUI_LANGUAGE "Greek"
+        !insertmacro MUI_LANGUAGE "Arabic"
+        !insertmacro MUI_LANGUAGE "German"
+        !insertmacro MUI_LANGUAGE "Italian"
+        !insertmacro MUI_LANGUAGE "Romanian"
+        !insertmacro MUI_LANGUAGE "Catalan"
+        !insertmacro MUI_LANGUAGE "Croatian"
+        !insertmacro MUI_LANGUAGE "Dutch"
+        !insertmacro MUI_LANGUAGE "Dutch_Belgium"
+        !insertmacro MUI_LANGUAGE "Danish"
+	!insertmacro MUI_RESERVEFILE_LANGDLL
+	
+	!include lang_extra.nsh
+	!include lang_extra_fr.nsh
+	
+
+	
+SetOverwrite on	
+Section "Main Program"
+SectionIn RO ; Read only, always installed
+
+Setoutpath "$INSTDIR\bin\"
+File "./files/bin/${SOFT_NAME}.exe"
+
+Setoutpath "$INSTDIR"
+File "./files/ChangeLog"
+File "./files/CREDIT"
+File "./files/ELEMENTS.LICENSE"
+File "./files/LICENSE"
+File "./files/qet_uninstall_file_associations.reg"
+File "./files/README"
+File "./files/register_filetypes.bat"
+File "Lancer QET.bat"
+
+SetOutPath "$INSTDIR"
+File /r "./files/ico"
+
+SectionEnd
+
+;---------------------------
+SetOverwrite on
+SubSection "$(Elements)" SEC01
+
+SetOverwrite on
+Section "$(Electric)" 
+  SetOutPath "$INSTDIR\elements"
+  File /r "./files/elements/10_electric"
+SectionEnd
+
+SetOverwrite on
+Section "$(Logic)" 
+  SetOutPath "$INSTDIR\elements"
+  File /r "./files/elements/20_logic"
+SectionEnd
+
+SetOverwrite on
+Section  "$(Hydraulic)" 
+  SetOutPath "$INSTDIR\elements"
+  File /r "./files/elements/30_hydraulic"
+SectionEnd
+
+
+SetOverwrite on
+Section "$(Pneumatic)" 
+  SetOutPath "$INSTDIR\elements"
+  File /r "./files/elements/50_pneumatic"
+SectionEnd
+
+
+;---------------------------------
+SubSection "$(Energy)" 
+
+SetOverwrite on
+Section  "$(water)" 
+  SetOutPath "$INSTDIR\elements\60_energy"
+  File /r "./files/elements/60_energy/11_water"
+  File /r "./files/elements/60_energy/"
+SectionEnd
+
+SetOverwrite on
+Section  "$(Refrigeration)" 
+  SetOutPath "$INSTDIR\elements\60_energy"
+  File /r "./files/elements/60_energy/21_refrigeration"
+  File /r "./files/elements/60_energy/"
+SectionEnd
+
+SetOverwrite on
+Section  "$(Solar_thermal)" 
+  SetOutPath "$INSTDIR\elements\60_energy"
+  File /r "./files/elements/60_energy/31_solar_thermal"
+  File /r "./files/elements/60_energy/"
+SectionEnd
+
+SubSectionEnd 
+SubSectionEnd 
+;-------------------------------
+
+SetOverwrite on
+Section "$(Lang)" SEC02
+  SetOutPath "$INSTDIR\lang"
+  File "./files/lang/*.qm"
+SectionEnd
+
+SetOverwrite on
+Section "$(Titleblocks)" SEC03
+  SetOutPath "$INSTDIR"
+  File /r "./files/titleblocks"
+SectionEnd
+
+SetOverwrite on
+Section "$(Examples)" SEC04
+  SetOutPath "$INSTDIR"
+  File /r "./files/examples"
+SectionEnd
+
+;--------------------------------
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $(var1)
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(var2)
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(var3)
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $(var4)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+;--------------------------------
+
+;Installer Sections
+
+Section ""
+	SetOutPath "$INSTDIR"  
+	;Store installation folder
+	WriteRegStr HKCU "Software\${SOFT_NAME}" "" $INSTDIR
+	; write uninstall strings
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "DisplayName"     "${SOFT_NAME} (remove only)"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+	;Create uninstaller
+	WriteUninstaller "$INSTDIR\Uninstall.exe"
+	SetRegView 64
+	
+	; get the final path for the icons and the launch script
+	Var /GLOBAL final_qet_exe
+	Var /GLOBAL final_project_ico
+	Var /GLOBAL final_element_ico
+	Var /GLOBAL final_titleblock_ico
+
+	StrCpy $final_qet_exe     "$INSTDIR\Lancer QET.bat"
+	StrCpy $final_project_ico "$INSTDIR\ico\application-x-qet-project.ico"
+	StrCpy $final_element_ico "$INSTDIR\ico\application-x-qet-element.ico"
+	StrCpy $final_titleblock_ico "$INSTDIR\ico\application-x-qet-titleblock.ico"
+	
+	; write file associations registry keys
+	WriteRegStr   HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" ""             "$\"$final_qet_exe$\" $\"%1$\""
+	WriteRegStr   HKEY_CLASSES_ROOT ".qet"                                             ""             "qet_diagram_file"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                 ""             "Schéma QET"
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "EditFlags"    0x00000000
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "BrowserFlags" 0x00000008
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon"                     ""             "$final_project_ico"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
+	WriteRegStr   HKEY_CLASSES_ROOT ".elmt"                                            ""             "qet_element_file"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                 ""             "Élément QET"
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "EditFlags"    0x00000000
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "BrowserFlags" 0x00000008
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon"                     ""             "$final_element_ico"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
+	WriteRegStr   HKEY_CLASSES_ROOT ".titleblock"                                      ""             "qet_titleblock_file"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file"                              ""             "Titleblock QET"
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                              "EditFlags"    0x00000000
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file"                              "BrowserFlags" 0x00000008
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\DefaultIcon"                  ""             "$final_titleblock_ico"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_titleblock_file\shell\open\command"           ""             "$\"$final_qet_exe$\" $\"%1$\""
+	
+	SetShellVarContext all ; all users
+	; shortcuts in the start menu
+	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
+	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Manual"
+	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Upgrade"
+	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\QElectroTech.lnk"           "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
+	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\Uninstall QElectroTech.lnk" "$INSTDIR\Uninstall.exe"
+	; TODO : add the QuickStart Guide (or any other documentation) when available
+	
+	; shortcut on the desktop
+	CreateShortCut "$DESKTOP\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
+	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/manual_0.7/build/index.html"
+	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/joshua/html/QET_ru.html"
+	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url"      "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/builds/nightly/"
+	WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url"                "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
+	
+	;changing $INSTDIR\elements\ *.elmt to read-only attribute
+	
+	${Locate} "$INSTDIR\elements\" "/L=FD /M=*.elmt" "LocateCallback"
+	IfErrors 0 +2
+	;MessageBox MB_OK "Error"
+SectionEnd
+
+Function LocateCallback
+	SetFileAttributes $R9 FILE_ATTRIBUTE_READONLY
+	Push $0
+FunctionEnd
+
+;--------------------------------
+;Installer Functions
+
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+
+${If} ${RunningX64}
+${Else}
+
+    MessageBox MB_OK|MB_ICONSTOP $(wrongArch)
+	Abort $(wrongArch)
+${EndIf}
+
+;Auto-uninstall old before installing new
+  ReadRegStr $R0 HKLM \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
+  "UninstallString"
+  StrCmp $R0 "" done
+
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "$(installed)" \
+  IDOK uninst
+  Abort
+
+;Run the uninstaller
+uninst:
+  ClearErrors
+  ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+
+  IfErrors no_remove_uninstaller done
+    ;You can either use Delete /REBOOTOK in the uninstaller or add some code
+    ;here to remove the uninstaller. Use a registry key to check
+    ;whether the user has chosen to uninstall. If you are using an uninstaller
+    ;components page, make sure all sections are uninstalled.
+  no_remove_uninstaller:
+
+done:
+
+FunctionEnd
+
+;--------------------------------
+;Descriptions
+
+	;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
+
+	;Assign descriptions to sections
+	;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+	;  !insertmacro MUI_DESCRIPTION_TEXT ${CopyFiles} "CopyFiles"
+	;!insertmacro MUI_FUNCTION_DESCRIPTION_END
+ 
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+	SetShellVarContext all ; all users
+	; remove start menu shortcuts
+	RMDir /r "$SMPROGRAMS\${SOFT_NAME}"
+	; remove shortcut on the desktop
+	Delete "$DESKTOP\QElectroTech.lnk"
+	
+	; remove the application files
+	Delete "$INSTDIR\*.*"
+	RMDir /r "$INSTDIR"
+	
+	;remove installation registry keys
+	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}"
+	DeleteRegKey /ifempty HKCU "Software\${SOFT_NAME}"
+	
+	; remove file associations registry keys
+	DeleteRegKey HKEY_CLASSES_ROOT "Applications\qelectrotech.exe"
+	DeleteRegKey HKEY_CLASSES_ROOT ".qet"
+	DeleteRegKey HKEY_CLASSES_ROOT "qet_diagram_file"
+	DeleteRegKey HKEY_CLASSES_ROOT ".elmt"
+	DeleteRegKey HKEY_CLASSES_ROOT "qet_element_file"
+	DeleteRegKey HKEY_CLASSES_ROOT ".titleblock"
+	DeleteRegKey HKEY_CLASSES_ROOT "qet_titleblock_file"
+	
+	IfFileExists "$INSTDIR" 0 NoErrorMsg
+	;MessageBox MB_OK "Note: $INSTDIR could not be removed!" IDOK 0 ; skipped if file doesn't exist
+	NoErrorMsg:
+SectionEnd
+
+;--------------------------------
+;Uninstaller Functions
+
+Function un.onInit
+
+	!insertmacro MUI_UNGETLANGUAGE
+
+FunctionEnd
+
+

build-aux/windows/lang_extra.nsh

@@ -10,7 +10,6 @@
         LangString Refrigeration     ${LANG_ENGLISH}  "Refrigeration"
         LangString Solar_thermal     ${LANG_ENGLISH}  "Solar_thermal"
         LangString Lang              ${LANG_ENGLISH}  "Lang"
-        LangString Fonts             ${LANG_ENGLISH}  "Fonts"
         LangString Titleblocks       ${LANG_ENGLISH}  "Titleblocks"
         LangString Examples          ${LANG_ENGLISH}  "Examples"
         LangString Check             ${LANG_ENGLISH}  "Check to start ${SOFT_NAME}"
@@ -18,34 +17,8 @@
         LangString var2              ${LANG_ENGLISH}  "languagues files"
         LangString var3              ${LANG_ENGLISH}  "Examples of cartridges"
         LangString var4              ${LANG_ENGLISH}  "Examples of diagrams"
-        LangString var5              ${LANG_ENGLISH}  "Fonts"
-        LangString uninstFailed      ${LANG_ENGLISH}  "Uninstallation of the previous version failed.$\nPlease uninstall ${SOFT_NAME} manually before continuing."
-
         
-        LangString installed         ${LANG_KOREAN} "${SOFT_NAME}이(가) 이미 설치되어 있습니다. $\n$\n이전 버전을 제거하려면 `OK`를, 업그레이드를 취소하려면 `Cancel`을 클릭하세요."
-        LangString wrongArch         ${LANG_KOREAN} "이 배포판은 64비트 컴퓨터에서만 사용할 수 있습니다."
-        LangString Elements          ${LANG_KOREAN} "요소"
-        LangString Electric          ${LANG_KOREAN} "전기"
-        LangString Logic             ${LANG_KOREAN} "로직"
-        LangString Hydraulic         ${LANG_KOREAN} "유압"
-        LangString Pneumatic         ${LANG_KOREAN} "공압"
-        LangString Energy            ${LANG_KOREAN} "에너지"
-        LangString water             ${LANG_KOREAN} "물"
-        LangString Refrigeration     ${LANG_KOREAN} "냉동"
-        LangString Solar_thermal     ${LANG_KOREAN} "태양열"
-        LangString Lang              ${LANG_KOREAN} "언어"
-        LangString Fonts             ${LANG_KOREAN}  "글꼴"
-        LangString Titleblocks       ${LANG_KOREAN} "표제란"
-        LangString Examples          ${LANG_KOREAN} "예제"
-        LangString Check             ${LANG_KOREAN} "${SOFT_NAME} 실행"
-        LangString var1              ${LANG_KOREAN} "공식 컬렉션 요소"
-        LangString var2              ${LANG_KOREAN} "언어 파일"
-        LangString var3              ${LANG_KOREAN} "표제란 예제"
-        LangString var4              ${LANG_KOREAN} "도면 예제"
-        LangString var5              ${LANG_KOREAN}  "글꼴"
-        LangString uninstFailed      ${LANG_KOREAN} "이전 버전을 제거하지 못했습니다.$\n계속하기 전에 ${SOFT_NAME}을(를) 수동으로 제거해 주세요."
-
-
+        
         LangString installed         ${LANG_POLISH}  "${SOFT_NAME} jest już zainstalowany. $\n$\nKliknij `OK` aby odinstalować poprzednią wersję lub `Anuluj` aby przerwać aktualizację."
         LangString wrongArch         ${LANG_POLISH}  "To oprogramowanie jest przeznaczone wyłącznie dla komputerów 64 bitowych."
         LangString Elements          ${LANG_POLISH}  "Elementy"
@@ -58,16 +31,13 @@
         LangString Refrigeration     ${LANG_POLISH}  "Chłodnictwo"
         LangString Solar_thermal     ${LANG_POLISH}  "Energia słoneczna"
         LangString Lang              ${LANG_POLISH}  "Język"
-        LangString Fonts             ${LANG_POLISH}  "Czcionki"
         LangString Titleblocks       ${LANG_POLISH}  "Tabliczki rysunkowe"
         LangString Examples          ${LANG_POLISH}  "Przykłady"
-        LangString Check             ${LANG_POLISH}  "Zaznacz, aby uruchomić ${SOFT_NAME}"
-        LangString var1              ${LANG_POLISH}  "Elementy oficjalnej kolekcji"
-        LangString var2              ${LANG_POLISH}  "Pliki językowe"
-        LangString var3              ${LANG_POLISH}  "Przykłady tabliczek rysunkowych"
-        LangString var4              ${LANG_POLISH}  "Przykłady schematów"
-        LangString var5              ${LANG_POLISH}  "Czcionki"
-        LangString uninstFailed      ${LANG_POLISH}  "Odinstalowanie poprzedniej wersji nie powiodło się.$\nPrzed kontynuowaniem odinstaluj ręcznie program ${SOFT_NAME}."
+        LangString Check             ${LANG_POLISH}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_POLISH}  "Elements of the official collection"
+        LangString var2              ${LANG_POLISH}  "languagues files"
+        LangString var3              ${LANG_POLISH}  "Examples of cartridges"
+        LangString var4              ${LANG_POLISH}  "Examples of diagrams"
         
         
         LangString installed         ${LANG_GREEK}  "${SOFT_NAME} είναι ήδη εγκατεστημένο. $\n$\nΠάτησε `OK` για αφαίρεση της προηγούμενης έκδοσης ή `Cancel` για ακύρωση της αναβάθμισης." 
@@ -82,64 +52,55 @@
         LangString Refrigeration     ${LANG_GREEK}  "Ψύξη"
         LangString Solar_thermal     ${LANG_GREEK}  "Ηλιοθερμία"
         LangString Lang              ${LANG_GREEK}  "Γλώσσα"
-        LangString Fonts             ${LANG_GREEK}  "Γραμματοσειρές"
         LangString Titleblocks       ${LANG_GREEK}  "Πινακίδες"
         LangString Examples          ${LANG_GREEK}  "Παραδείγματα"
         LangString Check             ${LANG_GREEK}  "Επιλέξτε για εκκίνηση ${SOFT_NAME}"
         LangString var1              ${LANG_GREEK}  "Στοιχεία της επίσημης συλλογής"
         LangString var2              ${LANG_GREEK}  "Αρχεία γλωσσών"
-        LangString var3              ${LANG_GREEK}  "Παραδείγματα πινακίδων"
+        LangString var3              ${LANG_GREEK}  "Examples of cartridges"
         LangString var4              ${LANG_GREEK}  "Παραδείγματα διαγραμμάτων"
-        LangString var5              ${LANG_GREEK}  "Γραμματοσειρές"
-        LangString uninstFailed      ${LANG_GREEK}  "Η απεγκατάσταση της προηγούμενης έκδοσης απέτυχε.$\nΠαρακαλώ απεγκαταστήστε χειροκίνητα το ${SOFT_NAME} πριν συνεχίσετε."
         
         
-        LangString installed         ${LANG_CZECH} "${SOFT_NAME} je již nainstalován. $\n$\nKlikněte na `OK` pro odebrání předchozí verze nebo na `Zrušit` pro zrušení tohoto upgradu." 
-        LangString wrongArch         ${LANG_CZECH} "Tato distribuce je určena pouze pro 64bitové počítače."
-        LangString Elements          ${LANG_CZECH}  "Prvky"
-        LangString Electric          ${LANG_CZECH}  "Elektrika"
-        LangString Logic             ${LANG_CZECH}  "Logika"
-        LangString Hydraulic         ${LANG_CZECH}  "Hydraulika"
-        LangString Pneumatic         ${LANG_CZECH}  "Pneumatika"
-        LangString Energy            ${LANG_CZECH}  "Energie"
-        LangString water             ${LANG_CZECH}  "Voda"
-        LangString Refrigeration     ${LANG_CZECH}  "Chlazení"
-        LangString Solar_thermal     ${LANG_CZECH}  "Solární_teplo"
-        LangString Lang              ${LANG_CZECH}  "Jazyk"
-        LangString Fonts             ${LANG_CZECH}  "Písma"
-        LangString Titleblocks       ${LANG_CZECH}  "Popisová pole"
-        LangString Examples          ${LANG_CZECH}  "Příklady"
-        LangString Check             ${LANG_CZECH}  "Zaškrtněte pro spuštění ${SOFT_NAME}"
-        LangString var1              ${LANG_CZECH}  "Prvky oficiální kolekce"
-        LangString var2              ${LANG_CZECH}  "Jazykové soubory"
-        LangString var3              ${LANG_CZECH}  "Příklady popisových polí"
-        LangString var4              ${LANG_CZECH}  "Příklady schémat"
-        LangString var5              ${LANG_CZECH}  "Písma"
-        LangString uninstFailed      ${LANG_CZECH}  "Odinstalování předchozí verze se nezdařilo.$\nPřed pokračováním prosím odinstalujte ${SOFT_NAME} ručně."
+        LangString installed         ${LANG_CZECH} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString wrongArch         ${LANG_CZECH} "This distribution is for 64 bits computers only."
+        LangString Elements          ${LANG_CZECH}  "Elements"
+        LangString Electric          ${LANG_CZECH}  "Electric"
+        LangString Logic             ${LANG_CZECH}  "Logic"
+        LangString Hydraulic         ${LANG_CZECH}  "Hydraulic"
+        LangString Pneumatic         ${LANG_CZECH}  "Pneumatic"
+        LangString Energy            ${LANG_CZECH}  "Energy"
+        LangString water             ${LANG_CZECH}  "Water"
+        LangString Refrigeration     ${LANG_CZECH}  "Refrigeration"
+        LangString Solar_thermal     ${LANG_CZECH}  "Solar_thermal"
+        LangString Lang              ${LANG_CZECH}  "Lang"
+        LangString Titleblocks       ${LANG_CZECH}  "Titleblocks"
+        LangString Examples          ${LANG_CZECH}  "Examples"
+        LangString Check             ${LANG_CZECH}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_CZECH}  "Elements of the official collection"
+        LangString var2              ${LANG_CZECH}  "languagues files"
+        LangString var3              ${LANG_CZECH}  "Examples of cartridges"
+        LangString var4              ${LANG_CZECH}  "Examples of diagrams"
         
         
-        LangString installed         ${LANG_SPANISH} "${SOFT_NAME} ya está instalado. $\n$\nHaga clic en `Aceptar` para eliminar la versión anterior o en `Cancelar` para cancelar esta actualización." 
-        LangString wrongArch         ${LANG_SPANISH} "Esta distribución es solo para ordenadores de 64 bits."
-        LangString Elements          ${LANG_SPANISH}  "Elementos"
-        LangString Electric          ${LANG_SPANISH}  "Eléctrico"
-        LangString Logic             ${LANG_SPANISH}  "Lógica"
-        LangString Hydraulic         ${LANG_SPANISH}  "Hidráulica"
-        LangString Pneumatic         ${LANG_SPANISH}  "Neumática"
-        LangString Energy            ${LANG_SPANISH}  "Energía"
-        LangString water             ${LANG_SPANISH}  "Agua"
-        LangString Refrigeration     ${LANG_SPANISH}  "Refrigeración"
-        LangString Solar_thermal     ${LANG_SPANISH}  "Solar_térmico"
-        LangString Lang              ${LANG_SPANISH}  "Idioma"
-        LangString Fonts             ${LANG_SPANISH}  "Fuentes"
-        LangString Titleblocks       ${LANG_SPANISH}  "Cartelas"
-        LangString Examples          ${LANG_SPANISH}  "Ejemplos"
-        LangString Check             ${LANG_SPANISH}  "Marcar para iniciar ${SOFT_NAME}"
-        LangString var1              ${LANG_SPANISH}  "Elementos de la colección oficial"
-        LangString var2              ${LANG_SPANISH}  "Archivos de idioma"
-        LangString var3              ${LANG_SPANISH}  "Ejemplos de cartelas"
-        LangString var4              ${LANG_SPANISH}  "Ejemplos de esquemas"
-        LangString var5              ${LANG_SPANISH}  "Fuentes"
-        LangString uninstFailed      ${LANG_SPANISH}  "La desinstalación de la versión anterior ha fallado.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar."
+        LangString installed         ${LANG_SPANISH} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString wrongArch         ${LANG_SPANISH} "This distribution is for 64 bits computers only."
+        LangString Elements          ${LANG_SPANISH}  "Elements"
+        LangString Electric          ${LANG_SPANISH}  "Electric"
+        LangString Logic             ${LANG_SPANISH}  "Logic"
+        LangString Hydraulic         ${LANG_SPANISH}  "Hydraulic"
+        LangString Pneumatic         ${LANG_SPANISH}  "Pneumatic"
+        LangString Energy            ${LANG_SPANISH}  "Energy"
+        LangString water             ${LANG_SPANISH}  "Water"
+        LangString Refrigeration     ${LANG_SPANISH}  "Refrigeration"
+        LangString Solar_thermal     ${LANG_SPANISH}  "Solar_thermal"
+        LangString Lang              ${LANG_SPANISH}  "Lang"
+        LangString Titleblocks       ${LANG_SPANISH}  "Titleblocks"
+        LangString Examples          ${LANG_SPANISH}  "Examples"
+        LangString Check             ${LANG_SPANISH}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_SPANISH}  "Elements of the official collection"
+        LangString var2              ${LANG_SPANISH}  "languagues files"
+        LangString var3              ${LANG_SPANISH}  "Examples of cartridges"
+        LangString var4              ${LANG_SPANISH}  "Examples of diagrams"
         
         
         LangString installed         ${LANG_GERMAN} "${SOFT_NAME} ist bereits installiert. $\n$\nKlicken Sie auf `OK`, um die alte Version zu deinstallieren, oder auf `Abbrechen`, um das Upgrade abzubrechen." 
@@ -154,7 +115,6 @@
         LangString Refrigeration     ${LANG_GERMAN}  "Kältetechnik"
         LangString Solar_thermal     ${LANG_GERMAN}  "Solar-Wärmetechnik"
         LangString Lang              ${LANG_GERMAN}  "Sprachen"
-        LangString Fonts             ${LANG_GERMAN}  "Schriften"
         LangString Titleblocks       ${LANG_GERMAN}  "Schriftfelder"
         LangString Examples          ${LANG_GERMAN}  "Beispiele"
         LangString Check             ${LANG_GERMAN}  "Ankreuzen zum Starten von ${SOFT_NAME}"
@@ -162,8 +122,6 @@
         LangString var2              ${LANG_GERMAN}  "Sprachdateien"
         LangString var3              ${LANG_GERMAN}  "Schriftfeld-Beispiele"
         LangString var4              ${LANG_GERMAN}  "Schaltplan-Beispiele"
-        LangString var5              ${LANG_GERMAN}  "Schriften"
-        LangString uninstFailed      ${LANG_GERMAN}  "Die Deinstallation der vorherigen Version ist fehlgeschlagen.$\nBitte deinstallieren Sie ${SOFT_NAME} manuell, bevor Sie fortfahren."
         
         
         LangString installed         ${LANG_RUSSIAN} "${SOFT_NAME} уже установлен. $\n$\nДля удаления предыдущей версии нажмите `OK` или `Cancel` для отмены обновления." 
@@ -178,7 +136,6 @@
         LangString Refrigeration     ${LANG_RUSSIAN}  "Холодильная техника"
         LangString Solar_thermal     ${LANG_RUSSIAN}  "Солнечная-тепловая"
         LangString Lang              ${LANG_RUSSIAN}  "Язык"
-        LangString Fonts             ${LANG_RUSSIAN}  "Шрифты"
         LangString Titleblocks       ${LANG_RUSSIAN}  "Штампы"
         LangString Examples          ${LANG_RUSSIAN}  "Примеры"
         LangString Check             ${LANG_RUSSIAN}  "Нажмите для запуска ${SOFT_NAME}"
@@ -186,56 +143,48 @@
         LangString var2              ${LANG_RUSSIAN}  "языковые файлы"
         LangString var3              ${LANG_RUSSIAN}  "Примеры штампов"
         LangString var4              ${LANG_RUSSIAN}  "Примеры схем"
-        LangString var5              ${LANG_RUSSIAN}  "Шрифты"
-        LangString uninstFailed      ${LANG_RUSSIAN}  "Удаление предыдущей версии завершилось с ошибкой.$\nПожалуйста, удалите ${SOFT_NAME} вручную перед продолжением."
         
         
-        LangString installed         ${LANG_ARABIC} "${SOFT_NAME} مثبَّت بالفعل. $\n$\nانقر على `موافق` لإزالة الإصدار السابق أو على `إلغاء` لإلغاء هذا التحديث." 
-        LangString wrongArch         ${LANG_ARABIC} "هذا التوزيع مخصص لأجهزة الكمبيوتر 64 بت فقط."
-        LangString Elements          ${LANG_ARABIC}  "العناصر"
-        LangString Electric          ${LANG_ARABIC}  "الكهرباء"
-        LangString Logic             ${LANG_ARABIC}  "المنطق"
-        LangString Hydraulic         ${LANG_ARABIC}  "الهيدروليك"
-        LangString Pneumatic         ${LANG_ARABIC}  "الهواء المضغوط"
-        LangString Energy            ${LANG_ARABIC}  "الطاقة"
-        LangString water             ${LANG_ARABIC}  "الماء"
-        LangString Refrigeration     ${LANG_ARABIC}  "التبريد"
-        LangString Solar_thermal     ${LANG_ARABIC}  "الطاقة_الشمسية_الحرارية"
-        LangString Lang              ${LANG_ARABIC}  "اللغة"
-        LangString Fonts             ${LANG_ARABIC}  "الخطوط"
-        LangString Titleblocks       ${LANG_ARABIC}  "كتل العنوان"
-        LangString Examples          ${LANG_ARABIC}  "أمثلة"
-        LangString Check             ${LANG_ARABIC}  "حدد لتشغيل ${SOFT_NAME}"
-        LangString var1              ${LANG_ARABIC}  "عناصر المجموعة الرسمية"
-        LangString var2              ${LANG_ARABIC}  "ملفات اللغة"
-        LangString var3              ${LANG_ARABIC}  "أمثلة على كتل العنوان"
-        LangString var4              ${LANG_ARABIC}  "أمثلة على المخططات"
-        LangString var5              ${LANG_ARABIC}  "الخطوط"
-        LangString uninstFailed      ${LANG_ARABIC}  "فشل إلغاء تثبيت الإصدار السابق. يرجى إلغاء تثبيت ${SOFT_NAME} يدويًا قبل المتابعة."
+        LangString installed         ${LANG_ARABIC} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString wrongArch         ${LANG_ARABIC} "This distribution is for 64 bits computers only."
+        LangString Elements          ${LANG_ARABIC}  "Elements"
+        LangString Electric          ${LANG_ARABIC}  "Electric"
+        LangString Logic             ${LANG_ARABIC}  "Logic"
+        LangString Hydraulic         ${LANG_ARABIC}  "Hydraulic"
+        LangString Pneumatic         ${LANG_ARABIC}  "Pneumatic"
+        LangString Energy            ${LANG_ARABIC}  "Energy"
+        LangString water             ${LANG_ARABIC}  "Water"
+        LangString Refrigeration     ${LANG_ARABIC}  "Refrigeration"
+        LangString Solar_thermal     ${LANG_ARABIC}  "Solar_thermal"
+        LangString Lang              ${LANG_ARABIC}  "Lang"
+        LangString Titleblocks       ${LANG_ARABIC}  "Titleblocks"
+        LangString Examples          ${LANG_ARABIC}  "Examples"
+        LangString Check             ${LANG_ARABIC}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_ARABIC}  "Elements of the official collection"
+        LangString var2              ${LANG_ARABIC}  "languagues files"
+        LangString var3              ${LANG_ARABIC}  "Examples of cartridges"
+        LangString var4              ${LANG_ARABIC}  "Examples of diagrams"
         
         
-        LangString installed         ${LANG_CATALAN} "${SOFT_NAME} ja està instal·lat. $\n$\nFeu clic a `D'acord` per eliminar la versió anterior o a `Cancel·la` per cancel·lar aquesta actualització." 
-        LangString wrongArch         ${LANG_CATALAN} "Aquesta distribució és només per a ordinadors de 64 bits."
+        LangString installed         ${LANG_CATALAN} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString wrongArch         ${LANG_CATALAN} "This distribution is for 64 bits computers only."
         LangString Elements          ${LANG_CATALAN}  "Elements"
-        LangString Electric          ${LANG_CATALAN}  "Elèctric"
-        LangString Logic             ${LANG_CATALAN}  "Lògica"
-        LangString Hydraulic         ${LANG_CATALAN}  "Hidràulica"
-        LangString Pneumatic         ${LANG_CATALAN}  "Pneumàtica"
-        LangString Energy            ${LANG_CATALAN}  "Energia"
-        LangString water             ${LANG_CATALAN}  "Aigua"
-        LangString Refrigeration     ${LANG_CATALAN}  "Refrigeració"
-        LangString Solar_thermal     ${LANG_CATALAN}  "Solar_tèrmic"
-        LangString Lang              ${LANG_CATALAN}  "Idioma"
-        LangString Fonts             ${LANG_CATALAN}  "Tipus de lletra"
-        LangString Titleblocks       ${LANG_CATALAN}  "Cartutxos"
-        LangString Examples          ${LANG_CATALAN}  "Exemples"
-        LangString Check             ${LANG_CATALAN}  "Marca per iniciar ${SOFT_NAME}"
-        LangString var1              ${LANG_CATALAN}  "Elements de la col·lecció oficial"
-        LangString var2              ${LANG_CATALAN}  "Fitxers d'idioma"
-        LangString var3              ${LANG_CATALAN}  "Exemples de cartutxos"
-        LangString var4              ${LANG_CATALAN}  "Exemples d'esquemes"
-        LangString var5              ${LANG_CATALAN}  "Tipus de lletra"
-        LangString uninstFailed      ${LANG_CATALAN}  "La desinstal·lació de la versió anterior ha fallat.$\nSi us plau, desinstal·leu ${SOFT_NAME} manualment abans de continuar."
+        LangString Electric          ${LANG_CATALAN}  "Electric"
+        LangString Logic             ${LANG_CATALAN}  "Logic"
+        LangString Hydraulic         ${LANG_CATALAN}  "Hydraulic"
+        LangString Pneumatic         ${LANG_CATALAN}  "Pneumatic"
+        LangString Energy            ${LANG_CATALAN}  "Energy"
+        LangString water             ${LANG_CATALAN}  "Water"
+        LangString Refrigeration     ${LANG_CATALAN}  "Refrigeration"
+        LangString Solar_thermal     ${LANG_CATALAN}  "Solar_thermal"
+        LangString Lang              ${LANG_CATALAN}  "Lang"
+        LangString Titleblocks       ${LANG_CATALAN}  "Titleblocks"
+        LangString Examples          ${LANG_CATALAN}  "Examples"
+        LangString Check             ${LANG_CATALAN}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_CATALAN}  "Elements of the official collection"
+        LangString var2              ${LANG_CATALAN}  "languagues files"
+        LangString var3              ${LANG_CATALAN}  "Examples of cartridges"
+        LangString var4              ${LANG_CATALAN}  "Examples of diagrams"
         
         
         LangString installed         ${LANG_ITALIAN} "${SOFT_NAME} è già installato. $\n$\nFare click su `OK` per rimuovere la versione precedente o su `Annulla` per annullare questo aggiornamento." 
@@ -250,7 +199,6 @@
         LangString Refrigeration     ${LANG_ITALIAN}  "Refrigerazione"
         LangString Solar_thermal     ${LANG_ITALIAN}  "Solare_termico"
         LangString Lang              ${LANG_ITALIAN}  "Lingua"
-        LangString Fonts             ${LANG_ITALIAN}  "Caratteri"
         LangString Titleblocks       ${LANG_ITALIAN}  "Cartigli"
         LangString Examples          ${LANG_ITALIAN}  "Esempi"
         LangString Check             ${LANG_ITALIAN}  "Avvia ${SOFT_NAME}"
@@ -258,80 +206,69 @@
         LangString var2              ${LANG_ITALIAN}  "File della lingua"
         LangString var3              ${LANG_ITALIAN}  "Cartigli di esempio"
         LangString var4              ${LANG_ITALIAN}  "Schemi di esempio"
-        LangString var5              ${LANG_ITALIAN}  "Caratteri"
-        LangString uninstFailed      ${LANG_ITALIAN}  "La disinstallazione della versione precedente non è riuscita.$\nSi prega di disinstallare ${SOFT_NAME} manualmente prima di continuare."
         
         
-        LangString installed         ${LANG_PORTUGUESE} "${SOFT_NAME} já está instalado. $\n$\nClique em `OK` para remover a versão anterior ou em `Cancelar` para cancelar esta atualização." 
-        LangString wrongArch         ${LANG_PORTUGUESE} "Esta distribuição é apenas para computadores de 64 bits."
-        LangString Elements          ${LANG_PORTUGUESE}  "Elementos"
-        LangString Electric          ${LANG_PORTUGUESE}  "Elétrica"
-        LangString Logic             ${LANG_PORTUGUESE}  "Lógica"
-        LangString Hydraulic         ${LANG_PORTUGUESE}  "Hidráulica"
-        LangString Pneumatic         ${LANG_PORTUGUESE}  "Pneumática"
-        LangString Energy            ${LANG_PORTUGUESE}  "Energia"
-        LangString water             ${LANG_PORTUGUESE}  "Água"
-        LangString Refrigeration     ${LANG_PORTUGUESE}  "Refrigeração"
-        LangString Solar_thermal     ${LANG_PORTUGUESE}  "Solar_térmico"
-        LangString Lang              ${LANG_PORTUGUESE}  "Idioma"
-        LangString Fonts             ${LANG_PORTUGUESE}  "Fontes"
-        LangString Titleblocks       ${LANG_PORTUGUESE}  "Legendas"
-        LangString Examples          ${LANG_PORTUGUESE}  "Exemplos"
-        LangString Check             ${LANG_PORTUGUESE}  "Marcar para iniciar ${SOFT_NAME}"
-        LangString var1              ${LANG_PORTUGUESE}  "Elementos da coleção oficial"
-        LangString var2              ${LANG_PORTUGUESE}  "Arquivos de idioma"
-        LangString var3              ${LANG_PORTUGUESE}  "Exemplos de legendas"
-        LangString var4              ${LANG_PORTUGUESE}  "Exemplos de esquemas"
-        LangString var5              ${LANG_PORTUGUESE}  "Fontes"
-        LangString uninstFailed      ${LANG_PORTUGUESE}  "A desinstalação da versão anterior falhou.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar."
+        LangString installed         ${LANG_PORTUGUESE} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString wrongArch         ${LANG_PORTUGUESE} "This distribution is for 64 bits computers only."
+        LangString Elements          ${LANG_PORTUGUESE}  "Elements"
+        LangString Electric          ${LANG_PORTUGUESE}  "Electric"
+        LangString Logic             ${LANG_PORTUGUESE}  "Logic"
+        LangString Hydraulic         ${LANG_PORTUGUESE}  "Hydraulic"
+        LangString Pneumatic         ${LANG_PORTUGUESE}  "Pneumatic"
+        LangString Energy            ${LANG_PORTUGUESE}  "Energy"
+        LangString water             ${LANG_PORTUGUESE}  "Water"
+        LangString Refrigeration     ${LANG_PORTUGUESE}  "Refrigeration"
+        LangString Solar_thermal     ${LANG_PORTUGUESE}  "Solar_thermal"
+        LangString Lang              ${LANG_PORTUGUESE}  "Lang"
+        LangString Titleblocks       ${LANG_PORTUGUESE}  "Titleblocks"
+        LangString Examples          ${LANG_PORTUGUESE}  "Examples"
+        LangString Check             ${LANG_PORTUGUESE}  "Avviare ${SOFT_NAME}"
+        LangString var1              ${LANG_PORTUGUESE}  "Elements of the official collection"
+        LangString var2              ${LANG_PORTUGUESE}  "languagues files"
+        LangString var3              ${LANG_PORTUGUESE}  "Examples of cartridges"
+        LangString var4              ${LANG_PORTUGUESE}  "Examples of diagrams"
         
         
-        LangString installed         ${LANG_ROMANIAN} "${SOFT_NAME} este deja instalat. $\n$\nFaceți clic pe `OK` pentru a elimina versiunea anterioară sau pe `Anulare` pentru a anula această actualizare." 
-        LangString wrongArch         ${LANG_ROMANIAN} "Această distribuție este destinată numai computerelor pe 64 de biți."
-        LangString Elements          ${LANG_ROMANIAN}  "Elemente"
+        LangString installed         ${LANG_ROMANIAN} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString wrongArch         ${LANG_ROMANIAN} "This distribution is for 64 bits computers only."
+        LangString Elements          ${LANG_ROMANIAN}  "Elements"
         LangString Electric          ${LANG_ROMANIAN}  "Electric"
-        LangString Logic             ${LANG_ROMANIAN}  "Logică"
-        LangString Hydraulic         ${LANG_ROMANIAN}  "Hidraulică"
-        LangString Pneumatic         ${LANG_ROMANIAN}  "Pneumatică"
-        LangString Energy            ${LANG_ROMANIAN}  "Energie"
-        LangString water             ${LANG_ROMANIAN}  "Apă"
-        LangString Refrigeration     ${LANG_ROMANIAN}  "Refrigerare"
-        LangString Solar_thermal     ${LANG_ROMANIAN}  "Solar_termic"
-        LangString Lang              ${LANG_ROMANIAN}  "Limbă"
-        LangString Fonts             ${LANG_ROMANIAN}  "Fonturi"
-        LangString Titleblocks       ${LANG_ROMANIAN}  "Cartușe"
-        LangString Examples          ${LANG_ROMANIAN}  "Exemple"
-        LangString Check             ${LANG_ROMANIAN}  "Bifați pentru a porni ${SOFT_NAME}"
-        LangString var1              ${LANG_ROMANIAN}  "Elemente din colecția oficială"
-        LangString var2              ${LANG_ROMANIAN}  "Fișiere de limbă"
-        LangString var3              ${LANG_ROMANIAN}  "Exemple de cartușe"
-        LangString var4              ${LANG_ROMANIAN}  "Exemple de scheme"
-        LangString var5              ${LANG_ROMANIAN}  "Fonturi"
-        LangString uninstFailed      ${LANG_ROMANIAN}  "Dezinstalarea versiunii anterioare a eșuat.$\nVă rugăm să dezinstalați ${SOFT_NAME} manual înainte de a continua."
+        LangString Logic             ${LANG_ROMANIAN}  "Logic"
+        LangString Hydraulic         ${LANG_ROMANIAN}  "Hydraulic"
+        LangString Pneumatic         ${LANG_ROMANIAN}  "Pneumatic"
+        LangString Energy            ${LANG_ROMANIAN}  "Energy"
+        LangString water             ${LANG_ROMANIAN}  "Water"
+        LangString Refrigeration     ${LANG_ROMANIAN}  "Refrigeration"
+        LangString Solar_thermal     ${LANG_ROMANIAN}  "Solar_thermal"
+        LangString Lang              ${LANG_ROMANIAN}  "Lang"
+        LangString Titleblocks       ${LANG_ROMANIAN}  "Titleblocks"
+        LangString Examples          ${LANG_ROMANIAN}  "Examples"
+        LangString Check             ${LANG_ROMANIAN}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_ROMANIAN}  "Elements of the official collection"
+        LangString var2              ${LANG_ROMANIAN}  "languagues files"
+        LangString var3              ${LANG_ROMANIAN}  "Examples of cartridges"
+        LangString var4              ${LANG_ROMANIAN}  "Examples of diagrams"
         
         
-        LangString installed         ${LANG_CROATIAN} "${SOFT_NAME} je već instaliran. $\n$\nKliknite `U redu` za uklanjanje prethodne verzije ili `Odustani` za odustajanje od nadogradnje." 
-        LangString wrongArch         ${LANG_CROATIAN} "Ova distribucija namijenjena je samo za 64-bitna računala."
-        LangString Elements          ${LANG_CROATIAN}  "Elementi"
-        LangString Electric          ${LANG_CROATIAN}  "Elektrika"
-        LangString Logic             ${LANG_CROATIAN}  "Logika"
-        LangString Hydraulic         ${LANG_CROATIAN}  "Hidraulika"
-        LangString Pneumatic         ${LANG_CROATIAN}  "Pneumatika"
-        LangString Energy            ${LANG_CROATIAN}  "Energija"
-        LangString water             ${LANG_CROATIAN}  "Voda"
-        LangString Refrigeration     ${LANG_CROATIAN}  "Hlađenje"
-        LangString Solar_thermal     ${LANG_CROATIAN}  "Solarno_toplinsko"
-        LangString Lang              ${LANG_CROATIAN}  "Jezik"
-        LangString Fonts             ${LANG_CROATIAN}  "Fontovi"
-        LangString Titleblocks       ${LANG_CROATIAN}  "Zaglavlja"
-        LangString Examples          ${LANG_CROATIAN}  "Primjeri"
-        LangString Check             ${LANG_CROATIAN}  "Označite za pokretanje ${SOFT_NAME}"
-        LangString var1              ${LANG_CROATIAN}  "Elementi službene zbirke"
-        LangString var2              ${LANG_CROATIAN}  "Jezične datoteke"
-        LangString var3              ${LANG_CROATIAN}  "Primjeri zaglavlja"
-        LangString var4              ${LANG_CROATIAN}  "Primjeri shema"
-        LangString var5              ${LANG_CROATIAN}  "Fontovi"
-        LangString uninstFailed      ${LANG_CROATIAN}  "Deinstalacija prethodne verzije nije uspjela.$\nMolimo deinstalirajte ${SOFT_NAME} ručno prije nastavka."
+        LangString installed         ${LANG_CROATIAN} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+        LangString wrongArch         ${LANG_CROATIAN} "This distribution is for 64 bits computers only."
+        LangString Elements          ${LANG_CROATIAN}  "Elements"
+        LangString Electric          ${LANG_CROATIAN}  "Electric"
+        LangString Logic             ${LANG_CROATIAN}  "Logic"
+        LangString Hydraulic         ${LANG_CROATIAN}  "Hydraulic"
+        LangString Pneumatic         ${LANG_CROATIAN}  "Pneumatic"
+        LangString Energy            ${LANG_CROATIAN}  "Energy"
+        LangString water             ${LANG_CROATIAN}  "Water"
+        LangString Refrigeration     ${LANG_CROATIAN}  "Refrigeration"
+        LangString Solar_thermal     ${LANG_CROATIAN}  "Solar_thermal"
+        LangString Lang              ${LANG_CROATIAN}  "Lang"
+        LangString Titleblocks       ${LANG_CROATIAN}  "Titleblocks"
+        LangString Examples          ${LANG_CROATIAN}  "Examples"
+        LangString Check             ${LANG_CROATIAN}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_CROATIAN}  "Elements of the official collection"
+        LangString var2              ${LANG_CROATIAN}  "languagues files"
+        LangString var3              ${LANG_CROATIAN}  "Examples of cartridges"
+        LangString var4              ${LANG_CROATIAN}  "Examples of diagrams"
         
         
         LangString installed         ${LANG_DUTCH}  "${SOFT_NAME} is al geinstalleerd. $\n$\nklik `OK` om vorige versie te verwijderen of `annuleer` om deze upgrade te annuleren."
@@ -346,16 +283,34 @@
         LangString Refrigeration     ${LANG_DUTCH}  "Koelinstallaties"
         LangString Solar_thermal     ${LANG_DUTCH}  "Zonne_warmte"
         LangString Lang              ${LANG_DUTCH}  "Taal"
-        LangString Fonts             ${LANG_DUTCH}  "Lettertypen"
         LangString Titleblocks       ${LANG_DUTCH}  "Titelblok"
         LangString Examples          ${LANG_DUTCH}  "Voorbeelden"
-        LangString Check             ${LANG_DUTCH}  "Aanvinken om ${SOFT_NAME} te starten"
-        LangString var1              ${LANG_DUTCH}  "Elementen van de officiële verzameling"
-        LangString var2              ${LANG_DUTCH}  "Taalbestanden"
-        LangString var3              ${LANG_DUTCH}  "Voorbeelden van titelblokken"
-        LangString var4              ${LANG_DUTCH}  "Voorbeelden van schema's"
-        LangString var5              ${LANG_DUTCH}  "Lettertypen"
-        LangString uninstFailed      ${LANG_DUTCH}  "Het verwijderen van de vorige versie is mislukt.$\nVerwijder ${SOFT_NAME} handmatig voordat u verdergaat."
+        LangString Check             ${LANG_DUTCH}  "Check to start ${SOFT_NAME}"
+        LangString Check             ${LANG_DUTCH}  "Check to start ${SOFT_NAME}"
+        LangString var1              ${LANG_DUTCH}  "Elements of the official collection"
+        LangString var2              ${LANG_DUTCH}  "languagues files"
+        LangString var3              ${LANG_DUTCH}  "Examples of cartridges"
+        LangString var4              ${LANG_DUTCH}  "Examples of diagrams"
+
+        LangString installed         ${LANG_DUTCH_BELGIUM} "${SOFT_NAME} is reeds geinstallerd. $\n$\nKlik`OK` om vorige versie te verwijderen of `Afbreken` om de upgrade niet uit te voeren." 
+        LangString wrongArch         ${LANG_DUTCH_BELGIUM} "Deze distributie werkt enkel op 64 bits computers."
+        LangString Elements          ${LANG_DUTCH_BELGIUM}  "Elementen"
+        LangString Electric          ${LANG_DUTCH_BELGIUM}  "Electrisch"
+        LangString Logic             ${LANG_DUTCH_BELGIUM}  "Logica"
+        LangString Hydraulic         ${LANG_DUTCH_BELGIUM}  "Hydraulisch"
+        LangString Pneumatic         ${LANG_DUTCH_BELGIUM}  "Pneumatisch"
+        LangString Energy            ${LANG_DUTCH_BELGIUM}  "Energie"
+        LangString water             ${LANG_DUTCH_BELGIUM}  "Water"
+        LangString Refrigeration     ${LANG_DUTCH_BELGIUM}  "Klimatisatie"
+        LangString Solar_thermal     ${LANG_DUTCH_BELGIUM}  "Termisch & zonlicht"
+        LangString Lang              ${LANG_DUTCH_BELGIUM}  "Taal"
+        LangString Titleblocks       ${LANG_DUTCH_BELGIUM}  "Titelhoek"
+        LangString Examples          ${LANG_DUTCH_BELGIUM}  "Voorbeelden"
+        LangString Check             ${LANG_DUTCH_BELGIUM}  "Controleer om te beginnen ${SOFT_NAME}"
+        LangString var1              ${LANG_DUTCH_BELGIUM}  "Symbolen van de officielen verzameling"
+        LangString var2              ${LANG_DUTCH_BELGIUM}  "taal bestanden"
+        LangString var3              ${LANG_DUTCH_BELGIUM}  "Voorbeel titelhoeken"
+        LangString var4              ${LANG_DUTCH_BELGIUM}  "Voorbeeld schema's"
         
         
         LangString installed         ${LANG_DANISH} "${SOFT_NAME} er allerede installeret. $\n$\nKlik `Ok` for at fjerne foregående version eller `Annuller` for at annullere opgraderingen." 
@@ -370,7 +325,6 @@
         LangString Refrigeration     ${LANG_DANISH}  "Køle teknik"
         LangString Solar_thermal     ${LANG_DANISH}  "Sol & varme teknik"
         LangString Lang              ${LANG_DANISH}  "Sprog"
-        LangString Fonts             ${LANG_DANISH}  "Skrifttyper"
         LangString Titleblocks       ${LANG_DANISH}  "Titel blokke"
         LangString Examples          ${LANG_DANISH}  "Eksempler"
         LangString Check             ${LANG_DANISH}  "Vælg for at starte ${SOFT_NAME}"
@@ -378,8 +332,5 @@
         LangString var2              ${LANG_DANISH}  "Sprog filer"
         LangString var3              ${LANG_DANISH}  "Titel blokke eksempler"
         LangString var4              ${LANG_DANISH}  "Diagram eksempler"
-        LangString var5              ${LANG_DANISH}  "Skrifttyper"
-        LangString uninstFailed      ${LANG_DANISH}  "Afinstallation af den tidligere version mislykkedes.$\nAfinstaller venligst ${SOFT_NAME} manuelt, inden du fortsætter."
-
         
         

build-aux/windows/lang_extra_fr.nsh

@@ -1,6 +1,6 @@
         LangString wrongArch         ${LANG_FRENCH}  "Ce programme est pour Windows 64 bits seulement."
-        LangString installed         ${LANG_FRENCH}  "${SOFT_NAME} est déja installé. $\n$\nCliquer sur `OK` pour désinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
-        LangString Elements          ${LANG_FRENCH}  "Eléments"
+        LangString installed         ${LANG_FRENCH}  "${SOFT_NAME} est déja installé. $\n$\nCliquer sur `OK` pour désinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
+        LangString Elements          ${LANG_FRENCH}  "Eléments"
         LangString Electric          ${LANG_FRENCH}  "Electrique"
         LangString Logic             ${LANG_FRENCH}  "Logique"
         LangString Hydraulic         ${LANG_FRENCH}  "Hydraulique"
@@ -10,13 +10,10 @@
         LangString Refrigeration     ${LANG_FRENCH}  "Climatisation"
         LangString Solar_thermal     ${LANG_FRENCH}  "Thermique & solaire"
         LangString Lang              ${LANG_FRENCH}  "Langues"
-        LangString Fonts             ${LANG_FRENCH}  "Polices"
         LangString Titleblocks       ${LANG_FRENCH}  "Cartouches"
         LangString Examples          ${LANG_FRENCH}  "Exemples"
         LangString Check             ${LANG_FRENCH}  "Cocher pour lancer ${SOFT_NAME}"
-        LangString var1              ${LANG_FRENCH}  "Eléments de la collection officielle"
+        LangString var1              ${LANG_FRENCH}  "Eléments de la collection officielle"
         LangString var2              ${LANG_FRENCH}  "Fichiers de langues"
         LangString var3              ${LANG_FRENCH}  "Exemples de cartouches"
-        LangString var4              ${LANG_FRENCH}  "Exemples de schémas"
-        LangString var5              ${LANG_FRENCH}  "Polices"
-        LangString uninstFailed      ${LANG_FRENCH}  "La désinstallation de la version précédente a échoué.$\nVeuillez désinstaller ${SOFT_NAME} manuellement avant de continuer."
+        LangString var4              ${LANG_FRENCH}  "Exemples de schémas"

build-aux/windows/lang_extra_missing.nsh

@@ -1,335 +0,0 @@
-; Missing language translations for QElectroTech installer
-; Languages added: hu, ja, mn, nb, nl_BE, nl_NL, pt_BR, rs/sr, sk, sl, sv, tr, uk, zh
-
-        ; ----------------------------------------------------------------
-        ; Hungarian (LANG_HUNGARIAN)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_HUNGARIAN} "${SOFT_NAME} már telepítve van. $\n$\nKattintson az `OK` gombra az előző verzió eltávolításához, vagy a `Mégse` gombra a frissítés megszakításához."
-        LangString wrongArch         ${LANG_HUNGARIAN} "Ez a terjesztés csak 64 bites számítógépekre való."
-        LangString Elements          ${LANG_HUNGARIAN}  "Elemek"
-        LangString Electric          ${LANG_HUNGARIAN}  "Elektromos"
-        LangString Logic             ${LANG_HUNGARIAN}  "Logika"
-        LangString Hydraulic         ${LANG_HUNGARIAN}  "Hidraulika"
-        LangString Pneumatic         ${LANG_HUNGARIAN}  "Pneumatika"
-        LangString Energy            ${LANG_HUNGARIAN}  "Energia"
-        LangString water             ${LANG_HUNGARIAN}  "Víz"
-        LangString Refrigeration     ${LANG_HUNGARIAN}  "Hűtés"
-        LangString Solar_thermal     ${LANG_HUNGARIAN}  "Nap_hőenergia"
-        LangString Lang              ${LANG_HUNGARIAN}  "Nyelv"
-        LangString Fonts             ${LANG_HUNGARIAN}  "Betűtípusok"
-        LangString Titleblocks       ${LANG_HUNGARIAN}  "Rajzfejlécek"
-        LangString Examples          ${LANG_HUNGARIAN}  "Példák"
-        LangString Check             ${LANG_HUNGARIAN}  "Jelölje be a ${SOFT_NAME} indításához"
-        LangString var1              ${LANG_HUNGARIAN}  "A hivatalos gyűjtemény elemei"
-        LangString var2              ${LANG_HUNGARIAN}  "Nyelvfájlok"
-        LangString var3              ${LANG_HUNGARIAN}  "Rajzfejléc-példák"
-        LangString var4              ${LANG_HUNGARIAN}  "Kapcsolási rajz példák"
-        LangString var5              ${LANG_HUNGARIAN}  "Betűtípusok"
-        LangString uninstFailed      ${LANG_HUNGARIAN}  "Az előző verzió eltávolítása nem sikerült.$\nKérjük, távolítsa el manuálisan a ${SOFT_NAME} programot, mielőtt folytatná."
-
-
-        ; ----------------------------------------------------------------
-        ; Japanese (LANG_JAPANESE)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_JAPANESE} "${SOFT_NAME} はすでにインストールされています。$\n$\n前のバージョンを削除するには `OK` をクリックし、このアップグレードをキャンセルするには `キャンセル` をクリックしてください。"
-        LangString wrongArch         ${LANG_JAPANESE} "この配布パッケージは64ビットコンピュータ専用です。"
-        LangString Elements          ${LANG_JAPANESE}  "部品"
-        LangString Electric          ${LANG_JAPANESE}  "電気"
-        LangString Logic             ${LANG_JAPANESE}  "論理"
-        LangString Hydraulic         ${LANG_JAPANESE}  "油圧"
-        LangString Pneumatic         ${LANG_JAPANESE}  "空圧"
-        LangString Energy            ${LANG_JAPANESE}  "エネルギー"
-        LangString water             ${LANG_JAPANESE}  "水"
-        LangString Refrigeration     ${LANG_JAPANESE}  "冷凍"
-        LangString Solar_thermal     ${LANG_JAPANESE}  "太陽熱"
-        LangString Lang              ${LANG_JAPANESE}  "言語"
-        LangString Fonts             ${LANG_JAPANESE}  "フォント"
-        LangString Titleblocks       ${LANG_JAPANESE}  "表題欄"
-        LangString Examples          ${LANG_JAPANESE}  "例"
-        LangString Check             ${LANG_JAPANESE}  "${SOFT_NAME} を起動するにはチェックを入れてください"
-        LangString var1              ${LANG_JAPANESE}  "公式コレクションの部品"
-        LangString var2              ${LANG_JAPANESE}  "言語ファイル"
-        LangString var3              ${LANG_JAPANESE}  "表題欄の例"
-        LangString var4              ${LANG_JAPANESE}  "回路図の例"
-        LangString var5              ${LANG_JAPANESE}  "フォント"
-        LangString uninstFailed      ${LANG_JAPANESE}  "前のバージョンのアンインストールに失敗しました。$\n続行する前に、${SOFT_NAME} を手動でアンインストールしてください。"
-
-
-        ; ----------------------------------------------------------------
-        ; Mongolian (LANG_MONGOLIAN)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_MONGOLIAN} "${SOFT_NAME} аль хэдийн суулгасан байна. $\n$\nӨмнөх хувилбарыг устгахын тулд `OK` дарна уу эсвэл энэ шинэчлэлтийг цуцлахын тулд `Цуцлах` дарна уу."
-        LangString wrongArch         ${LANG_MONGOLIAN} "Энэ тарилга нь зөвхөн 64 битийн компьютерт зориулагдсан."
-        LangString Elements          ${LANG_MONGOLIAN}  "Элементүүд"
-        LangString Electric          ${LANG_MONGOLIAN}  "Цахилгаан"
-        LangString Logic             ${LANG_MONGOLIAN}  "Логик"
-        LangString Hydraulic         ${LANG_MONGOLIAN}  "Гидравлик"
-        LangString Pneumatic         ${LANG_MONGOLIAN}  "Пневматик"
-        LangString Energy            ${LANG_MONGOLIAN}  "Эрчим хүч"
-        LangString water             ${LANG_MONGOLIAN}  "Ус"
-        LangString Refrigeration     ${LANG_MONGOLIAN}  "Хөргөлт"
-        LangString Solar_thermal     ${LANG_MONGOLIAN}  "Нарны_дулаан"
-        LangString Lang              ${LANG_MONGOLIAN}  "Хэл"
-        LangString Fonts             ${LANG_MONGOLIAN}  "Фонт"
-        LangString Titleblocks       ${LANG_MONGOLIAN}  "Гарчгийн блокууд"
-        LangString Examples          ${LANG_MONGOLIAN}  "Жишээнүүд"
-        LangString Check             ${LANG_MONGOLIAN}  "${SOFT_NAME} эхлүүлэхийн тулд тэмдэглэнэ үү"
-        LangString var1              ${LANG_MONGOLIAN}  "Албан ёсны цуглуулгын элементүүд"
-        LangString var2              ${LANG_MONGOLIAN}  "Хэлний файлууд"
-        LangString var3              ${LANG_MONGOLIAN}  "Гарчгийн блокын жишээнүүд"
-        LangString var4              ${LANG_MONGOLIAN}  "Схемийн жишээнүүд"
-        LangString var5              ${LANG_MONGOLIAN}  "Фонт"
-        LangString uninstFailed      ${LANG_MONGOLIAN}  "Өмнөх хувилбарыг устгаж чадсангүй.$\nҮргэлжлүүлэхийн өмнө ${SOFT_NAME}-г гараар устгана уу."
-
-
-        ; ----------------------------------------------------------------
-        ; Norwegian Bokmål (LANG_NORWEGIAN)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_NORWEGIAN} "${SOFT_NAME} er allerede installert. $\n$\nKlikk `OK` for å fjerne forrige versjon, eller `Avbryt` for å avbryte denne oppgraderingen."
-        LangString wrongArch         ${LANG_NORWEGIAN} "Denne distribusjonen er kun for 64-biters datamaskiner."
-        LangString Elements          ${LANG_NORWEGIAN}  "Elementer"
-        LangString Electric          ${LANG_NORWEGIAN}  "Elektrisk"
-        LangString Logic             ${LANG_NORWEGIAN}  "Logikk"
-        LangString Hydraulic         ${LANG_NORWEGIAN}  "Hydraulikk"
-        LangString Pneumatic         ${LANG_NORWEGIAN}  "Pneumatikk"
-        LangString Energy            ${LANG_NORWEGIAN}  "Energi"
-        LangString water             ${LANG_NORWEGIAN}  "Vann"
-        LangString Refrigeration     ${LANG_NORWEGIAN}  "Kjøling"
-        LangString Solar_thermal     ${LANG_NORWEGIAN}  "Solvarme"
-        LangString Lang              ${LANG_NORWEGIAN}  "Språk"
-        LangString Fonts             ${LANG_NORWEGIAN}  "Skrifttyper"
-        LangString Titleblocks       ${LANG_NORWEGIAN}  "Titelblokker"
-        LangString Examples          ${LANG_NORWEGIAN}  "Eksempler"
-        LangString Check             ${LANG_NORWEGIAN}  "Kryss av for å starte ${SOFT_NAME}"
-        LangString var1              ${LANG_NORWEGIAN}  "Elementer fra den offisielle samlingen"
-        LangString var2              ${LANG_NORWEGIAN}  "Språkfiler"
-        LangString var3              ${LANG_NORWEGIAN}  "Eksempler på titelblokker"
-        LangString var4              ${LANG_NORWEGIAN}  "Eksempler på skjemaer"
-        LangString var5              ${LANG_NORWEGIAN}  "Skrifttyper"
-        LangString uninstFailed      ${LANG_NORWEGIAN}  "Avinstallasjon av forrige versjon mislyktes.$\nVennligst avinstaller ${SOFT_NAME} manuelt før du fortsetter."
-
-
-        ; ----------------------------------------------------------------
-        ; Dutch Belgium (LANG_DUTCH / nl_BE — same LANG_DUTCH constant, Belgian variant)
-        ; Note: NSIS uses a single LANG_DUTCH constant for both nl_BE and nl_NL.
-        ; If your build distinguishes them via a custom constant, replace accordingly.
-        ; The block below is already covered by LANG_DUTCH in lang_extra.nsh.
-        ; Included here for completeness / override if needed.
-        ; ----------------------------------------------------------------
-        ; (nl_BE uses the same LANG_DUTCH strings already defined in lang_extra.nsh)
-
-
-        ; ----------------------------------------------------------------
-        ; Portuguese Brazil (LANG_PORTUGUESEBR)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_PORTUGUESEBR} "${SOFT_NAME} já está instalado. $\n$\nClique em `OK` para remover a versão anterior ou em `Cancelar` para cancelar esta atualização."
-        LangString wrongArch         ${LANG_PORTUGUESEBR} "Esta distribuição é apenas para computadores de 64 bits."
-        LangString Elements          ${LANG_PORTUGUESEBR}  "Elementos"
-        LangString Electric          ${LANG_PORTUGUESEBR}  "Elétrico"
-        LangString Logic             ${LANG_PORTUGUESEBR}  "Lógica"
-        LangString Hydraulic         ${LANG_PORTUGUESEBR}  "Hidráulica"
-        LangString Pneumatic         ${LANG_PORTUGUESEBR}  "Pneumática"
-        LangString Energy            ${LANG_PORTUGUESEBR}  "Energia"
-        LangString water             ${LANG_PORTUGUESEBR}  "Água"
-        LangString Refrigeration     ${LANG_PORTUGUESEBR}  "Refrigeração"
-        LangString Solar_thermal     ${LANG_PORTUGUESEBR}  "Solar_térmico"
-        LangString Lang              ${LANG_PORTUGUESEBR}  "Idioma"
-        LangString Fonts             ${LANG_PORTUGUESEBR}  "Fontes"
-        LangString Titleblocks       ${LANG_PORTUGUESEBR}  "Legendas"
-        LangString Examples          ${LANG_PORTUGUESEBR}  "Exemplos"
-        LangString Check             ${LANG_PORTUGUESEBR}  "Marcar para iniciar ${SOFT_NAME}"
-        LangString var1              ${LANG_PORTUGUESEBR}  "Elementos da coleção oficial"
-        LangString var2              ${LANG_PORTUGUESEBR}  "Arquivos de idioma"
-        LangString var3              ${LANG_PORTUGUESEBR}  "Exemplos de legendas"
-        LangString var4              ${LANG_PORTUGUESEBR}  "Exemplos de esquemas"
-        LangString var5              ${LANG_PORTUGUESEBR}  "Fontes"
-        LangString uninstFailed      ${LANG_PORTUGUESEBR}  "A desinstalação da versão anterior falhou.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar."
-
-
-        ; ----------------------------------------------------------------
-        ; Serbian (LANG_SERBIAN) — covers rs/sr
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_SERBIAN} "${SOFT_NAME} је већ инсталиран. $\n$\nКликните `OK` да уклоните претходну верзију или `Откажи` да откажете надоградњу."
-        LangString wrongArch         ${LANG_SERBIAN} "Ова дистрибуција је намењена само за 64-битна рачунала."
-        LangString Elements          ${LANG_SERBIAN}  "Елементи"
-        LangString Electric          ${LANG_SERBIAN}  "Електрика"
-        LangString Logic             ${LANG_SERBIAN}  "Логика"
-        LangString Hydraulic         ${LANG_SERBIAN}  "Хидраулика"
-        LangString Pneumatic         ${LANG_SERBIAN}  "Пнеуматика"
-        LangString Energy            ${LANG_SERBIAN}  "Енергија"
-        LangString water             ${LANG_SERBIAN}  "Вода"
-        LangString Refrigeration     ${LANG_SERBIAN}  "Хлађење"
-        LangString Solar_thermal     ${LANG_SERBIAN}  "Соларно_топлотно"
-        LangString Lang              ${LANG_SERBIAN}  "Језик"
-        LangString Fonts             ${LANG_SERBIAN}  "Фонтови"
-        LangString Titleblocks       ${LANG_SERBIAN}  "Заглавља"
-        LangString Examples          ${LANG_SERBIAN}  "Примери"
-        LangString Check             ${LANG_SERBIAN}  "Означите за покретање ${SOFT_NAME}"
-        LangString var1              ${LANG_SERBIAN}  "Елементи службене збирке"
-        LangString var2              ${LANG_SERBIAN}  "Језичке датотеке"
-        LangString var3              ${LANG_SERBIAN}  "Примери заглавља"
-        LangString var4              ${LANG_SERBIAN}  "Примери шема"
-        LangString var5              ${LANG_SERBIAN}  "Фонтови"
-        LangString uninstFailed      ${LANG_SERBIAN}  "Деинсталација претходне верзије није успела.$\nМолимо деинсталирајте ${SOFT_NAME} ручно пре наставка."
-
-
-        ; ----------------------------------------------------------------
-        ; Slovak (LANG_SLOVAK)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_SLOVAK} "${SOFT_NAME} je už nainštalovaný. $\n$\nKliknutím na `OK` odstráňte predchádzajúcu verziu alebo kliknite na `Zrušiť` pre zrušenie tohto upgradu."
-        LangString wrongArch         ${LANG_SLOVAK} "Táto distribúcia je určená len pre 64-bitové počítače."
-        LangString Elements          ${LANG_SLOVAK}  "Prvky"
-        LangString Electric          ${LANG_SLOVAK}  "Elektrika"
-        LangString Logic             ${LANG_SLOVAK}  "Logika"
-        LangString Hydraulic         ${LANG_SLOVAK}  "Hydraulika"
-        LangString Pneumatic         ${LANG_SLOVAK}  "Pneumatika"
-        LangString Energy            ${LANG_SLOVAK}  "Energia"
-        LangString water             ${LANG_SLOVAK}  "Voda"
-        LangString Refrigeration     ${LANG_SLOVAK}  "Chladenie"
-        LangString Solar_thermal     ${LANG_SLOVAK}  "Solarne_teplo"
-        LangString Lang              ${LANG_SLOVAK}  "Jazyk"
-        LangString Fonts             ${LANG_SLOVAK}  "Písma"
-        LangString Titleblocks       ${LANG_SLOVAK}  "Popisové polia"
-        LangString Examples          ${LANG_SLOVAK}  "Príklady"
-        LangString Check             ${LANG_SLOVAK}  "Začiarknite pre spustenie ${SOFT_NAME}"
-        LangString var1              ${LANG_SLOVAK}  "Prvky oficiálnej zbierky"
-        LangString var2              ${LANG_SLOVAK}  "Jazykové súbory"
-        LangString var3              ${LANG_SLOVAK}  "Príklady popisových polí"
-        LangString var4              ${LANG_SLOVAK}  "Príklady schém"
-        LangString var5              ${LANG_SLOVAK}  "Písma"
-        LangString uninstFailed      ${LANG_SLOVAK}  "Odinštalovanie predchádzajúcej verzie zlyhalo.$\nPred pokračovaním odinštalujte ${SOFT_NAME} ručne."
-
-
-        ; ----------------------------------------------------------------
-        ; Slovenian (LANG_SLOVENIAN)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_SLOVENIAN} "${SOFT_NAME} je že nameščen. $\n$\nKliknite `OK` za odstranitev prejšnje različice ali `Prekliči` za preklic te nadgradnje."
-        LangString wrongArch         ${LANG_SLOVENIAN} "Ta distribucija je namenjena samo za 64-bitne računalnike."
-        LangString Elements          ${LANG_SLOVENIAN}  "Elementi"
-        LangString Electric          ${LANG_SLOVENIAN}  "Elektrika"
-        LangString Logic             ${LANG_SLOVENIAN}  "Logika"
-        LangString Hydraulic         ${LANG_SLOVENIAN}  "Hidravlika"
-        LangString Pneumatic         ${LANG_SLOVENIAN}  "Pnevmatika"
-        LangString Energy            ${LANG_SLOVENIAN}  "Energija"
-        LangString water             ${LANG_SLOVENIAN}  "Voda"
-        LangString Refrigeration     ${LANG_SLOVENIAN}  "Hlajenje"
-        LangString Solar_thermal     ${LANG_SLOVENIAN}  "Solarno_toplotno"
-        LangString Lang              ${LANG_SLOVENIAN}  "Jezik"
-        LangString Fonts             ${LANG_SLOVENIAN}  "Pisave"
-        LangString Titleblocks       ${LANG_SLOVENIAN}  "Glave risb"
-        LangString Examples          ${LANG_SLOVENIAN}  "Primeri"
-        LangString Check             ${LANG_SLOVENIAN}  "Označite za zagon ${SOFT_NAME}"
-        LangString var1              ${LANG_SLOVENIAN}  "Elementi uradne zbirke"
-        LangString var2              ${LANG_SLOVENIAN}  "Jezikovne datoteke"
-        LangString var3              ${LANG_SLOVENIAN}  "Primeri glav risb"
-        LangString var4              ${LANG_SLOVENIAN}  "Primeri shem"
-        LangString var5              ${LANG_SLOVENIAN}  "Pisave"
-        LangString uninstFailed      ${LANG_SLOVENIAN}  "Odstranitev prejšnje različice ni uspela.$\nPred nadaljevanjem ročno odstranite ${SOFT_NAME}."
-
-
-        ; ----------------------------------------------------------------
-        ; Swedish (LANG_SWEDISH)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_SWEDISH} "${SOFT_NAME} är redan installerat. $\n$\nKlicka på `OK` för att ta bort den tidigare versionen eller `Avbryt` för att avbryta uppgraderingen."
-        LangString wrongArch         ${LANG_SWEDISH} "Den här distributionen är endast för 64-bitars datorer."
-        LangString Elements          ${LANG_SWEDISH}  "Element"
-        LangString Electric          ${LANG_SWEDISH}  "Elektrisk"
-        LangString Logic             ${LANG_SWEDISH}  "Logik"
-        LangString Hydraulic         ${LANG_SWEDISH}  "Hydraulik"
-        LangString Pneumatic         ${LANG_SWEDISH}  "Pneumatik"
-        LangString Energy            ${LANG_SWEDISH}  "Energi"
-        LangString water             ${LANG_SWEDISH}  "Vatten"
-        LangString Refrigeration     ${LANG_SWEDISH}  "Kylning"
-        LangString Solar_thermal     ${LANG_SWEDISH}  "Solvarme"
-        LangString Lang              ${LANG_SWEDISH}  "Språk"
-        LangString Fonts             ${LANG_SWEDISH}  "Teckensnitt"
-        LangString Titleblocks       ${LANG_SWEDISH}  "Ritningshuvuden"
-        LangString Examples          ${LANG_SWEDISH}  "Exempel"
-        LangString Check             ${LANG_SWEDISH}  "Markera för att starta ${SOFT_NAME}"
-        LangString var1              ${LANG_SWEDISH}  "Element från den officiella samlingen"
-        LangString var2              ${LANG_SWEDISH}  "Språkfiler"
-        LangString var3              ${LANG_SWEDISH}  "Exempel på ritningshuvuden"
-        LangString var4              ${LANG_SWEDISH}  "Exempel på scheman"
-        LangString var5              ${LANG_SWEDISH}  "Teckensnitt"
-        LangString uninstFailed      ${LANG_SWEDISH}  "Avinstallationen av den föregående versionen misslyckades.$\nAvinstallera ${SOFT_NAME} manuellt innan du fortsätter."
-
-
-        ; ----------------------------------------------------------------
-        ; Turkish (LANG_TURKISH)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_TURKISH} "${SOFT_NAME} zaten yüklü. $\n$\nÖnceki sürümü kaldırmak için `Tamam`'a, bu yükseltmeyi iptal etmek için `İptal`'e tıklayın."
-        LangString wrongArch         ${LANG_TURKISH} "Bu dağıtım yalnızca 64 bit bilgisayarlar içindir."
-        LangString Elements          ${LANG_TURKISH}  "Elemanlar"
-        LangString Electric          ${LANG_TURKISH}  "Elektrik"
-        LangString Logic             ${LANG_TURKISH}  "Mantık"
-        LangString Hydraulic         ${LANG_TURKISH}  "Hidrolik"
-        LangString Pneumatic         ${LANG_TURKISH}  "Pnömatik"
-        LangString Energy            ${LANG_TURKISH}  "Enerji"
-        LangString water             ${LANG_TURKISH}  "Su"
-        LangString Refrigeration     ${LANG_TURKISH}  "Soğutma"
-        LangString Solar_thermal     ${LANG_TURKISH}  "Gunes_Is"
-        LangString Lang              ${LANG_TURKISH}  "Dil"
-        LangString Fonts             ${LANG_TURKISH}  "Yazı Tipleri"
-        LangString Titleblocks       ${LANG_TURKISH}  "Başlık Bloğu"
-        LangString Examples          ${LANG_TURKISH}  "Örnekler"
-        LangString Check             ${LANG_TURKISH}  "${SOFT_NAME}'i başlatmak için işaretleyin"
-        LangString var1              ${LANG_TURKISH}  "Resmi koleksiyonun elemanları"
-        LangString var2              ${LANG_TURKISH}  "Dil dosyaları"
-        LangString var3              ${LANG_TURKISH}  "Başlık bloğu örnekleri"
-        LangString var4              ${LANG_TURKISH}  "Şema örnekleri"
-        LangString var5              ${LANG_TURKISH}  "Yazı Tipleri"
-        LangString uninstFailed      ${LANG_TURKISH}  "Önceki sürümün kaldırılması başarısız oldu.$\nDevam etmeden önce lütfen ${SOFT_NAME}'i manuel olarak kaldırın."
-
-
-        ; ----------------------------------------------------------------
-        ; Ukrainian (LANG_UKRAINIAN)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_UKRAINIAN} "${SOFT_NAME} вже встановлено. $\n$\nНатисніть `OK` для видалення попередньої версії або `Скасувати` для скасування оновлення."
-        LangString wrongArch         ${LANG_UKRAINIAN} "Цей дистрибутив призначений лише для 64-розрядних комп'ютерів."
-        LangString Elements          ${LANG_UKRAINIAN}  "Елементи"
-        LangString Electric          ${LANG_UKRAINIAN}  "Електрика"
-        LangString Logic             ${LANG_UKRAINIAN}  "Логіка"
-        LangString Hydraulic         ${LANG_UKRAINIAN}  "Гідравліка"
-        LangString Pneumatic         ${LANG_UKRAINIAN}  "Пневматика"
-        LangString Energy            ${LANG_UKRAINIAN}  "Енергетика"
-        LangString water             ${LANG_UKRAINIAN}  "Водопостачання"
-        LangString Refrigeration     ${LANG_UKRAINIAN}  "Холодильна техніка"
-        LangString Solar_thermal     ${LANG_UKRAINIAN}  "Сонячно-теплова"
-        LangString Lang              ${LANG_UKRAINIAN}  "Мова"
-        LangString Fonts             ${LANG_UKRAINIAN}  "Шрифти"
-        LangString Titleblocks       ${LANG_UKRAINIAN}  "Штампи"
-        LangString Examples          ${LANG_UKRAINIAN}  "Приклади"
-        LangString Check             ${LANG_UKRAINIAN}  "Позначте для запуску ${SOFT_NAME}"
-        LangString var1              ${LANG_UKRAINIAN}  "Елементи офіційної колекції"
-        LangString var2              ${LANG_UKRAINIAN}  "Мовні файли"
-        LangString var3              ${LANG_UKRAINIAN}  "Приклади штампів"
-        LangString var4              ${LANG_UKRAINIAN}  "Приклади схем"
-        LangString var5              ${LANG_UKRAINIAN}  "Шрифти"
-        LangString uninstFailed      ${LANG_UKRAINIAN}  "Видалення попередньої версії завершилося помилкою.$\nБудь ласка, видаліть ${SOFT_NAME} вручну перед продовженням."
-
-
-        ; ----------------------------------------------------------------
-        ; Chinese Simplified (LANG_SIMPCHINESE)
-        ; ----------------------------------------------------------------
-        LangString installed         ${LANG_SIMPCHINESE} "${SOFT_NAME} 已经安装。$\n$\n单击 $\"确定$\" 删除旧版本，或单击 $\"取消$\" 取消本次升级。"
-        LangString wrongArch         ${LANG_SIMPCHINESE} "本安装包仅适用于 64 位计算机。"
-        LangString Elements          ${LANG_SIMPCHINESE}  "元件"
-        LangString Electric          ${LANG_SIMPCHINESE}  "电气"
-        LangString Logic             ${LANG_SIMPCHINESE}  "逻辑"
-        LangString Hydraulic         ${LANG_SIMPCHINESE}  "液压"
-        LangString Pneumatic         ${LANG_SIMPCHINESE}  "气动"
-        LangString Energy            ${LANG_SIMPCHINESE}  "能源"
-        LangString water             ${LANG_SIMPCHINESE}  "水"
-        LangString Refrigeration     ${LANG_SIMPCHINESE}  "制冷"
-        LangString Solar_thermal     ${LANG_SIMPCHINESE}  "太阳能热"
-        LangString Lang              ${LANG_SIMPCHINESE}  "语言"
-        LangString Fonts             ${LANG_SIMPCHINESE}  "字体"
-        LangString Titleblocks       ${LANG_SIMPCHINESE}  "标题栏"
-        LangString Examples          ${LANG_SIMPCHINESE}  "示例"
-        LangString Check             ${LANG_SIMPCHINESE}  "勾选以启动 ${SOFT_NAME}"
-        LangString var1              ${LANG_SIMPCHINESE}  "官方库元件"
-        LangString var2              ${LANG_SIMPCHINESE}  "语言文件"
-        LangString var3              ${LANG_SIMPCHINESE}  "标题栏示例"
-        LangString var4              ${LANG_SIMPCHINESE}  "图纸示例"
-        LangString var5              ${LANG_SIMPCHINESE}  "字体"
-        LangString uninstFailed      ${LANG_SIMPCHINESE}  "卸载旧版本失败。$\n请在继续之前手动卸载 ${SOFT_NAME}。"

cmake/define_definitions.cmake

@@ -62,15 +62,10 @@ message("PROJECT_SOURCE_DIR        :" ${PROJECT_SOURCE_DIR})
 message("QET_DIR                   :" ${QET_DIR})
 message("GIT_COMMIT_SHA            :" ${GIT_COMMIT_SHA})
 
-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)
+if(BUILD_WITH_KF5)
+  message("KF5_GIT_TAG               :" ${KF5_GIT_TAG})
+else()
+  add_definitions(-DBUILD_WITHOUT_KF5)
 endif()
 message("QET_COMPONENTS            :" ${QET_COMPONENTS})
-message("Qt version                :" ${Qt6_VERSION})
-
-if(QMFILES_AS_RESOURCE)
-  add_definitions(-DQMFILES_AS_RESOURCE)
-endif()
+message("QT_VERSION_MAJOR          :" ${QT_VERSION_MAJOR})

cmake/developer_options.cmake

@@ -31,8 +31,5 @@ add_definitions(-DQT_MESSAGELOGCONTEXT)
 # In order to do so, uncomment the following line.
 #add_definitions(-DTODO_LIST)
 
-# 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)
+# Build with KF5
+option(BUILD_WITH_KF5 "Build with KF5" ON)

cmake/fetch_kdeaddons.cmake

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

cmake/fetch_pugixml.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006-2026 The QElectroTech Team
+# Copyright 2006 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -14,14 +14,18 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 
-option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" OFF)
+message(" - fetch_pugixml")
+
+Include(FetchContent)
+
+option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
+
 if(BUILD_PUGIXML)
-  Include(FetchContent)
-  message(" - fetch pugixml")
+
   FetchContent_Declare(
     pugixml
     GIT_REPOSITORY https://github.com/zeux/pugixml.git
-    GIT_TAG        v1.15)
+    GIT_TAG        v1.11.4)
 
   FetchContent_MakeAvailable(pugixml)
 else()

cmake/fetch_singleapplication.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006-2026 The QElectroTech Team
+# Copyright 2006 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -16,6 +16,9 @@
 
 message(" - fetch_singleapplication")
 
+# https://github.com/itay-grudev/SingleApplication/issues/18
+#qmake
+#DEFINES += QAPPLICATION_CLASS=QGuiApplication
 set(QAPPLICATION_CLASS QApplication)
 
 Include(FetchContent)
@@ -23,6 +26,6 @@ Include(FetchContent)
 FetchContent_Declare(
   SingleApplication
   GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
-  GIT_TAG        v3.5.4)
+  GIT_TAG        v3.2.0)
 
 FetchContent_MakeAvailable(SingleApplication)

cmake/hoto_update_cmake_message.cmake

@@ -0,0 +1,25 @@
+# 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()

cmake/qet_compilation_vars.cmake

@@ -17,8 +17,6 @@
 message(" - qet_compilation_vars")
 
 set(QET_COMPONENTS
-  Core
-  Gui
   LinguistTools
   PrintSupport
   Xml
@@ -90,7 +88,6 @@ set(QET_RES_FILES
   ${QET_DIR}/sources/ui/dynamicelementtextitemeditor.ui
   ${QET_DIR}/sources/ui/elementinfopartwidget.ui
   ${QET_DIR}/sources/ui/elementinfowidget.ui
-  ${QET_DIR}/sources/ui/terminalnumberingdialog.ui
   ${QET_DIR}/sources/ui/formulaassistantdialog.ui
   ${QET_DIR}/sources/ui/imagepropertieswidget.ui
   ${QET_DIR}/sources/ui/importelementdialog.ui
@@ -112,17 +109,9 @@ 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
-  ${QET_DIR}/sources/wiringlistexport.h
-  ${QET_DIR}/sources/wiringlistexport.cpp
   ${QET_DIR}/sources/conductornumexport.h
   ${QET_DIR}/sources/conductorprofile.cpp
   ${QET_DIR}/sources/conductorprofile.h
@@ -262,8 +251,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/diagramevent/diagrameventaddtext.h
   ${QET_DIR}/sources/diagramevent/diagrameventinterface.cpp
   ${QET_DIR}/sources/diagramevent/diagrameventinterface.h
-  ${QET_DIR}/sources/diagramevent/diagrameventaddmacro.cpp
-  ${QET_DIR}/sources/diagramevent/diagrameventaddmacro.h
 
   ${QET_DIR}/sources/dvevent/dveventinterface.cpp
   ${QET_DIR}/sources/dvevent/dveventinterface.h
@@ -271,9 +258,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/dxf/dxftoelmt.cpp
   ${QET_DIR}/sources/dxf/dxftoelmt.h
 
-  ${QET_DIR}/sources/qet_elementscaler/qet_elementscaler.cpp
-  ${QET_DIR}/sources/qet_elementscaler/qet_elementscaler.h
-
   ${QET_DIR}/sources/editor/arceditor.cpp
   ${QET_DIR}/sources/editor/arceditor.h
   ${QET_DIR}/sources/editor/editorcommands.cpp
@@ -426,6 +410,10 @@ 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
@@ -504,9 +492,6 @@ 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
@@ -642,8 +627,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/ui/elementinfopartwidget.h
   ${QET_DIR}/sources/ui/elementinfowidget.cpp
   ${QET_DIR}/sources/ui/elementinfowidget.h
-  ${QET_DIR}/sources/ui/terminalnumberingdialog.cpp
-  ${QET_DIR}/sources/ui/terminalnumberingdialog.h
   ${QET_DIR}/sources/ui/elementpropertieswidget.cpp
   ${QET_DIR}/sources/ui/elementpropertieswidget.h
   ${QET_DIR}/sources/ui/formulaassistantdialog.cpp
@@ -720,12 +703,11 @@ 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
   ${QET_DIR}/lang/qet_ar.ts
+  ${QET_DIR}/lang/qet_be.ts
   ${QET_DIR}/lang/qet_ca.ts
   ${QET_DIR}/lang/qet_cs.ts
   ${QET_DIR}/lang/qet_da.ts
@@ -742,7 +724,6 @@ 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_no.ts
   ${QET_DIR}/lang/qet_pl.ts
   ${QET_DIR}/lang/qet_pt.ts
@@ -752,7 +733,6 @@ set(TS_FILES
   ${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_zh.ts
   )

cmake/start_options.cmake

@@ -25,8 +25,5 @@ add_definitions(-DQET_ALLOW_OVERRIDE_CTBTD_OPTION)
 # Comment the line below to deactivate the --config-dir option
 add_definitions(-DQET_ALLOW_OVERRIDE_CD_OPTION)
 
-# Comment the line below to deactivate the --data-dir option
-add_definitions(-DQET_ALLOW_OVERRIDE_DD_OPTION)
-
 #comment the line below to disable the project database export
 #add_definitions(-DQET_EXPORT_PROJECT_DB) #error Todo

doc/QElectroTech.qch

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b7798233e8251baac7717d4b0f991ad5fdf23a76d9fbe864d363e3b93458560
-size 529821696

doc/doc-utils/delete_me.html

@@ -1,18 +0,0 @@
-<!-- HTML footer for doxygen 1.12.0-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-  <ul>
-    $navpath
-    <li class="footer">$generatedby <a href="https://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion </li>
-  </ul>
-</div>
-<!--END GENERATE_TREEVIEW-->
-<!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer"/><address class="footer"><small>
-$generatedby&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion
-</small></address>
-</div><!-- doc-content -->
-<!--END !GENERATE_TREEVIEW-->
-</body>
-</html>

doc/doc-utils/header.html

@@ -1,88 +0,0 @@
-<!-- HTML header for doxygen 1.12.0-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="$langISO">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=11"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<meta name="viewport" content="width=device-width, initial-scale=1"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<!--BEGIN PROJECT_ICON-->
-<link rel="icon" href="$relpath^$projecticon" type="image/x-icon" />
-<!--END PROJECT_ICON-->
-<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
-<!--BEGIN DISABLE_INDEX-->
-  <!--BEGIN FULL_SIDEBAR-->
-<script type="text/javascript">var page_layout=1;</script>
-  <!--END FULL_SIDEBAR-->
-<!--END DISABLE_INDEX-->
-<script type="text/javascript" src="$relpath^jquery.js"></script>
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-<!--BEGIN COPY_CLIPBOARD-->
-<script type="text/javascript" src="$relpath^clipboard.js"></script>
-<!--END COPY_CLIPBOARD-->
-$treeview
-$search
-$mathjax
-$darkmode
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-$extrastylesheet
-<script type="text/javascript" src="$relpath^doxygen-awesome-darkmode-toggle.js"></script>
-<script type="text/javascript">
-    DoxygenAwesomeDarkModeToggle.init()
-</script>
-<script type="text/javascript" src="$relpath^doxygen-awesome-fragment-copy-button.js"></script>
-<script type="text/javascript">
-    DoxygenAwesomeFragmentCopyButton.init()
-</script>
-</head>
-<body>
-<!--BEGIN DISABLE_INDEX-->
-  <!--BEGIN FULL_SIDEBAR-->
-<div id="side-nav" class="ui-resizable side-nav-resizable"><!-- do not remove this div, it is closed by doxygen! -->
-  <!--END FULL_SIDEBAR-->
-<!--END DISABLE_INDEX-->
-
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-
-<!--BEGIN TITLEAREA-->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr id="projectrow">
-  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"$logosize/></td>
-  <!--END PROJECT_LOGO-->
-  <!--BEGIN PROJECT_NAME-->
-  <td id="projectalign">
-   <div id="projectname">$projectname<!--BEGIN PROJECT_NUMBER--><span id="projectnumber">&#160;$projectnumber</span><!--END PROJECT_NUMBER-->
-   </div>
-   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
-  </td>
-  <!--END PROJECT_NAME-->
-  <!--BEGIN !PROJECT_NAME-->
-   <!--BEGIN PROJECT_BRIEF-->
-    <td>
-    <div id="projectbrief">$projectbrief</div>
-    </td>
-   <!--END PROJECT_BRIEF-->
-  <!--END !PROJECT_NAME-->
-  <!--BEGIN DISABLE_INDEX-->
-   <!--BEGIN SEARCHENGINE-->
-     <!--BEGIN !FULL_SIDEBAR-->
-    <td>$searchbox</td>
-     <!--END !FULL_SIDEBAR-->
-   <!--END SEARCHENGINE-->
-  <!--END DISABLE_INDEX-->
- </tr>
-  <!--BEGIN SEARCHENGINE-->
-   <!--BEGIN FULL_SIDEBAR-->
-   <tr><td colspan="2">$searchbox</td></tr>
-   <!--END FULL_SIDEBAR-->
-  <!--END SEARCHENGINE-->
- </tbody>
-</table>
-</div>
-<!--END TITLEAREA-->
-<!-- end header part -->

fonts/liberation-fonts.LICENSE

@@ -1,102 +0,0 @@
-Digitized data copyright (c) 2010 Google Corporation
-	with Reserved Font Arimo, Tinos and Cousine.
-Copyright (c) 2012 Red Hat, Inc.
-	with Reserved Font Name Liberation.
-
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-
-PREAMBLE The goals of the Open Font License (OFL) are to stimulate
-worldwide development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to provide
-a free and open framework in which fonts may be shared and improved in
-partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves.
-The fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works.  The fonts and derivatives,
-however, cannot be released under any other type of license.  The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
- 
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such.
-This may include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components
-as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting ? in part or in whole ?
-any of the components of the Original Version, by changing formats or
-by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical writer
-or other person who contributed to the Font Software.
-
-
-PERMISSION & CONDITIONS
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,in
-   Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-   redistributed and/or sold with any software, provided that each copy
-   contains the above copyright notice and this license. These can be
-   included either as stand-alone text files, human-readable headers or
-   in the appropriate machine-readable metadata fields within text or
-   binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-   Name(s) unless explicit written permission is granted by the
-   corresponding Copyright Holder. This restriction only applies to the
-   primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-   Software shall not be used to promote, endorse or advertise any
-   Modified Version, except to acknowledge the contribution(s) of the
-   Copyright Holder(s) and the Author(s) or with their explicit written
-   permission.
-
-5) The Font Software, modified or unmodified, in part or in whole, must
-   be distributed entirely under this license, and must not be distributed
-   under any other license. The requirement for fonts to remain under
-   this license does not apply to any document created using the Font
-   Software.
-
-
- 
-TERMINATION
-This license becomes null and void if any of the above conditions are not met.
-
- 
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
-DEALINGS IN THE FONT SOFTWARE.
-

fonts/liberation-fonts.NOTICE

@@ -1,2 +0,0 @@
-"Liberation Fonts" Font Software is licensed under the
-SIL Open Font License, Version 1.1

fonts/osifont.LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

fonts/osifont.NOTICE

@@ -1,13 +0,0 @@
-"osifont" Font Software is licensed under the 
-GNU GENERAL PUBLIC LICENSE, Version 3
-
-As a special exception, if you create a document which uses 
-this font, and embed this font or unaltered portions of this 
-font into the document, this font does not by itself cause 
-the resulting document to be covered by the GNU General 
-Public License. This exception does not however invalidate 
-any other reasons why the document might be covered by the 
-GNU General Public License. If you modify this font, you may 
-extend this exception to your version of the font, but you 
-are not obligated to do so. If you do not wish to do so, 
-delete this exception statement from your version.

lang/phrase/qet_fr_sv.qph

@@ -1,326 +0,0 @@
-<!DOCTYPE QPH>
-<QPH sourcelanguage="fr" language="sv">
-<phrase>
-    <source>Texte composé</source>
-    <target>Sammansatt text</target>
-</phrase>
-<phrase>
-    <source>Texte utilisateur</source>
-    <target>Egen text</target>
-</phrase>
-<phrase>
-    <source>Gauche</source>
-    <target>Vänster</target>
-</phrase>
-<phrase>
-    <source>Droite</source>
-    <target>Höger</target>
-</phrase>
-<phrase>
-    <source>Centre</source>
-    <target>Centrum</target>
-</phrase>
-<phrase>
-    <source>Élément</source>
-    <target>Objekt</target>
-    <definition>Vid referens av olika typer</definition>
-</phrase>
-<phrase>
-    <source>Folio</source>
-    <target>Blad</target>
-</phrase>
-<phrase>
-    <source>Conducteur</source>
-    <target>Förbindning</target>
-</phrase>
-<phrase>
-    <source>Sans nom</source>
-    <target>Namnlös</target>
-</phrase>
-<phrase>
-    <source>Recharger</source>
-    <target>Ladda om</target>
-</phrase>
-<phrase>
-    <source>Projet sans titre</source>
-    <target>Namnlöst projekt</target>
-</phrase>
-<phrase>
-    <source>Folio sans titre</source>
-    <target>Namnlöst blad</target>
-</phrase>
-<phrase>
-    <source>Nom</source>
-    <target>Namn</target>
-</phrase>
-<phrase>
-    <source>Sélection</source>
-    <target>Urval</target>
-</phrase>
-<phrase>
-    <source>Désélectionner tout</source>
-    <target>Avmarkera allt</target>
-</phrase>
-<phrase>
-    <source>Sélectionner tout</source>
-    <target>Välj allt</target>
-</phrase>
-<phrase>
-    <source>Installation</source>
-    <target>Anläggning</target>
-</phrase>
-<phrase>
-    <source>Localisation</source>
-    <target>Placering</target>
-</phrase>
-<phrase>
-    <source>Reports de folio</source>
-    <target>Bladhänvisningar</target>
-</phrase>
-<phrase>
-    <source>Report de folio</source>
-    <target>Bladhänvisning</target>
-</phrase>
-<phrase>
-    <source>Centre</source>
-    <target>Mitten</target>
-    <definition>Vid textjustering</definition>
-</phrase>
-<phrase>
-    <source>Collage multiple</source>
-    <target>Klistra in flera</target>
-</phrase>
-<phrase>
-    <source>Remplacer</source>
-    <target>Ersätt</target>
-</phrase>
-<phrase>
-    <source>Élément</source>
-    <target>Symbol</target>
-    <definition>Vid referens av symbol</definition>
-</phrase>
-<phrase>
-    <source>À</source>
-    <target>Till</target>
-</phrase>
-<phrase>
-    <source>De</source>
-    <target>Från</target>
-</phrase>
-<phrase>
-    <source>Nomenclature</source>
-    <target>Förteckning</target>
-</phrase>
-<phrase>
-    <source>Position du folio</source>
-    <target>Bladposition</target>
-</phrase>
-<phrase>
-    <source>Polygone fermé</source>
-    <target>Sluten polygon</target>
-</phrase>
-<phrase>
-    <source>Dossier</source>
-    <target>Mapp</target>
-</phrase>
-<phrase>
-    <source>Que souhaitez-vous faire</source>
-    <target>Vad vill du göra</target>
-</phrase>
-<phrase>
-    <source>Collection</source>
-    <target>Bibliotek</target>
-</phrase>
-<phrase>
-    <source>Collection de cartouches</source>
-    <target>Titelblockbibliotek</target>
-</phrase>
-<phrase>
-    <source>Collection company de cartouches</source>
-    <target>Organisationens titelblockbibliotek</target>
-</phrase>
-<phrase>
-    <source>Champ texte</source>
-    <target>Textfält</target>
-</phrase>
-<phrase>
-    <source>Longueur</source>
-    <target>Längd</target>
-</phrase>
-<phrase>
-    <source>Suivant</source>
-    <target>Nästa</target>
-</phrase>
-<phrase>
-    <source>Suivant</source>
-    <target>Följande</target>
-</phrase>
-<phrase>
-    <source>Chiffre</source>
-    <target>Siffra</target>
-</phrase>
-<phrase>
-    <source>Tout cocher</source>
-    <target>Markera allt</target>
-</phrase>
-<phrase>
-    <source>Tout décocher</source>
-    <target>Avmarkera allt</target>
-</phrase>
-<phrase>
-    <source>Titre</source>
-    <target>Titel</target>
-</phrase>
-<phrase>
-    <source>Dimensions</source>
-    <target>Dimensioner</target>
-</phrase>
-<phrase>
-    <source>Dimensions</source>
-    <target>Mått</target>
-</phrase>
-<phrase>
-    <source>Aperçu</source>
-    <target>Översikt</target>
-</phrase>
-<phrase>
-    <source>Générique</source>
-    <target>Generisk</target>
-</phrase>
-<phrase>
-    <source>Sans</source>
-    <target>Utan</target>
-</phrase>
-<phrase>
-    <source>Avec</source>
-    <target>Med</target>
-</phrase>
-<phrase>
-    <source>Normal</source>
-    <target>Normal</target>
-</phrase>
-<phrase>
-    <source>Tiret</source>
-    <target>Streckad</target>
-</phrase>
-<phrase>
-    <source>Pointillé</source>
-    <target>Punktad</target>
-</phrase>
-<phrase>
-    <source>Remplissage</source>
-    <target>Fyllning</target>
-</phrase>
-<phrase>
-    <source>Apparence</source>
-    <target>Utseende</target>
-</phrase>
-<phrase>
-    <source>Contour</source>
-    <target>Kontur</target>
-</phrase>
-<phrase>
-    <source>Épaisseur</source>
-    <target>Tjocklek</target>
-</phrase>
-<phrase>
-    <source>Géométrie</source>
-    <target>Geometri</target>
-</phrase>
-<phrase>
-    <source>Par defaut</source>
-    <target>Förinställt</target>
-</phrase>
-<phrase>
-    <source>Parcourir</source>
-    <target>Bläddra</target>
-</phrase>
-<phrase>
-    <source>Général</source>
-    <target>Allmänt</target>
-</phrase>
-<phrase>
-    <source>Borne</source>
-    <target>Plint</target>
-</phrase>
-<phrase>
-    <source>Coller</source>
-    <target>Klistra in</target>
-</phrase>
-<phrase>
-    <source>Ouvrir</source>
-    <target>Öppna</target>
-</phrase>
-<phrase>
-    <source>Arc</source>
-    <target>Båge</target>
-</phrase>
-<phrase>
-    <source>Ellipse</source>
-    <target>Ellips</target>
-</phrase>
-<phrase>
-    <source>Ligne</source>
-    <target>Linje</target>
-</phrase>
-<phrase>
-    <source>Rectangle</source>
-    <target>Rektangel</target>
-</phrase>
-<phrase>
-    <source>Orientation</source>
-    <target>Orientering</target>
-</phrase>
-<phrase>
-    <source>Nord</source>
-    <target>Nord</target>
-</phrase>
-<phrase>
-    <source>Est</source>
-    <target>Öst</target>
-</phrase>
-<phrase>
-    <source>Sud</source>
-    <target>Syd</target>
-</phrase>
-<phrase>
-    <source>Ouest</source>
-    <target>Väst</target>
-</phrase>
-<phrase>
-    <source>Police</source>
-    <target>Typsnitt</target>
-</phrase>
-<phrase>
-    <source>Dimensions</source>
-    <target>Storlek</target>
-</phrase>
-<phrase>
-    <source>Sans titre</source>
-    <target>Namnlös</target>
-</phrase>
-<phrase>
-    <source>Borne</source>
-    <target>Anslutning</target>
-</phrase>
-<phrase>
-    <source>Sans titre</source>
-    <target>Namnlöst</target>
-</phrase>
-<phrase>
-    <source>Sans nom</source>
-    <target>Namnlöst</target>
-</phrase>
-<phrase>
-    <source>Décalage</source>
-    <target>Förkjutning</target>
-</phrase>
-<phrase>
-    <source>Afficher</source>
-    <target>Visa</target>
-</phrase>
-<phrase>
-    <source>Affichage</source>
-    <target>Visning</target>
-</phrase>
-</QPH>