Merge branch 'master' into development

This commit is contained in:
Jack 2016-05-06 02:11:30 -04:00
commit 43b541bb7d

View file

@ -1,15 +1,19 @@
[Desktop Entry]
Version=0.2.2
Name=LBRY
# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
GenericName=Filesharing
# Gnome and KDE 3 uses Comment.
Comment=Stream. Share. Earn.
#Exec=/usr/bin/xdg-open http://localhost:5279/view?name=%U
Exec=/usr/share/python/lbrynet/bin/lbry %U
Terminal=false
Comment=The world's first user-owned content marketplace
Icon=/usr/share/python/lbrynet/lbrynet/lbrynet_gui/lbry.png
Type=Application
GenericName=Content Marketplace
Categories=Network;Internet;Filesharing
Terminal=false
Type=Application
MimeType=x-scheme-handler/lbry;
Exec=/usr/share/python/lbrynet/bin/lbry %U
Actions=StopDaemon;
[Desktop Action StopDaemon]
Name=Stop Daemon
Exec=/usr/share/python/lbrynet/bin/stop-lbrynet-daemon