Merge branch 'master' into pylons0.10

* master:
  add support for GPG key lookup finger command and HTTP URL
This commit is contained in:
Jan Dittberner 2010-06-12 00:54:50 +02:00
commit a527356eae
5 changed files with 39 additions and 16 deletions

View file

@ -104,6 +104,8 @@ developer name on all bug logs)'),
'links' : N_('links'),
'website' : N_('Debian website'),
'search' : N_('Debian search'),
'gpgfinger' : N_('GPG public key via finger'),
'gpgweb' : N_('GPG public key via HTTP'),
},
'ssh' : {
'label' : N_('Information reachable via ssh (for DDs)'),