From d664fa86d678b00cb6704c4559d944edb08ee1eb Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Mar 2012 22:02:23 +0100
Subject: [PATCH 1/6] remove bugstats/karma link as suggested by Evgeni Golov

---
 ddportfolioservice/controllers/ddportfolio.py | 1 -
 ddportfolioservice/model/ddportfolio.ini      | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py
index 7464345..8204890 100644
--- a/ddportfolioservice/controllers/ddportfolio.py
+++ b/ddportfolioservice/controllers/ddportfolio.py
@@ -51,7 +51,6 @@ class DdportfolioController(BaseController):
 <a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?\
 bug=430986">#430986</a>)'''),
             'reported': N_('bugs reported'),
-            'bugstats': N_('bugstats AKA <em>karma</em>'),
             'usertags': N_('user tags'),
             'searchall': N_('all messages (i.e., full text search for \
 developer name on all bug logs)'),
diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini
index f8f007c..36cb992 100644
--- a/ddportfolioservice/model/ddportfolio.ini
+++ b/ddportfolioservice/model/ddportfolio.ini
@@ -1,6 +1,6 @@
 #
 # Configuration for DDPortfolio service
-# Copyright © 2009, 2010, 2011 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of DDPortfolio service.
 #
@@ -29,10 +29,9 @@ ddpo.pattern=http://qa.debian.org/developer.php?login=%(email)s
 alladdresses.pattern=http://qa.debian.org/developer.php?login=%(name)s
 
 [bugs]
-urls=received,reported,bugstats,usertags,searchall,wnpp,correspondent,graph
+urls=received,reported,usertags,searchall,wnpp,correspondent,graph
 received.pattern=http://bugs.debian.org/%(email)s
 reported.pattern=http://bugs.debian.org/from:%(email)s
-bugstats.pattern=http://asdfasdf.debian.net/~tar/bugstats/?%(email)s
 usertags.pattern=http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=%(email)s
 searchall.pattern=http://merkel.debian.org/~don/cgi/search.cgi?phrase=%(name)s;search=search
 wnpp.pattern=http://qa.debian.org/developer.php?wnpp=%(email)s

From cfcb1c7ca321b5f6eca8ebb9594345093a135602 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Mar 2012 22:04:41 +0100
Subject: [PATCH 2/6] update translations

---
 .../i18n/ddportfolioservice.pot               |  30 ++++++++----------
 .../i18n/de/LC_MESSAGES/ddportfolioservice.mo | Bin 7179 -> 7085 bytes
 .../i18n/de/LC_MESSAGES/ddportfolioservice.po |  28 +++++++---------
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot
index 444c494..a31340a 100644
--- a/ddportfolioservice/i18n/ddportfolioservice.pot
+++ b/ddportfolioservice/i18n/ddportfolioservice.pot
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ddportfolioservice 0.2.1\n"
+"Project-Id-Version: ddportfolioservice 0.2.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-01-07 01:16+0100\n"
+"POT-Creation-Date: 2012-03-24 22:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.5\n"
 
-#: ddportfolioservice/controllers/ddportfolio.py:41
+#: ddportfolioservice/controllers/ddportfolio.py:42
 msgid "Overview"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:42
+#: ddportfolioservice/controllers/ddportfolio.py:43
 msgid "Debian Member's Package Overview"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:43
+#: ddportfolioservice/controllers/ddportfolio.py:44
 msgid ""
 "Debian Member's Package Overview\n"
 "... showing all email addresses"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:47
+#: ddportfolioservice/controllers/ddportfolio.py:48
 msgid "Bugs"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:48
+#: ddportfolioservice/controllers/ddportfolio.py:49
 msgid ""
 "bugs received\n"
 "(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org/cgi-"
 "bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:52
-msgid "bugs reported"
-msgstr ""
-
 #: ddportfolioservice/controllers/ddportfolio.py:53
-msgid "bugstats AKA <em>karma</em>"
+msgid "bugs reported"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:54
@@ -216,15 +212,15 @@ msgid ""
 "information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:114
+#: ddportfolioservice/controllers/ddportfolio.py:115
 msgid "Group membership information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:117
+#: ddportfolioservice/controllers/ddportfolio.py:118
 msgid "Ubuntu"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:118
+#: ddportfolioservice/controllers/ddportfolio.py:119
 msgid "Available patches from Ubuntu"
 msgstr ""
 
