kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-07-08 04:34:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync with upstream master and resolve conflict in qet_de.qm

Browse Source
This commit is contained in:
Kellermorph
2026-06-17 22:07:41 +02:00
parent 4e0c075575 342ac3626d
commit 7a80ce40b7
6 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -1
View File
@@ -162,8 +162,10 @@ if (NOT MINGW)
install(DIRECTORY examples DESTINATION share/qelectrotech) install(DIRECTORY examples DESTINATION share/qelectrotech)
install(DIRECTORY titleblocks DESTINATION share/qelectrotech) install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech) install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
if(UNIX AND NOT APPLE)
install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications) install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages) install(FILES misc/qelectrotech.xml DESTINATION ${QET_MIME_PACKAGE_PATH})
install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH}) install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
endif()
install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH}) install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
endif() endif()
build-aux/snap/snapcraft.yaml
+1
View File
@@ -53,6 +53,7 @@ parts:
qet-tb-generator: qet-tb-generator:
plugin: python plugin: python
source: https://github.com/raulroda/qet_tb_generator-plugin.git source: https://github.com/raulroda/qet_tb_generator-plugin.git
source-tag: v1.31
python-packages: [PySimpleGUI] python-packages: [PySimpleGUI]
stage-packages: stage-packages:
- python3-lxml - python3-lxml
lang/qet_de.qm
BIN
View File
Binary file not shown.
lang/qet_de.ts
+2 -1
View File
@@ -11851,7 +11851,8 @@ veuillez patienter durant l&apos;import...</source>
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="1361"/> <location filename="../sources/editor/ui/qetelementeditor.cpp" line="1361"/>
<source>L&apos;enregistrement à échoué, <source>L&apos;enregistrement à échoué,
les conditions requises ne sont pas valides</source> les conditions requises ne sont pas valides</source>
<translation>Speichervorgang gescheitert\nDie erforderlichen Bedingungen wurden nicht erfüllt</translation> <translation>Speichervorgang gescheitert!
Die erforderlichen Bedingungen wurden nicht erfüllt</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="1334"/> <location filename="../sources/editor/ui/qetelementeditor.cpp" line="1334"/>
sources/editor/ui/qetelementeditor.cpp
+4 -2
View File
@@ -736,11 +736,13 @@ bool QETElementEditor::checkElement()
QList<QETWarning> warnings; QList<QETWarning> warnings;
QList<QETWarning> errors; QList<QETWarning> errors;
// Warning #1: Element haven't got terminal // Warning #1: Element does not have (enough) terminals
// (except for report and conductor definition, because they must have one terminal and this checking is done below) // (except for report and conductor definition, because they must have one terminal and this checking is done below)
// (another exception: "thumbnails" aka "front-views" may/should not have terminals)
if (!m_elmt_scene -> containsTerminals() && if (!m_elmt_scene -> containsTerminals() &&
!(m_elmt_scene->elementData().m_type & ElementData::AllReport) && !(m_elmt_scene->elementData().m_type & ElementData::AllReport) &&
m_elmt_scene->elementData().m_type != ElementData::ConductorDefinition) { m_elmt_scene->elementData().m_type != ElementData::ConductorDefinition &&
m_elmt_scene->elementData().m_type != ElementData::Thumbnail) {
warnings << qMakePair( warnings << qMakePair(
tr("Absence de borne", "warning title"), tr("Absence de borne", "warning title"),
tr( tr(
sources/qetdiagrameditor.cpp
-1
View File
@@ -2489,7 +2489,6 @@ void QETDiagramEditor::generateTerminalBlock()
exeList << (QETApp::dataDir() + "/binary/qet_tb_generator.exe") exeList << (QETApp::dataDir() + "/binary/qet_tb_generator.exe")
<< (QDir::currentPath() + "/qet_tb_generator.exe") << (QDir::currentPath() + "/qet_tb_generator.exe")
<< QStandardPaths::findExecutable("qet_tb_generator.exe") << QStandardPaths::findExecutable("qet_tb_generator.exe")
<< (QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe")
<< "qet_tb_generator.exe" << "qet_tb_generator.exe"
<< "qet_tb_generator"; // from original code: missing ".exe" ??? << "qet_tb_generator"; // from original code: missing ".exe" ???
#elif defined(Q_OS_MACOS) #elif defined(Q_OS_MACOS)