Merge branch 'flameshot-org-master' into bugfix/memory-leak

# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
This commit is contained in:
Yuriy Puchkov
2020-10-11 20:49:15 +03:00
26 changed files with 153 additions and 71 deletions

View File

@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>org.flameshot.flameshot</id>
<id>org.flameshot.Flameshot</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<name>Flameshot</name>
<releases>
<release version="0.8.4" date="2020-10-10"/>
<release version="0.8.3" date="2020-09-28"/>
<release version="0.8.1" date="2020-09-23"/>
<release version="0.8.0" date="2020-09-19"/>
@@ -28,6 +29,6 @@
</screenshots>
<url type="homepage">https://github.com/flameshot-org/flameshot</url>
<update_contact>https://github.com/flameshot-org/flameshot/issues/new</update_contact>
<launchable type="desktop-id">flameshot.desktop</launchable>
<launchable type="desktop-id">org.flameshot.Flameshot.desktop</launchable>
</component>

View File

@@ -29,7 +29,7 @@ Keywords[ja]=flameshot;screenshot;capture;shutter;スクリーンショット;
Keywords[es]=flameshot;screenshot;capture;shutter;captura;
Keywords[de]=flameshot;screenshot;Bildschirmfoto;Aufnahme;
Exec=flameshot
Icon=flameshot
Icon=org.flameshot.Flameshot
Terminal=false
Type=Application
Categories=Graphics;