From cb734a058154850dcab07377efc061e76c6bfcf9 Mon Sep 17 00:00:00 2001 From: Ole Carlsen Date: Wed, 17 Jul 2019 15:24:07 +0200 Subject: [PATCH 1/2] Danish translation updated --- lang/qet_da.qm | Bin 222341 -> 222580 bytes lang/qet_da.ts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/qet_da.qm b/lang/qet_da.qm index 93f1d83ee93b36ee892db1c9900a87d61e574c0f..fb9922d8f582c30d583b82121ef16711ea0228f4 100644 GIT binary patch delta 6327 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 Q Une erreur est survenue lors de l'écriture du fichier %1, erreur %2 rencontrée. error message when attempting to write an XML file - + Der opstod en fejl under skrivning af fil %1, fejl %2 opstod. From ccc43c8167df4bd229a778d6da7823c91e4d2cc7 Mon Sep 17 00:00:00 2001 From: Maximilian Federle Date: Wed, 17 Jul 2019 17:49:48 +0200 Subject: [PATCH 2/2] Snap: Remove tag hack & remove 'g' from git hash --- snap/snapcraft.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index fc50d78a1..f627b0833 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -116,11 +116,7 @@ parts: source: . override-pull: | snapcraftctl pull - if ! git describe --dirty; then - 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/-/./') + snap_version=$(git describe --dirty | sed -e 's/g//;s/-/+git/;y/-/./') modified_displayed_version=$snap_version".snap" sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h snapcraftctl set-version "$snap_version"