Merge branch 'master' of git://github.com/spesmilo/electrum

electrum.desktop

@@ -4,12 +4,12 @@
 [Desktop Entry]
 Comment=Lightweight Bitcoin Client
 Exec=electrum %u
-GenericName[en_US]=Electrum
+GenericName[en_US]=Bitcoin Wallet
-GenericName=Electrum
+GenericName=Bitcoin Wallet
 Icon=electrum
 Name[en_US]=Electrum Bitcoin Wallet
 Name=Electrum Bitcoin Wallet
-Categories=Network;
+Categories=Finance;Network;
 StartupNotify=false
 Terminal=false
 Type=Application