kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet

Browse Source
This commit is contained in:
Laurent Trinques
2019-07-17 18:36:27 +02:00
parent 02af727b52 ccc43c8167
commit a375424c07
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lang/qet_da.qm
View File

Binary file not shown.

2
lang/qet_da.ts
View File

@@ -7267,7 +7267,7 @@ Hvad skal ske?</translation>
<location filename="../sources/qet.cpp" line="567"/> <location filename="../sources/qet.cpp" line="567"/>
<source>Une erreur est survenue lors de l&apos;écriture du fichier %1, erreur %2 rencontrée.</source> <source>Une erreur est survenue lors de l&apos;écriture du fichier %1, erreur %2 rencontrée.</source>
<comment>error message when attempting to write an XML file</comment> <comment>error message when attempting to write an XML file</comment>
<translation type="unfinished"></translation> <translation>Der opstod en fejl under skrivning af fil %1, fejl %2 opstod.</translation>
</message> </message>
<message> <message>
<location filename="../sources/qet.cpp" line="640"/> <location filename="../sources/qet.cpp" line="640"/>

6
snap/snapcraft.yaml
View File

@@ -116,11 +116,7 @@ parts:
source: . source: .
override-pull: | override-pull: |
snapcraftctl pull snapcraftctl pull
if ! git describe --dirty; then snap_version=$(git describe --dirty | sed -e 's/g//;s/-/+git/;y/-/./')
rc2_parent="a8789f7"
git -c user.name="snapcraft" -c user.email="snapcraft@local.build" tag -a "0.7RC2" -m "stand-in tag" "$rc2_parent"
fi
snap_version=$(git describe --dirty | sed -e 's/-/+git/;y/-/./')
modified_displayed_version=$snap_version".snap" modified_displayed_version=$snap_version".snap"
sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
snapcraftctl set-version "$snap_version" snapcraftctl set-version "$snap_version"