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
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"/>
<source>L&apos;enregistrement à échoué,
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>
<location filename="../sources/editor/ui/qetelementeditor.cpp" line="1334"/>