@@ -252,8 +248,8 @@ msgstr ""
 msgid "Alioth user name"
 msgstr ""
 
-#: ddportfolioservice/model/urlbuilder.py:96
-#: ddportfolioservice/model/urlbuilder.py:100
+#: ddportfolioservice/model/urlbuilder.py:97
+#: ddportfolioservice/model/urlbuilder.py:101
 #, python-format
 msgid "Missing input: %s"
 msgstr ""
diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
index 0b907913d2360c50917927741e624b3ff64d2936..19ffa74142c9dd9371904154a8081168af0fb5f3 100644
GIT binary patch
delta 1400
zcmYMzUr1A77{~EvbF-<bX*%;yrIHLQEtZyPl7eK35mXnFgqIc(p%8Ro4ZH|JDMABV
z5L6ICe`!O!F@m6!kgRT27g3Pm#h`@RUD@~7UTAFlocBHFywCGK&pD$_5BEeq75c6l
zpJV(g_{F^%{r`0P&FUE*MqM+6MYxEWxP<F4i3Ru@H)1{~eOQM~Ss1Ia3B%ZnC1w%3
z!a*q$_izh7#~fTrUtlY^nQ_({vr4SRHta$rJc_wEg-T=^mB=g1!w>HKvKyyR>-hs_
zWyH4{4wPY=^8o6`Zp_DC)WT<wjBN;&@B}J>N2r~?M(u3TjWe>+i3Kp5`JfwDp%UDI
zUgBFj2U?&5mB=C7fJab)PN5PSM%K1#s0E_PX6yl~C2>r6%;qtGcPL{9^Y_=LTlLsE
zjfyji5e0t1fp$8F>oI``F^R+2NPSh}8UD1Bml(vis05a=1%IFx-cGhMjC--kjR#S2
zE}&XGl1KeX)+U&cw@|&ALRDZ674Qpc=SkFczc9)USFxUPl>VH=c`U{d<>9fhR@8<%
zP!;OIO?cLwA1k2#%5<CwJ$yG%J$!~L{R)<2PGS0d2$gv^s`ovpr~14*KZ)&(XR#Jn
zks?|xStya+{3($xR3-W%98fhohit|!VhG1juTdOT;&-S-KcaT{8OhC3NDK?GY7Lg7
z?r%pWa2nO(acss(H-3+b8%c1Wz~As+X_2q3^5?}OqG^E=R00)PhSkni)crlER`nw}
z*&u4?mr<1(mn`@MgS2jeSBZx+Vqa;rdbRBQj#?;%3hbc|+F>TD6{UC-8}T-dpenJI
ztaRT#)N9&_s$3s-VLxgEPn|Qk-;UF3H}MDcp8JTR9v7o3Qsvx+EsPsctr<WCyo!1_
oqp0iemd8%`F9l*hbKiKfch!X(D#PLCoei;t{F~XaXxV`0FHU%Zp#T5?

delta 1499
zcmYMzOGs2v9LMo9re@~k+kDnddJv*D_V8J1VM#(%n)J|OtU-ryB%CRP76aiXbd|VB
zK^U+_K^v72vZjSf1W{C!QHaY7+C+kZJ-$EZf&(+3d+wcc{*QC+<Ffwp&_Y`5km1wJ
zH=plxj7IC9);MEI7`9;(4qyf@VmvNm3a(-*I=NYZ+c6f8Adk#3EW`#ZMIUZ8CS*pr
z$l=Bl+=*{-GcHH}U>qA+jByTHSb?>836<~&I&lh>$Q&w>Pq+n_?B^@?I6fh|UMA)e
z-yGsX8J@9iK}~GMWb~mHzKvvT22cr)p%QqGs`Lx0vPFBGzA2hmHYRd^w>@^D60E@(
z;+wNvXn|%_A{Q|muc89=q7u4?tZl-m1s)+qnQ7FP%;3Dkn9rDi<Fs)D_n#(3w<=;g
zhl=wWLkj$!3spLg>G%yBa24-hJ^fXSU-FZOA5j(k#4P-SN+g3Ut1urG;DYTHtYCcI
z9*?5pjcuX-+UrSfkhFPW`wF$^A5fk6g$n3omO7A)`u`3brqUuTVLZn^wc#>mViRrR
z7#T0Bup6jO_2D+WpGyDrhbe9-;|S^y&Z746J8BCG(xR1@p`JIP67NNwfj-pf4%^RX
zu#WK(?!_Xa(@b+7l}I~3O5|3E3z9eeNEgirQmlE1dvFT%IxV7F{1=sIJhN3{5|X1S
zL}HnPxC>9B=KE0z4579<f|WR9k3;{sP~ccrQ{XgQYc2A~6k!b3q82!gN}vIA@wBZM
zHNOwFRf9;bW)xNVII2?-$%0=o%fbHt=AF_hO`*@)iVWL4)Ix=*z{RKvOHqfg9?zj0
z!#IiRL<?EDuoE?Z81>pdKy~mLp2As-GaUqGHC2>_HJERYTT$<QJ8G{3sLq6J?_w3>
zLDUw#K?VGQI;1P8|2tIn;6jQu;g7qVkkb(ex`P3$uCdOl_V|zb+&zAG^**j9W}WXG
ziLT=PWtQu3<$>~vaPml^>x8GX%hRJd-aydn^K@J8o7Xz6c8|~9-5s>tU4gY_8rPSp
I%I$Id2VYyA&j0`b

diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
index f65b904..d494d6c 100644
--- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
+++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2012-01-07 16:37+0100\n"
+"PO-Revision-Date: 2012-03-24 22:04+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: de <de@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.5\n"
 
-#: ddportfolioservice/controllers/ddportfolio.py:41
+#: ddportfolioservice/controllers/ddportfolio.py:42
 msgid "Overview"
 msgstr "Überblick"
 
-#: ddportfolioservice/controllers/ddportfolio.py:42
+#: ddportfolioservice/controllers/ddportfolio.py:43
 msgid "Debian Member's Package Overview"
 msgstr "Paketübersicht des Debian-Mitglieds"
 
-#: ddportfolioservice/controllers/ddportfolio.py:43
+#: ddportfolioservice/controllers/ddportfolio.py:44
 msgid ""
 "Debian Member's Package Overview\n"
 "... showing all email addresses"
@@ -34,11 +34,11 @@ msgstr ""
 "Paketübersicht des Debian-Mitglieds\n"
 "... mit allen E-Mailadressen"
 
-#: ddportfolioservice/controllers/ddportfolio.py:47
+#: ddportfolioservice/controllers/ddportfolio.py:48
 msgid "Bugs"
 msgstr "Fehler"
 
-#: ddportfolioservice/controllers/ddportfolio.py:48
+#: ddportfolioservice/controllers/ddportfolio.py:49
 msgid ""
 "bugs received\n"
 "(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org"
@@ -49,14 +49,10 @@ msgstr ""
 "href=\"http://bugs.debian.org/cgi-"
 "bin/bugreport.cgi?bug=430986\">#430986</a>)"
 
-#: ddportfolioservice/controllers/ddportfolio.py:52
+#: ddportfolioservice/controllers/ddportfolio.py:53
 msgid "bugs reported"
 msgstr "Berichtete Fehler"
 
-#: ddportfolioservice/controllers/ddportfolio.py:53
-msgid "bugstats AKA <em>karma</em>"
-msgstr "Fehlerstatistiken auch bekannt als <em>Karma</em>"
-
 #: ddportfolioservice/controllers/ddportfolio.py:54
 msgid "user tags"
 msgstr "User Tags"
@@ -230,15 +226,15 @@ msgstr ""
 "Informationen in der <a "
 "href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
 
-#: ddportfolioservice/controllers/ddportfolio.py:114
+#: ddportfolioservice/controllers/ddportfolio.py:115
 msgid "Group membership information"
 msgstr "Information über Gruppenmitgliedschaften"
 
-#: ddportfolioservice/controllers/ddportfolio.py:117
+#: ddportfolioservice/controllers/ddportfolio.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: ddportfolioservice/controllers/ddportfolio.py:118
+#: ddportfolioservice/controllers/ddportfolio.py:119
 msgid "Available patches from Ubuntu"
 msgstr "Verfügbare Patches aus Ubuntu"
 
@@ -266,8 +262,8 @@ msgstr "Nicht-Debian-E-Mailadresse"
 msgid "Alioth user name"
 msgstr "Alioth-Benutzername"
 
-#: ddportfolioservice/model/urlbuilder.py:96
-#: ddportfolioservice/model/urlbuilder.py:100
+#: ddportfolioservice/model/urlbuilder.py:97
+#: ddportfolioservice/model/urlbuilder.py:101
 #, python-format
 msgid "Missing input: %s"
 msgstr "Fehlende Eingabe: %s"

From 073e9e0b06dfc8ac8dd98af16f24c2193eef06d0 Mon Sep 17 00:00:00 2001
From: Paul Wise <pabs@debian.org>
Date: Tue, 13 Mar 2012 15:56:00 +0800
Subject: [PATCH 3/6] Cope with problems due to the lossy nm.d.o database
 upgrade

---
 ddportfolioservice/controllers/ddportfolio.py | 1 +
 ddportfolioservice/model/ddportfolio.ini      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py
index 8204890..077a812 100644
--- a/ddportfolioservice/controllers/ddportfolio.py
+++ b/ddportfolioservice/controllers/ddportfolio.py
@@ -106,6 +106,7 @@ developer name on all bug logs)'),
             'search': N_('Debian search'),
             'gpgfinger': N_('GPG public key via finger'),
             'gpgweb': N_('GPG public key via HTTP'),
+            'nm': N_('NM, AM participation'),
             },
         'ssh': {
             'label': N_('Information reachable via ssh (for Debian Members)'),
diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini
index 36cb992..0c46266 100644
--- a/ddportfolioservice/model/ddportfolio.ini
+++ b/ddportfolioservice/model/ddportfolio.ini
@@ -75,7 +75,7 @@ alioth.optional=true
 
 [membership]
 urls=nm,dbfinger,db,alioth,wiki,forum
-nm.pattern=https://nm.debian.org/public/nmstatus/%(nonddemail)s
+nm.pattern=https://nm.debian.org/public/nmstatus/%(username)s
 dbfinger.pattern=finger %(username)s@db.debian.org
 dbfinger.type=finger
 dbfinger.optional=true
@@ -98,6 +98,7 @@ gpgfinger.type=finger
 gpgfinger.optional=true
 gpgweb.pattern=http://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s
 gpgweb.optional=true
+nm.pattern=https://nm.debian.org/public/person/%(username)s
 
 [ssh]
 # SSH functions

From 4cf6881c6fc7f9bb5196531c9d6f54b66e6a952a Mon Sep 17 00:00:00 2001
From: Paul Wise <pabs@debian.org>
Date: Tue, 13 Mar 2012 16:06:19 +0800
Subject: [PATCH 4/6] Remove links to DEHS, which is broken

---
 ddportfolioservice/controllers/ddportfolio.py | 1 -
 ddportfolioservice/model/ddportfolio.ini      | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py
index 077a812..ef30451 100644
--- a/ddportfolioservice/controllers/ddportfolio.py
+++ b/ddportfolioservice/controllers/ddportfolio.py
@@ -68,7 +68,6 @@ developer name on all bug logs)'),
             'lintian': N_('lintian reports'),
             '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'),
             },
diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini
index 0c46266..2811abd 100644
--- a/ddportfolioservice/model/ddportfolio.ini
+++ b/ddportfolioservice/model/ddportfolio.ini
@@ -43,10 +43,9 @@ urls=buildd
 buildd.pattern=https://buildd.debian.org/status/package.php?p=%(email)s&compact=compact&comaint=yes
 
 [qa]
-urls=lintian,lintianfull,dehs,piuparts,patchtracker
+urls=lintian,lintianfull,piuparts,patchtracker
 lintian.pattern=http://lintian.debian.org/maintainer/%(email)s.html
 lintianfull.pattern=http://lintian.debian.org/full/%(email)s.html
-dehs.pattern=http://dehs.alioth.debian.org/report.php?login=%(email)s
 piuparts.pattern=http://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html
 patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s
 

From 414ac8bdca4ded15bb7444a8b0eefcf00bdebb54 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Mar 2012 22:08:04 +0100
Subject: [PATCH 5/6] update translations

---
 .../i18n/ddportfolioservice.pot               |  60 +++++++++---------
 .../i18n/de/LC_MESSAGES/ddportfolioservice.mo | Bin 7085 -> 7050 bytes
 .../i18n/de/LC_MESSAGES/ddportfolioservice.po |  60 +++++++++---------
 3 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot
index a31340a..ff0cf77 100644
--- a/ddportfolioservice/i18n/ddportfolioservice.pot
+++ b/ddportfolioservice/i18n/ddportfolioservice.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-03-24 22:03+0100\n"
+"POT-Creation-Date: 2012-03-24 22:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,112 +92,112 @@ msgid "full lintian reports (i.e. including \"info\"-level messages)"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:71
-msgid "DEHS (Debian External Health Status)"
-msgstr ""
-
-#: ddportfolioservice/controllers/ddportfolio.py:72
 msgid "piuparts"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:73
+#: ddportfolioservice/controllers/ddportfolio.py:72
 msgid "Debian patch tracking system"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:76
+#: ddportfolioservice/controllers/ddportfolio.py:75
 msgid "Upload"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:77
+#: ddportfolioservice/controllers/ddportfolio.py:76
 msgid ""
 "keylog (per-key upload list)\n"
 "(note: uses key fingerprint)"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: ddportfolioservice/controllers/ddportfolio.py:80
 msgid "Mailing Lists"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: ddportfolioservice/controllers/ddportfolio.py:81
 msgid "lists.d.o"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: ddportfolioservice/controllers/ddportfolio.py:82
 msgid "lists.a.d.o"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:84
+#: ddportfolioservice/controllers/ddportfolio.py:83
 msgid "gmane"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: ddportfolioservice/controllers/ddportfolio.py:86
 msgid "Files"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: ddportfolioservice/controllers/ddportfolio.py:87
 msgid "people.d.o"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:89
+#: ddportfolioservice/controllers/ddportfolio.py:88
 msgid "oldpeople"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:90
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: ddportfolioservice/controllers/ddportfolio.py:89
+#: ddportfolioservice/controllers/ddportfolio.py:96
 msgid "Alioth"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: ddportfolioservice/controllers/ddportfolio.py:92
 msgid "Membership"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: ddportfolioservice/controllers/ddportfolio.py:93
 msgid "NM"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: ddportfolioservice/controllers/ddportfolio.py:94
 msgid "DB information via finger"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: ddportfolioservice/controllers/ddportfolio.py:95
 msgid "DB information via HTTP"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: ddportfolioservice/controllers/ddportfolio.py:97
 msgid "Wiki"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: ddportfolioservice/controllers/ddportfolio.py:98
 msgid "Forum"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: ddportfolioservice/controllers/ddportfolio.py:101
 msgid "Miscellaneous"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: ddportfolioservice/controllers/ddportfolio.py:102
 msgid "debtags"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: ddportfolioservice/controllers/ddportfolio.py:103
 msgid "links"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: ddportfolioservice/controllers/ddportfolio.py:104
 msgid "Debian website"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: ddportfolioservice/controllers/ddportfolio.py:105
 msgid "Debian search"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: ddportfolioservice/controllers/ddportfolio.py:106
 msgid "GPG public key via finger"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: ddportfolioservice/controllers/ddportfolio.py:107
 msgid "GPG public key via HTTP"
 msgstr ""
 
+#: ddportfolioservice/controllers/ddportfolio.py:108
+msgid "NM, AM participation"
+msgstr ""
+
 #: ddportfolioservice/controllers/ddportfolio.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr ""
diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
index 19ffa74142c9dd9371904154a8081168af0fb5f3..b7b03e089229d9466ecbb383cc6ec0a5c8dc0816 100644
GIT binary patch
delta 1306
zcmXZbOGs2<7{>8;CLKq!wDFdgax%q=Y!Q}dfl3k*OhE{?v9Q5#z#AgeA~=;nDcvKA
z?1Eh+5`#Dqx^svi%#FAa64NZVQAiL)^?&kg=J$Q)%=zBiIU^PQ71u5~tIcdYV3vcE
zScso7j0s6*HCTcLcmmg8FQ(&lT!)WvExz*Zzw!1{sPpDA4=rex2>G6yg68~xu#^jF
z+}Mpect0wkM$E-dR04gNfJ3+whrRtADzQaO!EfIFH!8uDWHUb&U?vu#&M8lJRx+yO
z!g?-LqXHg5Rn(1~VP{bX^&`dDJ=8%@aK>jghC#eRJ6CaiAk~Z}+C$GFROKV6z%Hub
zQHMnai+5O$vv>|mC`T1N<3|;}#%zqE5}3g~IFCBGfNW(ER^k?Ke;gI46*cNpNUnC?
z)49SzGrEK7z$hx<6sq!B)B|7eE){;o9qjv=QxlG17Us|%Ra}NDs2tUydfbRj-u=_4
zM0>H=n13G&&GH4R^$VDfzfc+HgjQz18H?E0AP-s;Yw;p(#R;T&wv0-^$Bz=oLUmvp
z(k!b&YOs1NCB8MX*uVt`)!O^044<MZ8%A=mIC8d4V+k%{DW(!d36!H|dlaiM>g^w(
z0zXCteu?VnIA#*xCRph0{D=zl33bpiDv_V4&*!ga9$D$2U8qsjA-UKgR0pD{ucb?J
z@MX+qbkF&u^m4|Tvqtq69W5qV=%8s-;5k&Ki>Oijz{40~K7-hTN;HYA^jt3Lb1g=7
za4#OfI#dByJ#S$(`vGtNA&<Z5dtcy!X8j%2nm?XFqU$XWp+<BN6|fEUa-Kx}{|wsA
zx%9Bxp4i}XmjcK98IkSb+DN#oxw|J8jdeBm#5z0NeaTG$UxhoEcERsPLht?Qkuv?O
Ttf3{=*3sPB-r{Cw-46T%N_vK@

delta 1341
zcma*m%}Z2K7{~EvMxAD|)J(^GsYXj|Dhi~@$|MCX6CubJf`m*UDyfl;;G($TqNIe9
zF|b(#)kf%*Mx>1v1f_)0%f?z2RJahzg)X!2PwyWP4EJ-+nS0K8&hwmmz2b4jts!Tp
znZ5FvrQ=V`!$sVVfpumf3}ZDmU=iNHjW~u`IDwn+EoR^s_y2jfzl>Th&2LtKrI?1*
zesfkE#~IMXM$E(()WYXc0bRy?96<%}1XJ-Hmg5JvpAuLL%#Z6C54!zgRDk=@i#4eE
zwE<@>l9LQ<Vc-;MqYhL+1IXGoj9MUp9L64D4vyoT$7}}uc%L+;F#d3Z8A-IKt`n#e
zPog${jXLPGLt`_IIjqM89KZ<qRf=Em&`I845I>><n8!-|gIahm(aLf>jECHQFKVNH
zREY<XSZ&1Bxl2Q}8AD}Y8nxkf)X5i66P7T+30H6*{RH(ni!+#uWu!+Zu0kEC7L}o9
z+=kum|3j!i<H+4}><$gpa0-?BMJ&Yh?9~^n3>A4Js`kxTf_?7)qgX?K62rKHB+<e|
zp+FAuP#_JcOtd0NvkREP{&s~%83RMO6~|F2{)CG3E9!*bkl1V)*~9#-T8f3J`8B8j
zI#D%_;}INn`=3!8&ml>)U#R<MOEmb|3J=}R9Cp(Jd8h!2P@heSYZYpNW>l%#k(jI(
zb@HpIOvNP&KEoiTo8?o|<@`aNRjPS()c8$93oWBI_D~0%(1$8TKAy%1-orsuCUz5*
z<{d?SrYBIDYsCg^M;+j~>kB+af6DFuE#NhM=c(+X8t0-eTe0gNtfU`7mF6O9!<(qf
znLxe&04@GLE0pX`JLB0=SKk!cRoiy1GujiX>yNed_C&iv^=;9vSVyQS7LD~?3MXIs
dqTXaA(BktPNDgOS^ZwVQVD_vxxs-F;_YZmtl7IjJ

diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
index d494d6c..bed6158 100644
--- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
+++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2012-03-24 22:04+0100\n"
+"PO-Revision-Date: 2012-03-24 22:07+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: de <de@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -102,22 +102,18 @@ msgstr ""
 "\"info\")"
 
 #: ddportfolioservice/controllers/ddportfolio.py:71
-msgid "DEHS (Debian External Health Status)"
-msgstr "DEHS (Debian External Health Status)"
-
-#: ddportfolioservice/controllers/ddportfolio.py:72
 msgid "piuparts"
 msgstr "piuparts"
 
-#: ddportfolioservice/controllers/ddportfolio.py:73
+#: ddportfolioservice/controllers/ddportfolio.py:72
 msgid "Debian patch tracking system"
 msgstr "Debian Nachverfolgungssystem für Patches"
 
-#: ddportfolioservice/controllers/ddportfolio.py:76
+#: ddportfolioservice/controllers/ddportfolio.py:75
 msgid "Upload"
 msgstr "Upload"
 
-#: ddportfolioservice/controllers/ddportfolio.py:77
+#: ddportfolioservice/controllers/ddportfolio.py:76
 msgid ""
 "keylog (per-key upload list)\n"
 "(note: uses key fingerprint)"
@@ -125,91 +121,95 @@ msgstr ""
 "Keylog\n"
 "(Anmerkung: verwendet den Fingerabdruck des Schlüssels)"
 
-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: ddportfolioservice/controllers/ddportfolio.py:80
 msgid "Mailing Lists"
 msgstr "Mailinglisten"
 
-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: ddportfolioservice/controllers/ddportfolio.py:81
 msgid "lists.d.o"
 msgstr "lists.d.o"
 
-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: ddportfolioservice/controllers/ddportfolio.py:82
 msgid "lists.a.d.o"
 msgstr "lists.a.d.o"
 
-#: ddportfolioservice/controllers/ddportfolio.py:84
+#: ddportfolioservice/controllers/ddportfolio.py:83
 msgid "gmane"
 msgstr "Gmane"
 
-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: ddportfolioservice/controllers/ddportfolio.py:86
 msgid "Files"
 msgstr "Dateien"
 
-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: ddportfolioservice/controllers/ddportfolio.py:87
 msgid "people.d.o"
 msgstr "people.d.o"
 
-#: ddportfolioservice/controllers/ddportfolio.py:89
+#: ddportfolioservice/controllers/ddportfolio.py:88
 msgid "oldpeople"
 msgstr "oldpeople"
 
-#: ddportfolioservice/controllers/ddportfolio.py:90
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: ddportfolioservice/controllers/ddportfolio.py:89
+#: ddportfolioservice/controllers/ddportfolio.py:96
 msgid "Alioth"
 msgstr "Alioth"
 
-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: ddportfolioservice/controllers/ddportfolio.py:92
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: ddportfolioservice/controllers/ddportfolio.py:93
 msgid "NM"
 msgstr "NM"
 
-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: ddportfolioservice/controllers/ddportfolio.py:94
 msgid "DB information via finger"
 msgstr "DB-Informationen per finger"
 
-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: ddportfolioservice/controllers/ddportfolio.py:95
 msgid "DB information via HTTP"
 msgstr "DB-Informationen per HTTP"
 
-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: ddportfolioservice/controllers/ddportfolio.py:97
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: ddportfolioservice/controllers/ddportfolio.py:98
 msgid "Forum"
 msgstr "Forum"
 
-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: ddportfolioservice/controllers/ddportfolio.py:101
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: ddportfolioservice/controllers/ddportfolio.py:102
 msgid "debtags"
 msgstr "debtags"
 
-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: ddportfolioservice/controllers/ddportfolio.py:103
 msgid "links"
 msgstr "Links"
 
-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: ddportfolioservice/controllers/ddportfolio.py:104
 msgid "Debian website"
 msgstr "Debian Webseite"
 
-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: ddportfolioservice/controllers/ddportfolio.py:105
 msgid "Debian search"
 msgstr "Debian-Suche"
 
-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: ddportfolioservice/controllers/ddportfolio.py:106
 msgid "GPG public key via finger"
 msgstr "öffentlicher GPG-Schlüssel per finger"
 
-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: ddportfolioservice/controllers/ddportfolio.py:107
 msgid "GPG public key via HTTP"
 msgstr "öffentlicher GPG-Schlüssel per HTTP"
 
+#: ddportfolioservice/controllers/ddportfolio.py:108
+msgid "NM, AM participation"
+msgstr "NM-, AM-Teilnahme"
+
 #: ddportfolioservice/controllers/ddportfolio.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Per ssh erreichbare Informationen (für Debian Mitglieder)"

From 9e4c211c57742303a7067527d7c81a791a5293c5 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Mar 2012 22:09:13 +0100
Subject: [PATCH 6/6] bump version number

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 95dcedb..0fc4f46 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ except ImportError:
 
 setup(
     name='ddportfolioservice',
-    version='0.2.5',
+    version='0.2.6',
     description='service to create DDPortfolio URLs',
     long_description="""This is a service implementation that
 returns a set of personalized URLs as outlined in