gratuxri/debianmemberportfolio
1
0
Fork 0
forked from jan/debianmemberportfolio
Code Issues Pull requests Releases Wiki Activity

Merge branch 'newrules' into pylons0.10

Browse source 
* newrules:
  updated translations
  add ideas for SSH functions as comment
  add idea for debconf list search as comment
  add Debian search
  add website google search
  add patch tracker
  add piuparts
  add support for "firstchar" in patterns
  add ubuntudiff to new group Ubuntu

Resolved conflicts:
	ddportfolioservice/i18n/ddportfolioservice.pot
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
	ddportfolioservice/model/ddportfolio.ini
This commit is contained in:
Jan Dittberner 2010-05-10 21:33:50 +02:00
commit 03954ba7e9
6 changed files with 123 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ddportfolioservice/controllers/ddportfolio.py
View file

@ -70,6 +70,8 @@ developer name on all bug logs)'),
'lintianfull' : N_('full lintian reports (i.e. including \
"info"-level messages)'),
'dehs' : N_('DEHS (Debian External Health Status)'),
'piuparts' : N_('piuparts'),
'patchtracker' : N_('Debian patch tracking system'),
},
'upload' : {
'label' : N_('Upload'),
@ -98,6 +100,12 @@ developer name on all bug logs)'),
'label' : N_('Miscellaneous'),
'debtags' : N_('debtags'),
'links' : N_('links'),
'website' : N_('Debian website'),
'search' : N_('Debian search'),
},
'ubuntu' : {
'label' : N_('Ubuntu'),
'ubuntudiff' : N_('Available patches from Ubuntu'),
},
}