change ordering in Intent descriptions for better readability in small dialogs
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain