switch from ddportfolio to debianmemberportfolio

- change all references from ddportfolio to debianmemberportfolio - rename debianmemberportfolio.controllers.DDPortfolioController to debianmemberportfolio.controllers.Controller - update documentation - update copyright years, unify file header formatting
2014-02-08 23:54:51 +01:00 · 2014-02-08 23:54:51 +01:00 · b670f58c7a
commit b670f58c7a
parent 780e10494e
45 changed files with 1217 additions and 1123 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,3 +1,3 @@
-include newpylonsapp/config/deployment.ini_tmpl
-recursive-include ddportfolioservice/public *
-recursive-include ddportfolioservice/templates *
+include debianmemberportfolio/config/deployment.ini_tmpl
+recursive-include debianmemberportfolio/public *
+recursive-include debianmemberportfolio/templates *
--- a/debianmemberportfolio/init.py
+++ b/debianmemberportfolio/init.py
@ -1,22 +1,22 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service package
-# Copyright (c) 2009 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service package
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
--- a/debianmemberportfolio/config/init.py
+++ b/debianmemberportfolio/config/init.py
@ -1,22 +1,22 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service config package
-# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service config package
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
--- a/debianmemberportfolio/config/deployment.ini_tmpl
+++ b/debianmemberportfolio/config/deployment.ini_tmpl
@ -1,5 +1,5 @@
 #
-# ddportfolioservice - Pylons configuration
+# Debian Member Portfolio Service - Pylons configuration
 #
 # The %(here)s variable will be replaced with the parent directory of this file
 #
@ -15,12 +15,12 @@ host = 0.0.0.0
 port = 5000

 [app:main]
-use = egg:ddportfolioservice
+use = egg:debianmemberportfolio
 full_stack = true
 static_files = true

 cache_dir = %(here)s/data
-beaker.session.key = ddportfolioservice
+beaker.session.key = debianmemberportfolio
 beaker.session.secret = ${app_instance_secret}
 app_instance_uuid = ${app_instance_uuid}

--- a/debianmemberportfolio/config/environment.py
+++ b/debianmemberportfolio/config/environment.py
@ -1,40 +1,44 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service environment configuration
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service environment configuration
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-"""Pylons environment configuration"""
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+Pylons environment configuration
+
+"""
+
 import os

 from mako.lookup import TemplateLookup
 from pylons.configuration import PylonsConfig
 from pylons.error import handle_mako_error

-import ddportfolioservice.lib.app_globals as app_globals
-import ddportfolioservice.lib.helpers
-from ddportfolioservice.config.routing import make_map
+import debianmemberportfolio.lib.app_globals as app_globals
+import debianmemberportfolio.lib.helpers
+from debianmemberportfolio.config.routing import make_map


 def load_environment(global_conf, app_conf):
    """
-    Configure the Pylons environment via the ``pylons.config`` object
+    Configures the Pylons environment via the ``pylons.config`` object.
    """
    config = PylonsConfig()

@ -47,11 +51,11 @@ def load_environment(global_conf, app_conf):

    # Initialize config with the basic options
    config.init_app(
-        global_conf, app_conf, package='ddportfolioservice', paths=paths)
+        global_conf, app_conf, package='debianmemberportfolio', paths=paths)

    config['routes.map'] = make_map(config)
    config['pylons.app_globals'] = app_globals.Globals(config)
-    config['pylons.h'] = ddportfolioservice.lib.helpers
+    config['pylons.h'] = debianmemberportfolio.lib.helpers

    # Setup cache object as early as possible
    import pylons
--- a/debianmemberportfolio/config/middleware.py
+++ b/debianmemberportfolio/config/middleware.py
@ -1,26 +1,30 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service middleware configuration
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service middleware configuration
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-"""Pylons middleware initialization"""
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+Pylons middleware initialization
+
+"""
+
 from beaker.middleware import SessionMiddleware
 from paste.cascade import Cascade
 from paste.registry import RegistryManager
@ -30,11 +34,12 @@ from pylons.middleware import ErrorHandler, StatusCodeRedirect
 from pylons.wsgiapp import PylonsApp
 from routes.middleware import RoutesMiddleware

-from ddportfolioservice.config.environment import load_environment
+from debianmemberportfolio.config.environment import load_environment


 def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
-    """Create a Pylons WSGI application and return it
+    """
+    Create a Pylons WSGI application and return it

    ``global_conf``
        The inherited configuration for this application. Normally from
--- a/debianmemberportfolio/config/routing.py
+++ b/debianmemberportfolio/config/routing.py
@ -1,36 +1,42 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service routing configuration
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service routing configuration
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-"""Routes configuration
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+Routes configuration

 The more specific and detailed routes should be defined first so they
 may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
+
 """
+
 from routes import Mapper


 def make_map(config):
-    """Create, configure and return the routes Mapper"""
+    """
+    Create, configure and return the routes Mapper
+
+    """
    map = Mapper(directory=config['pylons.paths']['controllers'],
                 always_scan=config['debug'], explicit=True)
    map.minimization = False
@ -41,8 +47,8 @@ def make_map(config):
    map.connect('/error/{action}/{id}', controller='error')

    # CUSTOM ROUTES HERE
-    map.connect('/', controller='ddportfolio', action='index')
-    map.connect('/result', controller='ddportfolio', action='urllist')
+    map.connect('/', controller='portfolio', action='index')
+    map.connect('/result', controller='portfolio', action='urllist')
    map.connect('/htmlformhelper.js', controller='showformscripts',
                action='index')

--- a/debianmemberportfolio/controllers/init.py
+++ b/debianmemberportfolio/controllers/init.py
@ -1,22 +1,22 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service controllers package
-# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service controllers package
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
--- a/debianmemberportfolio/controllers/error.py
+++ b/debianmemberportfolio/controllers/error.py
@ -1,24 +1,24 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service ErrorController
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service ErrorController
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 import cgi

@ -28,7 +28,7 @@ from pylons.controllers.util import forward
 from pylons.middleware import error_document_template
 from webhelpers.html.builder import literal

-from ddportfolioservice.lib.base import BaseController
+from debianmemberportfolio.lib.base import BaseController


 class ErrorController(BaseController):
--- a/debianmemberportfolio/controllers/portfolio.py
+++ b/debianmemberportfolio/controllers/portfolio.py
@ -1,10 +1,11 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# Debian Member Portfolio Service DdportfolioController
+# Debian Member Portfolio Service PortfolioController
+#
 # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of Debian Member Portfolio Service.
+# This file is part of the Debian Member Portfolio Service.
 #
 # Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
@ -19,6 +20,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+"""
+This module defines the PortfolioController class used to render the portfolio
+of a person.
+"""
+
 import logging
 import simplejson

@ -27,18 +33,19 @@ from pylons.i18n import N_, _
 import formencode.api
 import formencode.validators

-from ddportfolioservice.lib.base import BaseController, render
-from ddportfolioservice.model.form import DDDataRequest, DeveloperData
-from ddportfolioservice.model.urlbuilder import build_urls
-from ddportfolioservice.model import dddatabuilder
+from debianmemberportfolio.lib.base import BaseController, render
+from debianmemberportfolio.model.form import DDDataRequest, DeveloperData
+from debianmemberportfolio.model.urlbuilder import build_urls
+from debianmemberportfolio.model import dddatabuilder

 log = logging.getLogger(__name__)


-class DdportfolioController(BaseController):
+class PortfolioController(BaseController):
    """
-    Main controller for the Debian Member portfolio service.
+    Main controller for the Debian Member Portfolio Service.
    """
+    #: This dictionary defines groups of labeled portfolio items.
    _LABELS = {
        'overview': {
            'label': N_('Overview'),
@ -123,6 +130,15 @@ developer name on all bug logs)'),
        },
    }

+    #: list of field name tuples for Debian Maintainers
+    DM_TUPLES = (('name', 'name'),
+                 ('gpgfp', 'gpgfp'),
+                 ('nonddemail', 'email'))
+
+    #: list of field name tuples for Debian Developers
+    DD_TUPLES = (('username', 'username'),
+                 ('aliothusername', 'username'))
+
    def _get_label(self, section, url=None):
        if section in self._LABELS:
            if url:
@ -140,35 +156,34 @@ developer name on all bug logs)'),
        """
        return render('/showform.mako')

-    def urllist(self):
-        """Handle the actual data."""
+    def _build_request_params(self):
        schema = DDDataRequest()
-        try:
        formencode.api.set_stdtranslation(
            domain="FormEncode",
            languages=[lang[0:2] for lang in request.languages])
        form_result = schema.to_python(request.params)
-        except formencode.validators.Invalid, error:
-            c.messages = {'errors': error.unpack_errors()}
-            return render('/showform.mako')
        fields = dddatabuilder.build_data(form_result['email'])
        rp = request.params.copy()

-        DM_TUPLES = (('name', 'name'),
-                     ('gpgfp', 'gpgfp'),
-                     ('nonddemail', 'email'))
-        DD_TUPLES = (('username', 'username'),
-                     ('aliothusername', 'username'))
-
        if fields['type'] in (dddatabuilder.TYPE_DD, dddatabuilder.TYPE_DM):
-            for tuple in DM_TUPLES:
+            for tuple in self.DM_TUPLES:
                if not tuple[0] in rp or not rp[tuple[0]]:
                    rp[tuple[0]] = fields[tuple[1]]
        if fields['type'] == dddatabuilder.TYPE_DD:
-            for tuple in DD_TUPLES:
+            for tuple in self.DD_TUPLES:
                if not tuple[0] in rp or not rp[tuple[0]]:
                    rp[tuple[0]] = fields[tuple[1]]

+        return rp
+
+    def urllist(self):
+        """Handle the actual data."""
+        try:
+            rp = self._build_request_params()
+        except formencode.validators.Invalid as error:
+            c.messages = {'errors': error.unpack_errors()}
+            return render('/showform.mako')
+
        schema = DeveloperData()
        try:
            formencode.api.set_stdtranslation(
--- a/debianmemberportfolio/controllers/showformscripts.py
+++ b/debianmemberportfolio/controllers/showformscripts.py
@ -1,36 +1,42 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service ShowformscriptController.
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service ShowformscriptsController.
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+This file defines the ShowformscriptsController used to generate the JavaScript
+code in forms.
+"""
+
 import logging
 import simplejson

 from pylons import request, response
 from pylons.controllers.util import abort
+
 import formencode.api
 import formencode.validators

-from ddportfolioservice.lib.base import BaseController, render
-from ddportfolioservice.model.form import DDDataRequest
-from ddportfolioservice.model import dddatabuilder
+from debianmemberportfolio.lib.base import BaseController, render
+from debianmemberportfolio.model.form import DDDataRequest
+from debianmemberportfolio.model import dddatabuilder

 log = logging.getLogger(__name__)

--- a/debianmemberportfolio/controllers/template.py
+++ b/debianmemberportfolio/controllers/template.py
@ -1,26 +1,31 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service TemplateController
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service TemplateController
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-from ddportfolioservice.lib.base import BaseController
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+This file contains the TemplateController used to render templates.
+"""
+
+from debianmemberportfolio.lib.base import BaseController
+from pylons.controllers.util import abort


 class TemplateController(BaseController):
--- a/debianmemberportfolio/i18n/de/LC_MESSAGES/debianmemberportfolio.mo
+++ b/debianmemberportfolio/i18n/de/LC_MESSAGES/debianmemberportfolio.mo
--- a/debianmemberportfolio/i18n/de/LC_MESSAGES/debianmemberportfolio.po
+++ b/debianmemberportfolio/i18n/de/LC_MESSAGES/debianmemberportfolio.po
@ -1,34 +1,33 @@
-# German translations for ddportfolioservice.
-# Copyright (C) 2009, 2010, 2011, 2012 Jan Dittberner
-# This file is distributed under the same license as the ddportfolioservice
-# project.
-# Jan Dittberner <jan@dittberner.info>, 2009, 2010, 2011, 2012.
+# German translations for the Debian Member Portfolio Service.
 #
+# Copyright (C) 2009-2014 Jan Dittberner
+# This file is distributed under the same license as the Debian Member
+# Portfolio Service project.
+# Translators:
+# Jan Dittberner <jan@dittberner.info>, 2009-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: ddportfolioservice 0.2.1\n"
+"Project-Id-Version: Debian Member Portfolio Service 0.3.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2014-01-11 00:25+0000\n"
-"PO-Revision-Date: 2014-01-11 01:37+0100\n"
+"POT-Creation-Date: 2014-02-08 18:14+0100\n"
+"PO-Revision-Date: 2014-02-08 18:03+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"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
-"X-Generator: Poedit 1.5.4\n"
-"Language: de\n"

-#: ddportfolioservice/controllers/ddportfolio.py:45
+#: debianmemberportfolio/controllers/portfolio.py:45
 msgid "Overview"
 msgstr "Überblick"

-#: ddportfolioservice/controllers/ddportfolio.py:46
+#: debianmemberportfolio/controllers/portfolio.py:46
 msgid "Debian Member's Package Overview"
 msgstr "Paketübersicht des Debian-Mitglieds"

-#: ddportfolioservice/controllers/ddportfolio.py:47
+#: debianmemberportfolio/controllers/portfolio.py:47
 msgid ""
 "Debian Member's Package Overview\n"
 "... showing all email addresses"
@ -36,384 +35,386 @@ msgstr ""
 "Paketübersicht des Debian-Mitglieds\n"
 "... mit allen E-Mailadressen"

-#: ddportfolioservice/controllers/ddportfolio.py:51
+#: debianmemberportfolio/controllers/portfolio.py:51
 msgid "Bugs"
 msgstr "Fehler"

-#: ddportfolioservice/controllers/ddportfolio.py:52
+#: debianmemberportfolio/controllers/portfolio.py:52
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org"
+"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "Erhaltene Fehlerberichte\n"
-"(Anmerkung: Co-Maintainer werden nicht aufgeführt, siehe <a href=\"http://"
-"bugs.debian.org/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(Anmerkung: Co-Maintainer werden nicht aufgeführt, siehe <a "
+"href=\"http://bugs.debian.org/cgi-"
+"bin/bugreport.cgi?bug=430986\">#430986</a>)"

-#: ddportfolioservice/controllers/ddportfolio.py:56
+#: debianmemberportfolio/controllers/portfolio.py:56
 msgid "bugs reported"
 msgstr "Berichtete Fehler"

-#: ddportfolioservice/controllers/ddportfolio.py:57
+#: debianmemberportfolio/controllers/portfolio.py:57
 msgid "user tags"
 msgstr "User Tags"

-#: ddportfolioservice/controllers/ddportfolio.py:58
-msgid ""
-"all messages (i.e., full text search for developer name on all bug logs)"
+#: debianmemberportfolio/controllers/portfolio.py:58
+msgid "all messages (i.e., full text search for developer name on all bug logs)"
 msgstr ""
 "Alle Nachrichten (d.h. Volltextsuche nach dem Entwicklernamen in allen "
 "Fehlerlogs)"

-#: ddportfolioservice/controllers/ddportfolio.py:60
+#: debianmemberportfolio/controllers/portfolio.py:60
 msgid "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"
 msgstr "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"

-#: ddportfolioservice/controllers/ddportfolio.py:61
+#: debianmemberportfolio/controllers/portfolio.py:61
 msgid "correspondent for bugs"
 msgstr "Beitragender zu Fehlern"

-#: ddportfolioservice/controllers/ddportfolio.py:62
+#: debianmemberportfolio/controllers/portfolio.py:62
 msgid "one year open bug history graph"
 msgstr "Graph der Entwicklung offener Fehlerberichte über ein Jahr"

-#: ddportfolioservice/controllers/ddportfolio.py:65
+#: debianmemberportfolio/controllers/portfolio.py:65
 msgid "Build"
 msgstr "Build"

-#: ddportfolioservice/controllers/ddportfolio.py:66
+#: debianmemberportfolio/controllers/portfolio.py:66
 msgid "buildd.d.o"
 msgstr "buildd.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:67
+#: debianmemberportfolio/controllers/portfolio.py:67
 msgid "igloo"
 msgstr "Igloo"

-#: ddportfolioservice/controllers/ddportfolio.py:70
+#: debianmemberportfolio/controllers/portfolio.py:70
 msgid "Quality Assurance"
 msgstr "Qualitätssicherung"

-#: ddportfolioservice/controllers/ddportfolio.py:71
+#: debianmemberportfolio/controllers/portfolio.py:71
 msgid "maintainer dashboard"
 msgstr "Maintainer Dashboard"

-#: ddportfolioservice/controllers/ddportfolio.py:72
+#: debianmemberportfolio/controllers/portfolio.py:72
 msgid "lintian reports"
 msgstr "Lintian-Berichte"

-#: ddportfolioservice/controllers/ddportfolio.py:73
+#: debianmemberportfolio/controllers/portfolio.py:73
 msgid "full lintian reports (i.e. including \"info\"-level messages)"
 msgstr ""
-"vollständige Lintian-Berichte (d.h. inklusive Meldungen der Stufe \"info\")"
+"vollständige Lintian-Berichte (d.h. inklusive Meldungen der Stufe "
+"\"info\")"

-#: ddportfolioservice/controllers/ddportfolio.py:75
+#: debianmemberportfolio/controllers/portfolio.py:75
 msgid "piuparts"
 msgstr "piuparts"

-#: ddportfolioservice/controllers/ddportfolio.py:76
+#: debianmemberportfolio/controllers/portfolio.py:76
 msgid "Debian patch tracking system"
 msgstr "Debian Nachverfolgungssystem für Patches"

-#: ddportfolioservice/controllers/ddportfolio.py:77
+#: debianmemberportfolio/controllers/portfolio.py:77
 msgid "Debian Url ChecKer"
 msgstr "Debian URL-Prüfer"

-#: ddportfolioservice/controllers/ddportfolio.py:80
+#: debianmemberportfolio/controllers/portfolio.py:80
 msgid "Mailing Lists"
 msgstr "Mailinglisten"

-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: debianmemberportfolio/controllers/portfolio.py:81
 msgid "lists.d.o"
 msgstr "lists.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: debianmemberportfolio/controllers/portfolio.py:82
 msgid "lists.a.d.o"
 msgstr "lists.a.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: debianmemberportfolio/controllers/portfolio.py:83
 msgid "gmane"
 msgstr "Gmane"

-#: ddportfolioservice/controllers/ddportfolio.py:86
+#: debianmemberportfolio/controllers/portfolio.py:86
 msgid "Files"
 msgstr "Dateien"

-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: debianmemberportfolio/controllers/portfolio.py:87
 msgid "people.d.o"
 msgstr "people.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: debianmemberportfolio/controllers/portfolio.py:88
 msgid "oldpeople"
 msgstr "oldpeople"

-#: ddportfolioservice/controllers/ddportfolio.py:89
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: debianmemberportfolio/controllers/portfolio.py:89
+#: debianmemberportfolio/controllers/portfolio.py:97
 msgid "Alioth"
 msgstr "Alioth"

-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: debianmemberportfolio/controllers/portfolio.py:92
 msgid "Membership"
 msgstr "Mitgliedschaft"

-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: debianmemberportfolio/controllers/portfolio.py:93
 msgid "NM"
 msgstr "NM"

-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: debianmemberportfolio/controllers/portfolio.py:94
 msgid "DB information via finger"
 msgstr "DB-Informationen per finger"

-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: debianmemberportfolio/controllers/portfolio.py:95
 msgid "DB information via HTTP"
 msgstr "DB-Informationen per HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: debianmemberportfolio/controllers/portfolio.py:96
 msgid "FOAF profile"
 msgstr "FOAF-Profil"

-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: debianmemberportfolio/controllers/portfolio.py:98
 msgid "Wiki"
 msgstr "Wiki"

-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: debianmemberportfolio/controllers/portfolio.py:99
 msgid "Forum"
 msgstr "Forum"

-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: debianmemberportfolio/controllers/portfolio.py:102
 msgid "Miscellaneous"
 msgstr "Sonstiges"

-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: debianmemberportfolio/controllers/portfolio.py:103
 msgid "debtags"
 msgstr "debtags"

-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: debianmemberportfolio/controllers/portfolio.py:104
 msgid "Planet Debian (name)"
 msgstr "Planet Debian (Name)"

-#: ddportfolioservice/controllers/ddportfolio.py:105
-#| msgid "Debian user name"
+#: debianmemberportfolio/controllers/portfolio.py:105
 msgid "Planet Debian (username)"
 msgstr "Planet Debian (Benutzername)"

-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: debianmemberportfolio/controllers/portfolio.py:106
 msgid "links"
 msgstr "Links"

-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: debianmemberportfolio/controllers/portfolio.py:107
 msgid "Debian website"
 msgstr "Debian Webseite"

-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: debianmemberportfolio/controllers/portfolio.py:108
 msgid "Debian search"
 msgstr "Debian-Suche"

-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: debianmemberportfolio/controllers/portfolio.py:109
 msgid "GPG public key via finger"
 msgstr "öffentlicher GPG-Schlüssel per finger"

-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: debianmemberportfolio/controllers/portfolio.py:110
 msgid "GPG public key via HTTP"
 msgstr "öffentlicher GPG-Schlüssel per HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: debianmemberportfolio/controllers/portfolio.py:111
 msgid "NM, AM participation"
 msgstr "NM-, AM-Mitwirkung"

-#: ddportfolioservice/controllers/ddportfolio.py:112
-#| msgid "Enter your personal information"
+#: debianmemberportfolio/controllers/portfolio.py:112
 msgid "Contribution information"
 msgstr "Debian Contributor-Informationen"

-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: debianmemberportfolio/controllers/portfolio.py:115
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Per ssh erreichbare Informationen (für Debian Mitglieder)"

-#: ddportfolioservice/controllers/ddportfolio.py:116
+#: debianmemberportfolio/controllers/portfolio.py:116
 msgid "owned debian.net domains"
 msgstr "Besitz von debian.net-Domains"

-#: ddportfolioservice/controllers/ddportfolio.py:117
+#: debianmemberportfolio/controllers/portfolio.py:117
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
 msgstr ""
-"Informationen in der <a href=\"http://wiki.debian.org/qa.debian.org/MIATeam"
-"\">MIA</a>-Datenbank"
+"Informationen in der <a "
+"href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"

-#: ddportfolioservice/controllers/ddportfolio.py:119
+#: debianmemberportfolio/controllers/portfolio.py:119
 msgid "Group membership information"
 msgstr "Information über Gruppenmitgliedschaften"

-#: ddportfolioservice/controllers/ddportfolio.py:122
+#: debianmemberportfolio/controllers/portfolio.py:122
 msgid "Ubuntu"
 msgstr "Ubuntu"

-#: ddportfolioservice/controllers/ddportfolio.py:123
+#: debianmemberportfolio/controllers/portfolio.py:123
 msgid "Available patches from Ubuntu"
 msgstr "Verfügbare Patches aus Ubuntu"

-#: ddportfolioservice/model/urlbuilder.py:40
+#: debianmemberportfolio/model/urlbuilder.py:40
 msgid "Email address"
 msgstr "E-Mailadresse"

-#: ddportfolioservice/model/urlbuilder.py:41
+#: debianmemberportfolio/model/urlbuilder.py:41
 msgid "Name"
 msgstr "Name"

-#: ddportfolioservice/model/urlbuilder.py:42
+#: debianmemberportfolio/model/urlbuilder.py:42
 msgid "GPG fingerprint"
 msgstr "GPG-Fingerabdruck"

-#: ddportfolioservice/model/urlbuilder.py:43
+#: debianmemberportfolio/model/urlbuilder.py:43
 msgid "Debian user name"
 msgstr "Debian-Benutzername"

-#: ddportfolioservice/model/urlbuilder.py:44
+#: debianmemberportfolio/model/urlbuilder.py:44
 msgid "Non Debian email address"
 msgstr "Nicht-Debian-E-Mailadresse"

-#: ddportfolioservice/model/urlbuilder.py:45
+#: debianmemberportfolio/model/urlbuilder.py:45
 msgid "Alioth user name"
 msgstr "Alioth-Benutzername"

-#: ddportfolioservice/model/urlbuilder.py:97
-#: ddportfolioservice/model/urlbuilder.py:101
+#: debianmemberportfolio/model/urlbuilder.py:97
+#: debianmemberportfolio/model/urlbuilder.py:101
 #, python-format
 msgid "Missing input: %s"
 msgstr "Fehlende Eingabe: %s"

-#: ddportfolioservice/templates/base.mako:25
-#: ddportfolioservice/templates/base.mako:33
+#: debianmemberportfolio/templates/base.mako:25
+#: debianmemberportfolio/templates/base.mako:33
 msgid "Debian Member Portfolio Service"
 msgstr "Debian-Mitglieder-Portfolioservice"

-#: ddportfolioservice/templates/base.mako:31
+#: debianmemberportfolio/templates/base.mako:31
 msgid "Debian Logo"
 msgstr "Debian-Logo"

-#: ddportfolioservice/templates/base.mako:34
+#: debianmemberportfolio/templates/base.mako:34
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a href=\"http://wiki."
-"debian.org/DDPortfolio\">DDPortfolio page in the Debian Wiki</a>. You can "
-"create a set of customized links leading to a Debian Member's or package "
-"maintainer's information regarding Debian."
+"This service has been inspired by Stefano Zacchiroli's <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio page in the "
+"Debian Wiki</a>. You can create a set of customized links leading to a "
+"Debian Member's or package maintainer's information regarding Debian."
 msgstr ""
-"Dieser Dienst wurde durch Stefano Zacchirolis <a href=\"http://wiki.debian."
-"org/DDPortfolio\">DDPortfolio-Seite im Debian Wiki</a> inspiriert. Mit dem "
-"Dienst können personalisierte Links zu Informationen im Bezug auf Debian für "
-"Debian-Mitglieder und Paketbetreuer erzeugt werden."
+"Dieser Dienst wurde durch Stefano Zacchirolis <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio-Seite im Debian "
+"Wiki</a> inspiriert. Mit dem Dienst können personalisierte Links zu "
+"Informationen im Bezug auf Debian für Debian-Mitglieder und Paketbetreuer"
+" erzeugt werden."

-#: ddportfolioservice/templates/base.mako:41
+#: debianmemberportfolio/templates/base.mako:41
 msgid "AGPL - Free Software"
 msgstr "AGPL - Freie Software"

-#: ddportfolioservice/templates/base.mako:43
+#: debianmemberportfolio/templates/base.mako:43
 #, python-format
 msgid ""
-"The service is available under the terms of the <a href=\"http://www.gnu.org/"
-"licenses/agpl.html\">GNU Affero General Public License</a> as published by "
-"the Free Software Foundation, either version 3 of the License, or (at your "
-"option) any later version. You can <a href=\"%(browseurl)s\" title=\"Gitweb "
-"repository browser URL\">browse the source code</a> or clone it from <a href="
-"\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> using <a href="
-"\"http://git-scm.com/\">git</a>. If you want to translate this service to "
-"your language you can contribute at <a href=\"%(transifexurl)s\" title="
-"\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
+"The service is available under the terms of the <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
+"License</a> as published by the Free Software Foundation, either version "
+"3 of the License, or (at your option) any later version. You can <a "
+"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
+" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
+"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
+"scm.com/\">git</a>. If you want to translate this service to your "
+"language you can contribute at <a href=\"%(transifexurl)s\" "
+"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
 msgstr ""
-"Dieser Dienst wird unter den Bedingungen der <a href=\"http://www.gnu.org/"
-"licenses/agpl.html\">GNU Affero General Public License</a>, so wie sie von "
-"der Free Software Foundation veröffentlicht ist, bereitgestellt. Sie können "
-"entweder Version 3 oder (auf Ihren Wunsch hin) jede spätere Version der "
-"Lizenz verwenden. Sie können sich <a href=\"%(browseurl)s\" title=\"Gitweb "
-"Repository-Browser-URL\">den Quelltext ansehen</a> oder mit <a href=\"http://"
-"git-scm.com\">git</a> von <a href=\"%(cloneurl)s\" title=\"Git Clone-URL\">"
-"%(cloneurl)s</a> klonen. Wenn Sie diesen Service in Ihre Sprache übersetzen "
-"möchten, können Sie auf <a href=\"%(transifexurl)s\" title=\"Debian Member "
+"Dieser Dienst wird unter den Bedingungen der <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
+"License</a>, so wie sie von der Free Software Foundation veröffentlicht "
+"ist, bereitgestellt. Sie können entweder Version 3 oder (auf Ihren Wunsch"
+" hin) jede spätere Version der Lizenz verwenden. Sie können sich <a "
+"href=\"%(browseurl)s\" title=\"Gitweb Repository-Browser-URL\">den "
+"Quelltext ansehen</a> oder mit <a href=\"http://git-scm.com\">git</a> von"
+" <a href=\"%(cloneurl)s\" title=\"Git Clone-URL\">%(cloneurl)s</a> "
+"klonen. Wenn Sie diesen Service in Ihre Sprache übersetzen möchten, "
+"können Sie auf <a href=\"%(transifexurl)s\" title=\"Debian Member "
 "Portfolio Service bei Transifex\">Transifex</a> dazu beitragen."

-#: ddportfolioservice/templates/base.mako:44
-#| msgid "Copyright © 2009, 2010, 2011, 2012 Jan Dittberner"
+#: debianmemberportfolio/templates/base.mako:44
 msgid "Copyright © 2009-2014 Jan Dittberner"
 msgstr "Copyright © 2009-2014 Jan Dittberner"

-#: ddportfolioservice/templates/showform.mako:24
+#: debianmemberportfolio/templates/showform.mako:24
 msgid "Enter your personal information"
 msgstr "Eingabe der persönlichen Informationen"

-#: ddportfolioservice/templates/showform.mako:30
-#: ddportfolioservice/templates/showurls.mako:28
+#: debianmemberportfolio/templates/showform.mako:30
+#: debianmemberportfolio/templates/showurls.mako:27
 msgid "Debian Member Portfolio"
 msgstr "Debian-Mitgliederportfolio"

-#: ddportfolioservice/templates/showform.mako:36
+#: debianmemberportfolio/templates/showform.mako:36
 msgid "Email address:"
 msgstr "E-Mailadresse:"

-#: ddportfolioservice/templates/showform.mako:47
+#: debianmemberportfolio/templates/showform.mako:47
 msgid "Show all form fields"
 msgstr "Alle Formularfelder anzeigen"

-#: ddportfolioservice/templates/showform.mako:54
+#: debianmemberportfolio/templates/showform.mako:54
 msgid "Name:"
 msgstr "Name:"

-#: ddportfolioservice/templates/showform.mako:64
+#: debianmemberportfolio/templates/showform.mako:64
 msgid "GPG fingerprint:"
 msgstr "GPG-Fingerabdruck:"

-#: ddportfolioservice/templates/showform.mako:79
+#: debianmemberportfolio/templates/showform.mako:79
 msgid "Debian user name:"
 msgstr "Debian-Benutzername:"

-#: ddportfolioservice/templates/showform.mako:94
+#: debianmemberportfolio/templates/showform.mako:94
 msgid "Non Debian email address:"
 msgstr "Nicht-Debian-E-Mailadresse"

-#: ddportfolioservice/templates/showform.mako:109
+#: debianmemberportfolio/templates/showform.mako:109
 msgid "Alioth user name:"
 msgstr "Alioth-Benutzername:"

-#: ddportfolioservice/templates/showform.mako:125
+#: debianmemberportfolio/templates/showform.mako:125
 msgid "Wiki user name:"
 msgstr "Wiki-Benutzername:"

-#: ddportfolioservice/templates/showform.mako:140
+#: debianmemberportfolio/templates/showform.mako:140
 msgid "Forum user id:"
 msgstr "Forumsbenutzernummer:"

-#: ddportfolioservice/templates/showform.mako:151
+#: debianmemberportfolio/templates/showform.mako:151
 msgid "Output format:"
 msgstr "Ausgabeformat:"

-#: ddportfolioservice/templates/showform.mako:157
+#: debianmemberportfolio/templates/showform.mako:157
 msgid "HTML"
 msgstr "HTML"

-#: ddportfolioservice/templates/showform.mako:159
+#: debianmemberportfolio/templates/showform.mako:159
 msgid "JSON"
 msgstr "JSON"

-#: ddportfolioservice/templates/showform.mako:161
+#: debianmemberportfolio/templates/showform.mako:161
 msgid "Build Debian Member Portfolio URLs"
 msgstr "Debian-Mitgliedsportfolio-URLs bauen"

-#: ddportfolioservice/templates/showurls.mako:24
+#: debianmemberportfolio/templates/showurls.mako:23
 msgid "Your personal links"
 msgstr "Ihre personalisierten Links"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "Usage"
 msgstr "Verwendung"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "URL"
 msgstr "URL"

-#: ddportfolioservice/templates/showurls.mako:41
+#: debianmemberportfolio/templates/showurls.mako:40
 msgid "Error during URL creation:"
 msgstr "Fehler bei der URL-Erzeugung:"

-#: ddportfolioservice/templates/showurls.mako:68
+#: debianmemberportfolio/templates/showurls.mako:67
 msgid "Restart"
 msgstr "Neu beginnen"
+
--- a/debianmemberportfolio/i18n/debianmemberportfolio.pot
+++ b/debianmemberportfolio/i18n/debianmemberportfolio.pot
@ -1,283 +1,283 @@
-# Translations template for ddportfolioservice.
+# Translations template for debianmemberportfolio.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the ddportfolioservice
+# This file is distributed under the same license as the debianmemberportfolio
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ddportfolioservice 0.2.20\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-01-11 00:25+0000\n"
+"Project-Id-Version: debianmemberportfolio 0.3.1\n"
+"Report-Msgid-Bugs-To: jan@dittberner.info\n"
+"POT-Creation-Date: 2014-02-08 18:14+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"

-#: ddportfolioservice/controllers/ddportfolio.py:45
+#: debianmemberportfolio/controllers/portfolio.py:45
 msgid "Overview"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:46
+#: debianmemberportfolio/controllers/portfolio.py:46
 msgid "Debian Member's Package Overview"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:47
+#: debianmemberportfolio/controllers/portfolio.py:47
 msgid ""
 "Debian Member's Package Overview\n"
 "... showing all email addresses"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:51
+#: debianmemberportfolio/controllers/portfolio.py:51
 msgid "Bugs"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:52
+#: debianmemberportfolio/controllers/portfolio.py:52
 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:56
+#: debianmemberportfolio/controllers/portfolio.py:56
 msgid "bugs reported"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:57
+#: debianmemberportfolio/controllers/portfolio.py:57
 msgid "user tags"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:58
+#: debianmemberportfolio/controllers/portfolio.py:58
 msgid "all messages (i.e., full text search for developer name on all bug logs)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:60
+#: debianmemberportfolio/controllers/portfolio.py:60
 msgid "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:61
+#: debianmemberportfolio/controllers/portfolio.py:61
 msgid "correspondent for bugs"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:62
+#: debianmemberportfolio/controllers/portfolio.py:62
 msgid "one year open bug history graph"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:65
+#: debianmemberportfolio/controllers/portfolio.py:65
 msgid "Build"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:66
+#: debianmemberportfolio/controllers/portfolio.py:66
 msgid "buildd.d.o"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:67
+#: debianmemberportfolio/controllers/portfolio.py:67
 msgid "igloo"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:70
+#: debianmemberportfolio/controllers/portfolio.py:70
 msgid "Quality Assurance"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:71
+#: debianmemberportfolio/controllers/portfolio.py:71
 msgid "maintainer dashboard"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:72
+#: debianmemberportfolio/controllers/portfolio.py:72
 msgid "lintian reports"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:73
+#: debianmemberportfolio/controllers/portfolio.py:73
 msgid "full lintian reports (i.e. including \"info\"-level messages)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:75
+#: debianmemberportfolio/controllers/portfolio.py:75
 msgid "piuparts"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:76
+#: debianmemberportfolio/controllers/portfolio.py:76
 msgid "Debian patch tracking system"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:77
+#: debianmemberportfolio/controllers/portfolio.py:77
 msgid "Debian Url ChecKer"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:80
+#: debianmemberportfolio/controllers/portfolio.py:80
 msgid "Mailing Lists"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: debianmemberportfolio/controllers/portfolio.py:81
 msgid "lists.d.o"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: debianmemberportfolio/controllers/portfolio.py:82
 msgid "lists.a.d.o"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: debianmemberportfolio/controllers/portfolio.py:83
 msgid "gmane"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:86
+#: debianmemberportfolio/controllers/portfolio.py:86
 msgid "Files"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: debianmemberportfolio/controllers/portfolio.py:87
 msgid "people.d.o"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: debianmemberportfolio/controllers/portfolio.py:88
 msgid "oldpeople"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:89
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: debianmemberportfolio/controllers/portfolio.py:89
+#: debianmemberportfolio/controllers/portfolio.py:97
 msgid "Alioth"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: debianmemberportfolio/controllers/portfolio.py:92
 msgid "Membership"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: debianmemberportfolio/controllers/portfolio.py:93
 msgid "NM"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: debianmemberportfolio/controllers/portfolio.py:94
 msgid "DB information via finger"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: debianmemberportfolio/controllers/portfolio.py:95
 msgid "DB information via HTTP"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: debianmemberportfolio/controllers/portfolio.py:96
 msgid "FOAF profile"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: debianmemberportfolio/controllers/portfolio.py:98
 msgid "Wiki"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: debianmemberportfolio/controllers/portfolio.py:99
 msgid "Forum"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: debianmemberportfolio/controllers/portfolio.py:102
 msgid "Miscellaneous"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: debianmemberportfolio/controllers/portfolio.py:103
 msgid "debtags"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: debianmemberportfolio/controllers/portfolio.py:104
 msgid "Planet Debian (name)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: debianmemberportfolio/controllers/portfolio.py:105
 msgid "Planet Debian (username)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: debianmemberportfolio/controllers/portfolio.py:106
 msgid "links"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: debianmemberportfolio/controllers/portfolio.py:107
 msgid "Debian website"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: debianmemberportfolio/controllers/portfolio.py:108
 msgid "Debian search"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: debianmemberportfolio/controllers/portfolio.py:109
 msgid "GPG public key via finger"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: debianmemberportfolio/controllers/portfolio.py:110
 msgid "GPG public key via HTTP"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: debianmemberportfolio/controllers/portfolio.py:111
 msgid "NM, AM participation"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: debianmemberportfolio/controllers/portfolio.py:112
 msgid "Contribution information"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: debianmemberportfolio/controllers/portfolio.py:115
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:116
+#: debianmemberportfolio/controllers/portfolio.py:116
 msgid "owned debian.net domains"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:117
+#: debianmemberportfolio/controllers/portfolio.py:117
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
 "information"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:119
+#: debianmemberportfolio/controllers/portfolio.py:119
 msgid "Group membership information"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:122
+#: debianmemberportfolio/controllers/portfolio.py:122
 msgid "Ubuntu"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:123
+#: debianmemberportfolio/controllers/portfolio.py:123
 msgid "Available patches from Ubuntu"
 msgstr ""

-#: ddportfolioservice/model/urlbuilder.py:40
+#: debianmemberportfolio/model/urlbuilder.py:40
 msgid "Email address"
 msgstr ""

-#: ddportfolioservice/model/urlbuilder.py:41
+#: debianmemberportfolio/model/urlbuilder.py:41
 msgid "Name"
 msgstr ""

-#: ddportfolioservice/model/urlbuilder.py:42
+#: debianmemberportfolio/model/urlbuilder.py:42
 msgid "GPG fingerprint"
 msgstr ""

-#: ddportfolioservice/model/urlbuilder.py:43
+#: debianmemberportfolio/model/urlbuilder.py:43
 msgid "Debian user name"
 msgstr ""

-#: ddportfolioservice/model/urlbuilder.py:44
+#: debianmemberportfolio/model/urlbuilder.py:44
 msgid "Non Debian email address"
 msgstr ""

-#: ddportfolioservice/model/urlbuilder.py:45
+#: debianmemberportfolio/model/urlbuilder.py:45
 msgid "Alioth user name"
 msgstr ""

-#: ddportfolioservice/model/urlbuilder.py:97
-#: ddportfolioservice/model/urlbuilder.py:101
+#: debianmemberportfolio/model/urlbuilder.py:97
+#: debianmemberportfolio/model/urlbuilder.py:101
 #, python-format
 msgid "Missing input: %s"
 msgstr ""

-#: ddportfolioservice/templates/base.mako:25
-#: ddportfolioservice/templates/base.mako:33
+#: debianmemberportfolio/templates/base.mako:25
+#: debianmemberportfolio/templates/base.mako:33
 msgid "Debian Member Portfolio Service"
 msgstr ""

-#: ddportfolioservice/templates/base.mako:31
+#: debianmemberportfolio/templates/base.mako:31
 msgid "Debian Logo"
 msgstr ""

-#: ddportfolioservice/templates/base.mako:34
+#: debianmemberportfolio/templates/base.mako:34
 msgid ""
 "This service has been inspired by Stefano Zacchiroli's <a "
 "href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio page in the Debian "
@ -285,11 +285,11 @@ msgid ""
 "Member's or package maintainer's information regarding Debian."
 msgstr ""

-#: ddportfolioservice/templates/base.mako:41
+#: debianmemberportfolio/templates/base.mako:41
 msgid "AGPL - Free Software"
 msgstr ""

-#: ddportfolioservice/templates/base.mako:43
+#: debianmemberportfolio/templates/base.mako:43
 #, python-format
 msgid ""
 "The service is available under the terms of the <a "
@ -304,88 +304,88 @@ msgid ""
 "Transifex\">Transifex</a>."
 msgstr ""

-#: ddportfolioservice/templates/base.mako:44
+#: debianmemberportfolio/templates/base.mako:44
 msgid "Copyright © 2009-2014 Jan Dittberner"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:24
+#: debianmemberportfolio/templates/showform.mako:24
 msgid "Enter your personal information"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:30
-#: ddportfolioservice/templates/showurls.mako:28
+#: debianmemberportfolio/templates/showform.mako:30
+#: debianmemberportfolio/templates/showurls.mako:27
 msgid "Debian Member Portfolio"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:36
+#: debianmemberportfolio/templates/showform.mako:36
 msgid "Email address:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:47
+#: debianmemberportfolio/templates/showform.mako:47
 msgid "Show all form fields"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:54
+#: debianmemberportfolio/templates/showform.mako:54
 msgid "Name:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:64
+#: debianmemberportfolio/templates/showform.mako:64
 msgid "GPG fingerprint:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:79
+#: debianmemberportfolio/templates/showform.mako:79
 msgid "Debian user name:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:94
+#: debianmemberportfolio/templates/showform.mako:94
 msgid "Non Debian email address:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:109
+#: debianmemberportfolio/templates/showform.mako:109
 msgid "Alioth user name:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:125
+#: debianmemberportfolio/templates/showform.mako:125
 msgid "Wiki user name:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:140
+#: debianmemberportfolio/templates/showform.mako:140
 msgid "Forum user id:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:151
+#: debianmemberportfolio/templates/showform.mako:151
 msgid "Output format:"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:157
+#: debianmemberportfolio/templates/showform.mako:157
 msgid "HTML"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:159
+#: debianmemberportfolio/templates/showform.mako:159
 msgid "JSON"
 msgstr ""

-#: ddportfolioservice/templates/showform.mako:161
+#: debianmemberportfolio/templates/showform.mako:161
 msgid "Build Debian Member Portfolio URLs"
 msgstr ""

-#: ddportfolioservice/templates/showurls.mako:24
+#: debianmemberportfolio/templates/showurls.mako:23
 msgid "Your personal links"
 msgstr ""

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "Usage"
 msgstr ""

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "URL"
 msgstr ""

-#: ddportfolioservice/templates/showurls.mako:41
+#: debianmemberportfolio/templates/showurls.mako:40
 msgid "Error during URL creation:"
 msgstr ""

-#: ddportfolioservice/templates/showurls.mako:68
+#: debianmemberportfolio/templates/showurls.mako:67
 msgid "Restart"
 msgstr ""

--- a/debianmemberportfolio/i18n/fr/LC_MESSAGES/debianmemberportfolio.mo
+++ b/debianmemberportfolio/i18n/fr/LC_MESSAGES/debianmemberportfolio.mo
--- a/debianmemberportfolio/i18n/fr/LC_MESSAGES/debianmemberportfolio.po
+++ b/debianmemberportfolio/i18n/fr/LC_MESSAGES/debianmemberportfolio.po
@ -1,35 +1,34 @@
-# French translations for ddportfolioservice.
-# This file is distributed under the same license as the ddportfolioservice
-# project.
+# French translations for the Debian Member Portfolio Service
 #
+# Copyright (C) 2012 Stéphane Aulery
+# This file is distributed under the same license as the Debian Member
+# Portfolio Service project.
 # Translators:
 # Stéphane Aulery <lkppo@free.fr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-01-11 00:25+0000\n"
+"POT-Creation-Date: 2014-02-08 18:14+0100\n"
 "PO-Revision-Date: 2014-01-11 01:29+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/"
-"debportfolioservice/language/fr/)\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language-Team: French "
+"(http://www.transifex.net/projects/p/debportfolioservice/language/fr/)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
-"X-Generator: Poedit 1.5.4\n"
-"Language: fr\n"

-#: ddportfolioservice/controllers/ddportfolio.py:45
+#: debianmemberportfolio/controllers/portfolio.py:45
 msgid "Overview"
 msgstr "Vue d'ensemble"

-#: ddportfolioservice/controllers/ddportfolio.py:46
+#: debianmemberportfolio/controllers/portfolio.py:46
 msgid "Debian Member's Package Overview"
 msgstr "Vue d'ensemble des paquets du membre Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:47
+#: debianmemberportfolio/controllers/portfolio.py:47
 msgid ""
 "Debian Member's Package Overview\n"
 "... showing all email addresses"
@ -37,383 +36,382 @@ msgstr ""
 "Vue d'ensemble des paquets du membre Debian\n"
 "... affichage de tous les courriels"

-#: ddportfolioservice/controllers/ddportfolio.py:51
+#: debianmemberportfolio/controllers/portfolio.py:51
 msgid "Bugs"
 msgstr "Bogues"

-#: ddportfolioservice/controllers/ddportfolio.py:52
+#: debianmemberportfolio/controllers/portfolio.py:52
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org"
+"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "Bogues reçus\n"
-"(note : co-responsables non listés, voir <a href=\"http://bugs.debian.org/"
-"cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note : co-responsables non listés, voir <a href=\"http://bugs.debian.org"
+"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"

-#: ddportfolioservice/controllers/ddportfolio.py:56
+#: debianmemberportfolio/controllers/portfolio.py:56
 msgid "bugs reported"
 msgstr "Bogues rapportés"

-#: ddportfolioservice/controllers/ddportfolio.py:57
+#: debianmemberportfolio/controllers/portfolio.py:57
 msgid "user tags"
 msgstr "Tags utilisateur"

-#: ddportfolioservice/controllers/ddportfolio.py:58
-msgid ""
-"all messages (i.e., full text search for developer name on all bug logs)"
+#: debianmemberportfolio/controllers/portfolio.py:58
+msgid "all messages (i.e., full text search for developer name on all bug logs)"
 msgstr ""
 "Tous les messages (c-à-d, recherche plein texte sur le nom du développeur"
 " dans tous les journaux de bogue)"

-#: ddportfolioservice/controllers/ddportfolio.py:60
+#: debianmemberportfolio/controllers/portfolio.py:60
 msgid "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"
 msgstr "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"

-#: ddportfolioservice/controllers/ddportfolio.py:61
+#: debianmemberportfolio/controllers/portfolio.py:61
 msgid "correspondent for bugs"
 msgstr "Correspondant pour les bogues"

-#: ddportfolioservice/controllers/ddportfolio.py:62
+#: debianmemberportfolio/controllers/portfolio.py:62
 msgid "one year open bug history graph"
 msgstr "Graphique de l'évolution des bogues ouverts sur l'année écoulée"

-#: ddportfolioservice/controllers/ddportfolio.py:65
+#: debianmemberportfolio/controllers/portfolio.py:65
 msgid "Build"
 msgstr "Build"

-#: ddportfolioservice/controllers/ddportfolio.py:66
+#: debianmemberportfolio/controllers/portfolio.py:66
 msgid "buildd.d.o"
 msgstr "buildd.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:67
+#: debianmemberportfolio/controllers/portfolio.py:67
 msgid "igloo"
 msgstr "igloo"

-#: ddportfolioservice/controllers/ddportfolio.py:70
+#: debianmemberportfolio/controllers/portfolio.py:70
 msgid "Quality Assurance"
 msgstr "Assurance qualité"

-#: ddportfolioservice/controllers/ddportfolio.py:71
+#: debianmemberportfolio/controllers/portfolio.py:71
 msgid "maintainer dashboard"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:72
+#: debianmemberportfolio/controllers/portfolio.py:72
 msgid "lintian reports"
 msgstr "Rapports lintian"

-#: ddportfolioservice/controllers/ddportfolio.py:73
+#: debianmemberportfolio/controllers/portfolio.py:73
 msgid "full lintian reports (i.e. including \"info\"-level messages)"
-msgstr ""
-"Rapports lintian complets (c-à-d incluant les messages de niveau \"info\")"
+msgstr "Rapports lintian complets (c-à-d incluant les messages de niveau \"info\")"

-#: ddportfolioservice/controllers/ddportfolio.py:75
+#: debianmemberportfolio/controllers/portfolio.py:75
 msgid "piuparts"
 msgstr "Piuparts"

-#: ddportfolioservice/controllers/ddportfolio.py:76
+#: debianmemberportfolio/controllers/portfolio.py:76
 msgid "Debian patch tracking system"
 msgstr "Système de suivi des patchs de Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:77
+#: debianmemberportfolio/controllers/portfolio.py:77
 msgid "Debian Url ChecKer"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:80
+#: debianmemberportfolio/controllers/portfolio.py:80
 msgid "Mailing Lists"
 msgstr "Listes de diffusion"

-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: debianmemberportfolio/controllers/portfolio.py:81
 msgid "lists.d.o"
 msgstr "lists.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: debianmemberportfolio/controllers/portfolio.py:82
 msgid "lists.a.d.o"
 msgstr "lists.a.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: debianmemberportfolio/controllers/portfolio.py:83
 msgid "gmane"
 msgstr "Gmane"

-#: ddportfolioservice/controllers/ddportfolio.py:86
+#: debianmemberportfolio/controllers/portfolio.py:86
 msgid "Files"
 msgstr "Fichiers"

-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: debianmemberportfolio/controllers/portfolio.py:87
 msgid "people.d.o"
 msgstr "people.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: debianmemberportfolio/controllers/portfolio.py:88
 msgid "oldpeople"
 msgstr "oldpeople"

-#: ddportfolioservice/controllers/ddportfolio.py:89
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: debianmemberportfolio/controllers/portfolio.py:89
+#: debianmemberportfolio/controllers/portfolio.py:97
 msgid "Alioth"
 msgstr "Alioth"

-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: debianmemberportfolio/controllers/portfolio.py:92
 msgid "Membership"
 msgstr "Adhésion"

-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: debianmemberportfolio/controllers/portfolio.py:93
 msgid "NM"
 msgstr "NM"

-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: debianmemberportfolio/controllers/portfolio.py:94
 msgid "DB information via finger"
 msgstr "BD d'informations via finger"

-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: debianmemberportfolio/controllers/portfolio.py:95
 msgid "DB information via HTTP"
 msgstr "BD d'informations via HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: debianmemberportfolio/controllers/portfolio.py:96
 msgid "FOAF profile"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: debianmemberportfolio/controllers/portfolio.py:98
 msgid "Wiki"
 msgstr "Wiki"

-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: debianmemberportfolio/controllers/portfolio.py:99
 msgid "Forum"
 msgstr "Forum"

-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: debianmemberportfolio/controllers/portfolio.py:102
 msgid "Miscellaneous"
 msgstr "Divers"

-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: debianmemberportfolio/controllers/portfolio.py:103
 msgid "debtags"
 msgstr "Debtags"

-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: debianmemberportfolio/controllers/portfolio.py:104
 msgid "Planet Debian (name)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: debianmemberportfolio/controllers/portfolio.py:105
 #, fuzzy
-#| msgid "Debian user name"
 msgid "Planet Debian (username)"
 msgstr "Nom d'utilisateur Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: debianmemberportfolio/controllers/portfolio.py:106
 msgid "links"
 msgstr "Liens"

-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: debianmemberportfolio/controllers/portfolio.py:107
 msgid "Debian website"
 msgstr "Site web de Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: debianmemberportfolio/controllers/portfolio.py:108
 msgid "Debian search"
 msgstr "Recherche Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: debianmemberportfolio/controllers/portfolio.py:109
 msgid "GPG public key via finger"
 msgstr "Clef GPG publique via finger"

-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: debianmemberportfolio/controllers/portfolio.py:110
 msgid "GPG public key via HTTP"
 msgstr "Clef GPG publique via HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: debianmemberportfolio/controllers/portfolio.py:111
 msgid "NM, AM participation"
 msgstr "NM, AM participation"

-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: debianmemberportfolio/controllers/portfolio.py:112
 #, fuzzy
-#| msgid "Enter your personal information"
 msgid "Contribution information"
 msgstr "Saisissez vos informations personnelles"

-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: debianmemberportfolio/controllers/portfolio.py:115
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informations accessibles via ssh (pour les membres de Debian)"

-#: ddportfolioservice/controllers/ddportfolio.py:116
+#: debianmemberportfolio/controllers/portfolio.py:116
 msgid "owned debian.net domains"
 msgstr "Propriété des domaines debian.net"

-#: ddportfolioservice/controllers/ddportfolio.py:117
+#: debianmemberportfolio/controllers/portfolio.py:117
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
 msgstr ""
-"Informations de la base de données <a href=\"http://wiki.debian.org/qa."
-"debian.org/MIATeam\">MIA</a>"
+"Informations de la base de données <a "
+"href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>"

-#: ddportfolioservice/controllers/ddportfolio.py:119
+#: debianmemberportfolio/controllers/portfolio.py:119
 msgid "Group membership information"
 msgstr "Information sur l'adhésion de groupe"

-#: ddportfolioservice/controllers/ddportfolio.py:122
+#: debianmemberportfolio/controllers/portfolio.py:122
 msgid "Ubuntu"
 msgstr "Ubuntu"

-#: ddportfolioservice/controllers/ddportfolio.py:123
+#: debianmemberportfolio/controllers/portfolio.py:123
 msgid "Available patches from Ubuntu"
 msgstr "Patchs disponibles pour Ubuntu"

-#: ddportfolioservice/model/urlbuilder.py:40
+#: debianmemberportfolio/model/urlbuilder.py:40
 msgid "Email address"
 msgstr "Courriel"

-#: ddportfolioservice/model/urlbuilder.py:41
+#: debianmemberportfolio/model/urlbuilder.py:41
 msgid "Name"
 msgstr "Nom"

-#: ddportfolioservice/model/urlbuilder.py:42
+#: debianmemberportfolio/model/urlbuilder.py:42
 msgid "GPG fingerprint"
 msgstr "Empreinte GPG"

-#: ddportfolioservice/model/urlbuilder.py:43
+#: debianmemberportfolio/model/urlbuilder.py:43
 msgid "Debian user name"
 msgstr "Nom d'utilisateur Debian"

-#: ddportfolioservice/model/urlbuilder.py:44
+#: debianmemberportfolio/model/urlbuilder.py:44
 msgid "Non Debian email address"
 msgstr "Courriel hors Debian"

-#: ddportfolioservice/model/urlbuilder.py:45
+#: debianmemberportfolio/model/urlbuilder.py:45
 msgid "Alioth user name"
 msgstr "Nom d'utilisateur Alioth"

-#: ddportfolioservice/model/urlbuilder.py:97
-#: ddportfolioservice/model/urlbuilder.py:101
+#: debianmemberportfolio/model/urlbuilder.py:97
+#: debianmemberportfolio/model/urlbuilder.py:101
 #, python-format
 msgid "Missing input: %s"
 msgstr "Entrée manquante : %s"

-#: ddportfolioservice/templates/base.mako:25
-#: ddportfolioservice/templates/base.mako:33
+#: debianmemberportfolio/templates/base.mako:25
+#: debianmemberportfolio/templates/base.mako:33
 msgid "Debian Member Portfolio Service"
 msgstr "Service de portefeuille des membres de Debian"

-#: ddportfolioservice/templates/base.mako:31
+#: debianmemberportfolio/templates/base.mako:31
 msgid "Debian Logo"
 msgstr "Logo Debian"

-#: ddportfolioservice/templates/base.mako:34
+#: debianmemberportfolio/templates/base.mako:34
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a href=\"http://wiki."
-"debian.org/DDPortfolio\">DDPortfolio page in the Debian Wiki</a>. You can "
-"create a set of customized links leading to a Debian Member's or package "
-"maintainer's information regarding Debian."
+"This service has been inspired by Stefano Zacchiroli's <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio page in the "
+"Debian Wiki</a>. You can create a set of customized links leading to a "
+"Debian Member's or package maintainer's information regarding Debian."
 msgstr ""
-"Ce service a été inspiré par <a href=\"http://wiki.debian.org/DDPortfolio"
-"\">la page DDPortfolio du Wiki de Debian</a> de Stefano Zacchiroli. Vous "
-"pouvez créer un ensemble personnalisé de liens fournissant des informations "
-"sur un membre ou un mainteneur de paquet de Debian."
+"Ce service a été inspiré par <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">la page DDPortfolio du Wiki "
+"de Debian</a> de Stefano Zacchiroli. Vous pouvez créer un ensemble "
+"personnalisé de liens fournissant des informations sur un membre ou un "
+"mainteneur de paquet de Debian."

-#: ddportfolioservice/templates/base.mako:41
+#: debianmemberportfolio/templates/base.mako:41
 msgid "AGPL - Free Software"
 msgstr "AGPL - Logiciel libre"

-#: ddportfolioservice/templates/base.mako:43
+#: debianmemberportfolio/templates/base.mako:43
 #, fuzzy, python-format
 msgid ""
-"The service is available under the terms of the <a href=\"http://www.gnu.org/"
-"licenses/agpl.html\">GNU Affero General Public License</a> as published by "
-"the Free Software Foundation, either version 3 of the License, or (at your "
-"option) any later version. You can <a href=\"%(browseurl)s\" title=\"Gitweb "
-"repository browser URL\">browse the source code</a> or clone it from <a href="
-"\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> using <a href="
-"\"http://git-scm.com/\">git</a>. If you want to translate this service to "
-"your language you can contribute at <a href=\"%(transifexurl)s\" title="
-"\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
+"The service is available under the terms of the <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
+"License</a> as published by the Free Software Foundation, either version "
+"3 of the License, or (at your option) any later version. You can <a "
+"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
+" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
+"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
+"scm.com/\">git</a>. If you want to translate this service to your "
+"language you can contribute at <a href=\"%(transifexurl)s\" "
+"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
 msgstr ""
-"Ce service est disponible sous les termes de la licence <a href=\"http://www."
-"gnu.org/licenses/agpl.html\">GNU Affero General Public License</a> telle que "
-"publiée par la Free Software Foundation, soit la version 3 de la licence, ou "
-"(à votre choix) toute version ultérieure. Vous pouvez <a href=\"%(browseurl)s"
-"\" title=\"Gitweb repository browser URL\">parcourir le code source</a> ou "
-"le cloner depuis <a href=\"%(cloneurl)s\" title=\"git clone URL\">"
-"%(cloneurl)s</a> en utilisant <a href=\"http://git-scm.com/\">git</a>."
+"Ce service est disponible sous les termes de la licence <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
+"License</a> telle que publiée par la Free Software Foundation, soit la "
+"version 3 de la licence, ou (à votre choix) toute version ultérieure. "
+"Vous pouvez <a href=\"%(browseurl)s\" title=\"Gitweb repository browser "
+"URL\">parcourir le code source</a> ou le cloner depuis <a "
+"href=\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> en "
+"utilisant <a href=\"http://git-scm.com/\">git</a>."

-#: ddportfolioservice/templates/base.mako:44
-#| msgid "Copyright © 2009, 2010, 2011, 2012 Jan Dittberner"
+#: debianmemberportfolio/templates/base.mako:44
 msgid "Copyright © 2009-2014 Jan Dittberner"
 msgstr "Copyright © 2009-2014 Jan Dittberner"

-#: ddportfolioservice/templates/showform.mako:24
+#: debianmemberportfolio/templates/showform.mako:24
 msgid "Enter your personal information"
 msgstr "Saisissez vos informations personnelles"

-#: ddportfolioservice/templates/showform.mako:30
-#: ddportfolioservice/templates/showurls.mako:28
+#: debianmemberportfolio/templates/showform.mako:30
+#: debianmemberportfolio/templates/showurls.mako:27
 msgid "Debian Member Portfolio"
 msgstr "Portefeuille d'un Membre de Debian"

-#: ddportfolioservice/templates/showform.mako:36
+#: debianmemberportfolio/templates/showform.mako:36
 msgid "Email address:"
 msgstr "Courriel :"

-#: ddportfolioservice/templates/showform.mako:47
+#: debianmemberportfolio/templates/showform.mako:47
 msgid "Show all form fields"
 msgstr "Afficher tous les champs du formulaire"

-#: ddportfolioservice/templates/showform.mako:54
+#: debianmemberportfolio/templates/showform.mako:54
 msgid "Name:"
 msgstr "Nom :"

-#: ddportfolioservice/templates/showform.mako:64
+#: debianmemberportfolio/templates/showform.mako:64
 msgid "GPG fingerprint:"
 msgstr "Empreinte GPG :"

-#: ddportfolioservice/templates/showform.mako:79
+#: debianmemberportfolio/templates/showform.mako:79
 msgid "Debian user name:"
 msgstr "Nom d'utilisateur Debian :"

-#: ddportfolioservice/templates/showform.mako:94
+#: debianmemberportfolio/templates/showform.mako:94
 msgid "Non Debian email address:"
 msgstr "Courriel hors Debian :"

-#: ddportfolioservice/templates/showform.mako:109
+#: debianmemberportfolio/templates/showform.mako:109
 msgid "Alioth user name:"
 msgstr "Nom d'utilisateur Alioth :"

-#: ddportfolioservice/templates/showform.mako:125
+#: debianmemberportfolio/templates/showform.mako:125
 msgid "Wiki user name:"
 msgstr "Nom d'utilisateur Wiki :"

-#: ddportfolioservice/templates/showform.mako:140
+#: debianmemberportfolio/templates/showform.mako:140
 msgid "Forum user id:"
 msgstr "Numéro d'utilisateur Forum :"

-#: ddportfolioservice/templates/showform.mako:151
+#: debianmemberportfolio/templates/showform.mako:151
 msgid "Output format:"
 msgstr "Format de sortie :"

-#: ddportfolioservice/templates/showform.mako:157
+#: debianmemberportfolio/templates/showform.mako:157
 msgid "HTML"
 msgstr "HTML"

-#: ddportfolioservice/templates/showform.mako:159
+#: debianmemberportfolio/templates/showform.mako:159
 msgid "JSON"
 msgstr "JSON"

-#: ddportfolioservice/templates/showform.mako:161
+#: debianmemberportfolio/templates/showform.mako:161
 msgid "Build Debian Member Portfolio URLs"
 msgstr "Construire les URLs du portefeuille du membre de Debian"

-#: ddportfolioservice/templates/showurls.mako:24
+#: debianmemberportfolio/templates/showurls.mako:23
 msgid "Your personal links"
 msgstr "Vos liens personnels"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "Usage"
 msgstr "Utilisation"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "URL"
 msgstr "URL"

-#: ddportfolioservice/templates/showurls.mako:41
+#: debianmemberportfolio/templates/showurls.mako:40
 msgid "Error during URL creation:"
 msgstr "Erreur durant la création de l'URL :"

-#: ddportfolioservice/templates/showurls.mako:68
+#: debianmemberportfolio/templates/showurls.mako:67
 msgid "Restart"
 msgstr "Recommencer"
+
--- a/debianmemberportfolio/i18n/id/LC_MESSAGES/debianmemberportfolio.mo
+++ b/debianmemberportfolio/i18n/id/LC_MESSAGES/debianmemberportfolio.mo
--- a/debianmemberportfolio/i18n/id/LC_MESSAGES/debianmemberportfolio.po
+++ b/debianmemberportfolio/i18n/id/LC_MESSAGES/debianmemberportfolio.po
@ -1,36 +1,34 @@
-# Indonesian translations for ddportfolioservice.
-# Copyright (C) 2012 Izharul Haq
-# This file is distributed under the same license as the ddportfolioservice
-# project.
+# Indonesian translations for Debian Member Portfolio Service.
 #
+# Copyright (C) 2012 Izharul Haq
+# This file is distributed under the same license as the Debian Member
+# Portfolio Service project.
 # Translators:
 # Izharul Haq <atoz.chevara@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service\n"
 "Report-Msgid-Bugs-To: atoz.chevara@yahoo.com\n"
-"POT-Creation-Date: 2014-01-11 00:25+0000\n"
+"POT-Creation-Date: 2014-02-08 18:14+0100\n"
 "PO-Revision-Date: 2014-01-11 01:28+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/"
-"debportfolioservice/language/id/)\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language-Team: Indonesian "
+"(http://www.transifex.com/projects/p/debportfolioservice/language/id/)\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
-"Language: id\n"
-"X-Generator: Poedit 1.5.4\n"

-#: ddportfolioservice/controllers/ddportfolio.py:45
+#: debianmemberportfolio/controllers/portfolio.py:45
 msgid "Overview"
 msgstr "Gambaran Umum"

-#: ddportfolioservice/controllers/ddportfolio.py:46
+#: debianmemberportfolio/controllers/portfolio.py:46
 msgid "Debian Member's Package Overview"
 msgstr "Gambaran Umum Paket Anggota Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:47
+#: debianmemberportfolio/controllers/portfolio.py:47
 msgid ""
 "Debian Member's Package Overview\n"
 "... showing all email addresses"
@ -38,382 +36,383 @@ msgstr ""
 "Gambaran Umum Paket Anggota Debian\n"
 "... tampilkan semua alamat email"

-#: ddportfolioservice/controllers/ddportfolio.py:51
+#: debianmemberportfolio/controllers/portfolio.py:51
 msgid "Bugs"
 msgstr "Bugs"

-#: ddportfolioservice/controllers/ddportfolio.py:52
+#: debianmemberportfolio/controllers/portfolio.py:52
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org"
+"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "bugs diterima\n"
-"(catatan: co-maintainers tidak tercantum, lihat <a href=\"http://bugs.debian."
-"org/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(catatan: co-maintainers tidak tercantum, lihat <a "
+"href=\"http://bugs.debian.org/cgi-"
+"bin/bugreport.cgi?bug=430986\">#430986</a>)"

-#: ddportfolioservice/controllers/ddportfolio.py:56
+#: debianmemberportfolio/controllers/portfolio.py:56
 msgid "bugs reported"
 msgstr "melaporkan bug"

-#: ddportfolioservice/controllers/ddportfolio.py:57
+#: debianmemberportfolio/controllers/portfolio.py:57
 msgid "user tags"
 msgstr "label pengguna"

-#: ddportfolioservice/controllers/ddportfolio.py:58
-msgid ""
-"all messages (i.e., full text search for developer name on all bug logs)"
+#: debianmemberportfolio/controllers/portfolio.py:58
+msgid "all messages (i.e., full text search for developer name on all bug logs)"
 msgstr ""
-"semua pesan (yaitu, pencarian teks lengkap untuk nama pengembang pada semua "
-"catatan bug)"
+"semua pesan (yaitu, pencarian teks lengkap untuk nama pengembang pada "
+"semua catatan bug)"

-#: ddportfolioservice/controllers/ddportfolio.py:60
+#: debianmemberportfolio/controllers/portfolio.py:60
 msgid "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"
 msgstr "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"

-#: ddportfolioservice/controllers/ddportfolio.py:61
+#: debianmemberportfolio/controllers/portfolio.py:61
 msgid "correspondent for bugs"
 msgstr "koresponden untuk bug"

-#: ddportfolioservice/controllers/ddportfolio.py:62
+#: debianmemberportfolio/controllers/portfolio.py:62
 msgid "one year open bug history graph"
 msgstr "grafik perkembangan laporan bug terbuka lebih dari setahun"

-#: ddportfolioservice/controllers/ddportfolio.py:65
+#: debianmemberportfolio/controllers/portfolio.py:65
 msgid "Build"
 msgstr "Bangun"

-#: ddportfolioservice/controllers/ddportfolio.py:66
+#: debianmemberportfolio/controllers/portfolio.py:66
 msgid "buildd.d.o"
 msgstr "buildd.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:67
+#: debianmemberportfolio/controllers/portfolio.py:67
 msgid "igloo"
 msgstr "igloo"

-#: ddportfolioservice/controllers/ddportfolio.py:70
+#: debianmemberportfolio/controllers/portfolio.py:70
 msgid "Quality Assurance"
 msgstr "Jaminan Mutu"

-#: ddportfolioservice/controllers/ddportfolio.py:71
+#: debianmemberportfolio/controllers/portfolio.py:71
 msgid "maintainer dashboard"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:72
+#: debianmemberportfolio/controllers/portfolio.py:72
 msgid "lintian reports"
 msgstr "laporan lintian"

-#: ddportfolioservice/controllers/ddportfolio.py:73
+#: debianmemberportfolio/controllers/portfolio.py:73
 msgid "full lintian reports (i.e. including \"info\"-level messages)"
 msgstr "seluruh pesan lintian (i.e. termasuk pesan \"info\"-level)"

-#: ddportfolioservice/controllers/ddportfolio.py:75
+#: debianmemberportfolio/controllers/portfolio.py:75
 msgid "piuparts"
 msgstr "piuparts"

-#: ddportfolioservice/controllers/ddportfolio.py:76
+#: debianmemberportfolio/controllers/portfolio.py:76
 msgid "Debian patch tracking system"
 msgstr "sistem pelacakan patch Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:77
+#: debianmemberportfolio/controllers/portfolio.py:77
 msgid "Debian Url ChecKer"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:80
+#: debianmemberportfolio/controllers/portfolio.py:80
 msgid "Mailing Lists"
 msgstr "Milis"

-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: debianmemberportfolio/controllers/portfolio.py:81
 msgid "lists.d.o"
 msgstr "lists.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: debianmemberportfolio/controllers/portfolio.py:82
 msgid "lists.a.d.o"
 msgstr "lists.a.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: debianmemberportfolio/controllers/portfolio.py:83
 msgid "gmane"
 msgstr "gmane"

-#: ddportfolioservice/controllers/ddportfolio.py:86
+#: debianmemberportfolio/controllers/portfolio.py:86
 msgid "Files"
 msgstr "Berkas-berkas"

-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: debianmemberportfolio/controllers/portfolio.py:87
 msgid "people.d.o"
 msgstr "people.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: debianmemberportfolio/controllers/portfolio.py:88
 msgid "oldpeople"
 msgstr "oldpeople"

-#: ddportfolioservice/controllers/ddportfolio.py:89
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: debianmemberportfolio/controllers/portfolio.py:89
+#: debianmemberportfolio/controllers/portfolio.py:97
 msgid "Alioth"
 msgstr "Alioth"

-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: debianmemberportfolio/controllers/portfolio.py:92
 msgid "Membership"
 msgstr "Keanggotaan"

-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: debianmemberportfolio/controllers/portfolio.py:93
 msgid "NM"
 msgstr "NM"

-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: debianmemberportfolio/controllers/portfolio.py:94
 msgid "DB information via finger"
 msgstr "informasi DB melalui finger"

-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: debianmemberportfolio/controllers/portfolio.py:95
 msgid "DB information via HTTP"
 msgstr "informasi DB melalui HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: debianmemberportfolio/controllers/portfolio.py:96
 msgid "FOAF profile"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: debianmemberportfolio/controllers/portfolio.py:98
 msgid "Wiki"
 msgstr "Wiki"

-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: debianmemberportfolio/controllers/portfolio.py:99
 msgid "Forum"
 msgstr "Forum"

-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: debianmemberportfolio/controllers/portfolio.py:102
 msgid "Miscellaneous"
 msgstr "Lain-Lain"

-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: debianmemberportfolio/controllers/portfolio.py:103
 msgid "debtags"
 msgstr "debtags"

-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: debianmemberportfolio/controllers/portfolio.py:104
 msgid "Planet Debian (name)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: debianmemberportfolio/controllers/portfolio.py:105
 #, fuzzy
-#| msgid "Debian user name"
 msgid "Planet Debian (username)"
 msgstr "nama pengguna Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: debianmemberportfolio/controllers/portfolio.py:106
 msgid "links"
 msgstr "tautan"

-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: debianmemberportfolio/controllers/portfolio.py:107
 msgid "Debian website"
 msgstr "website Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: debianmemberportfolio/controllers/portfolio.py:108
 msgid "Debian search"
 msgstr "pencarian Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: debianmemberportfolio/controllers/portfolio.py:109
 msgid "GPG public key via finger"
 msgstr "kunci publik GPG melalui finger"

-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: debianmemberportfolio/controllers/portfolio.py:110
 msgid "GPG public key via HTTP"
 msgstr "kunci publik GPG melalui HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: debianmemberportfolio/controllers/portfolio.py:111
 msgid "NM, AM participation"
 msgstr "partisipasi NM, AM"

-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: debianmemberportfolio/controllers/portfolio.py:112
 #, fuzzy
-#| msgid "Enter your personal information"
 msgid "Contribution information"
 msgstr "Masukkan informasi data pribadi anda"

-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: debianmemberportfolio/controllers/portfolio.py:115
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informasi dicapai melalui ssh (untuk Anggota Debian)"

-#: ddportfolioservice/controllers/ddportfolio.py:116
+#: debianmemberportfolio/controllers/portfolio.py:116
 msgid "owned debian.net domains"
 msgstr "domain debian.net sendiri"

-#: ddportfolioservice/controllers/ddportfolio.py:117
+#: debianmemberportfolio/controllers/portfolio.py:117
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
 msgstr ""
-"informasi database <a href=\"http://wiki.debian.org/qa.debian.org/MIATeam"
-"\">MIA</a>"
+"informasi database <a "
+"href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>"

-#: ddportfolioservice/controllers/ddportfolio.py:119
+#: debianmemberportfolio/controllers/portfolio.py:119
 msgid "Group membership information"
 msgstr "Informasi keanggotaan kelompok"

-#: ddportfolioservice/controllers/ddportfolio.py:122
+#: debianmemberportfolio/controllers/portfolio.py:122
 msgid "Ubuntu"
 msgstr "Ubuntu"

-#: ddportfolioservice/controllers/ddportfolio.py:123
+#: debianmemberportfolio/controllers/portfolio.py:123
 msgid "Available patches from Ubuntu"
 msgstr "Tambalan dari Ubuntu yang tersedia"

-#: ddportfolioservice/model/urlbuilder.py:40
+#: debianmemberportfolio/model/urlbuilder.py:40
 msgid "Email address"
 msgstr "Alamat Email"

-#: ddportfolioservice/model/urlbuilder.py:41
+#: debianmemberportfolio/model/urlbuilder.py:41
 msgid "Name"
 msgstr "Nama"

-#: ddportfolioservice/model/urlbuilder.py:42
+#: debianmemberportfolio/model/urlbuilder.py:42
 msgid "GPG fingerprint"
 msgstr "sidik jari GPG"

-#: ddportfolioservice/model/urlbuilder.py:43
+#: debianmemberportfolio/model/urlbuilder.py:43
 msgid "Debian user name"
 msgstr "nama pengguna Debian"

-#: ddportfolioservice/model/urlbuilder.py:44
+#: debianmemberportfolio/model/urlbuilder.py:44
 msgid "Non Debian email address"
 msgstr "Selain alamat email Debian"

-#: ddportfolioservice/model/urlbuilder.py:45
+#: debianmemberportfolio/model/urlbuilder.py:45
 msgid "Alioth user name"
 msgstr "nama pengguna Alioth"

-#: ddportfolioservice/model/urlbuilder.py:97
-#: ddportfolioservice/model/urlbuilder.py:101
+#: debianmemberportfolio/model/urlbuilder.py:97
+#: debianmemberportfolio/model/urlbuilder.py:101
 #, python-format
 msgid "Missing input: %s"
 msgstr "Tidak ada masukan: %s"

-#: ddportfolioservice/templates/base.mako:25
-#: ddportfolioservice/templates/base.mako:33
+#: debianmemberportfolio/templates/base.mako:25
+#: debianmemberportfolio/templates/base.mako:33
 msgid "Debian Member Portfolio Service"
 msgstr "Layanan Portfolio Anggota Debian"

-#: ddportfolioservice/templates/base.mako:31
+#: debianmemberportfolio/templates/base.mako:31
 msgid "Debian Logo"
 msgstr "Logo Debian"

-#: ddportfolioservice/templates/base.mako:34
+#: debianmemberportfolio/templates/base.mako:34
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a href=\"http://wiki."
-"debian.org/DDPortfolio\">DDPortfolio page in the Debian Wiki</a>. You can "
-"create a set of customized links leading to a Debian Member's or package "
-"maintainer's information regarding Debian."
+"This service has been inspired by Stefano Zacchiroli's <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio page in the "
+"Debian Wiki</a>. You can create a set of customized links leading to a "
+"Debian Member's or package maintainer's information regarding Debian."
 msgstr ""
-"Layanan ini terinspirasi dari halaman <a href=\"http://wiki.debian.org/"
-"DDPortfolio\">DDPortfolio Stefano Zacchiroli di Wiki Debian</a>. Anda dapat "
-"membuat sebuah link kustom yang mengarah ke Anggota Debian atau informasi "
-"mengenai pengelola paket Debian."
+"Layanan ini terinspirasi dari halaman <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio Stefano "
+"Zacchiroli di Wiki Debian</a>. Anda dapat membuat sebuah link kustom yang"
+" mengarah ke Anggota Debian atau informasi mengenai pengelola paket "
+"Debian."

-#: ddportfolioservice/templates/base.mako:41
+#: debianmemberportfolio/templates/base.mako:41
 msgid "AGPL - Free Software"
 msgstr "AGPL - Free Software"

-#: ddportfolioservice/templates/base.mako:43
+#: debianmemberportfolio/templates/base.mako:43
 #, fuzzy, python-format
 msgid ""
-"The service is available under the terms of the <a href=\"http://www.gnu.org/"
-"licenses/agpl.html\">GNU Affero General Public License</a> as published by "
-"the Free Software Foundation, either version 3 of the License, or (at your "
-"option) any later version. You can <a href=\"%(browseurl)s\" title=\"Gitweb "
-"repository browser URL\">browse the source code</a> or clone it from <a href="
-"\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> using <a href="
-"\"http://git-scm.com/\">git</a>. If you want to translate this service to "
-"your language you can contribute at <a href=\"%(transifexurl)s\" title="
-"\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
+"The service is available under the terms of the <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
+"License</a> as published by the Free Software Foundation, either version "
+"3 of the License, or (at your option) any later version. You can <a "
+"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
+" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
+"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
+"scm.com/\">git</a>. If you want to translate this service to your "
+"language you can contribute at <a href=\"%(transifexurl)s\" "
+"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
 msgstr ""
-"Layanan ini tersedia di bawah persyaratan <a href=\"http://www.gnu.org/"
-"licenses/agpl.html\">GNU Affero General Public License</a> seperti yang "
-"diterbitkan oleh Free Software Foundation, baik versi 3 dari Lisensi, atau "
-"(dengan pilihan Anda) versi lainnya. Anda dapat <a href=\"%(browseurl)s\" "
-"title=\"Gitweb repository browser URL\">menelusuri kode sumber</a> atau klon "
-"dari <a href=\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> "
-"menggunakan <a href=\"http://git-scm.com/\">git</a>."
+"Layanan ini tersedia di bawah persyaratan <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
+"License</a> seperti yang diterbitkan oleh Free Software Foundation, baik "
+"versi 3 dari Lisensi, atau (dengan pilihan Anda) versi lainnya. Anda "
+"dapat <a href=\"%(browseurl)s\" title=\"Gitweb repository browser "
+"URL\">menelusuri kode sumber</a> atau klon dari <a href=\"%(cloneurl)s\" "
+"title=\"git clone URL\">%(cloneurl)s</a> menggunakan <a href=\"http"
+"://git-scm.com/\">git</a>."

-#: ddportfolioservice/templates/base.mako:44
-#| msgid "Copyright © 2009, 2010, 2011, 2012 Jan Dittberner"
+#: debianmemberportfolio/templates/base.mako:44
 msgid "Copyright © 2009-2014 Jan Dittberner"
 msgstr "Hak Cipta © 2009-2014 Jan Dittberner"

-#: ddportfolioservice/templates/showform.mako:24
+#: debianmemberportfolio/templates/showform.mako:24
 msgid "Enter your personal information"
 msgstr "Masukkan informasi data pribadi anda"

-#: ddportfolioservice/templates/showform.mako:30
-#: ddportfolioservice/templates/showurls.mako:28
+#: debianmemberportfolio/templates/showform.mako:30
+#: debianmemberportfolio/templates/showurls.mako:27
 msgid "Debian Member Portfolio"
 msgstr "Portfolio Anggota Debian"

-#: ddportfolioservice/templates/showform.mako:36
+#: debianmemberportfolio/templates/showform.mako:36
 msgid "Email address:"
 msgstr "Alamat surel:"

-#: ddportfolioservice/templates/showform.mako:47
+#: debianmemberportfolio/templates/showform.mako:47
 msgid "Show all form fields"
 msgstr "Tampilkan semua bagian formulir"

-#: ddportfolioservice/templates/showform.mako:54
+#: debianmemberportfolio/templates/showform.mako:54
 msgid "Name:"
 msgstr "Nama:"

-#: ddportfolioservice/templates/showform.mako:64
+#: debianmemberportfolio/templates/showform.mako:64
 msgid "GPG fingerprint:"
 msgstr "sidik jari GPG"

-#: ddportfolioservice/templates/showform.mako:79
+#: debianmemberportfolio/templates/showform.mako:79
 msgid "Debian user name:"
 msgstr "Nama pengguna Debian:"

-#: ddportfolioservice/templates/showform.mako:94
+#: debianmemberportfolio/templates/showform.mako:94
 msgid "Non Debian email address:"
 msgstr "Selain alamat email Debian:"

-#: ddportfolioservice/templates/showform.mako:109
+#: debianmemberportfolio/templates/showform.mako:109
 msgid "Alioth user name:"
 msgstr "Nama pengguna Alioth:"

-#: ddportfolioservice/templates/showform.mako:125
+#: debianmemberportfolio/templates/showform.mako:125
 msgid "Wiki user name:"
 msgstr "Nama pengguna Wiki"

-#: ddportfolioservice/templates/showform.mako:140
+#: debianmemberportfolio/templates/showform.mako:140
 msgid "Forum user id:"
 msgstr "ID pengguna Forum:"

-#: ddportfolioservice/templates/showform.mako:151
+#: debianmemberportfolio/templates/showform.mako:151
 msgid "Output format:"
 msgstr "Format Keluaran:"

-#: ddportfolioservice/templates/showform.mako:157
+#: debianmemberportfolio/templates/showform.mako:157
 msgid "HTML"
 msgstr "HTML"

-#: ddportfolioservice/templates/showform.mako:159
+#: debianmemberportfolio/templates/showform.mako:159
 msgid "JSON"
 msgstr "JSON"

-#: ddportfolioservice/templates/showform.mako:161
+#: debianmemberportfolio/templates/showform.mako:161
 msgid "Build Debian Member Portfolio URLs"
 msgstr "Membangun URL Portfolio Anggota Debian"

-#: ddportfolioservice/templates/showurls.mako:24
+#: debianmemberportfolio/templates/showurls.mako:23
 msgid "Your personal links"
 msgstr "Tautan pribadi anda"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "Usage"
 msgstr "Penggunaan"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "URL"
 msgstr "URL"

-#: ddportfolioservice/templates/showurls.mako:41
+#: debianmemberportfolio/templates/showurls.mako:40
 msgid "Error during URL creation:"
 msgstr "Kesalahan selama pembuatan URL:"

-#: ddportfolioservice/templates/showurls.mako:68
+#: debianmemberportfolio/templates/showurls.mako:67
 msgid "Restart"
 msgstr "Mulai ulang"
+
--- a/debianmemberportfolio/i18n/pt_BR/LC_MESSAGES/debianmemberportfolio.mo
+++ b/debianmemberportfolio/i18n/pt_BR/LC_MESSAGES/debianmemberportfolio.mo
--- a/debianmemberportfolio/i18n/pt_BR/LC_MESSAGES/debianmemberportfolio.po
+++ b/debianmemberportfolio/i18n/pt_BR/LC_MESSAGES/debianmemberportfolio.po
@ -1,36 +1,35 @@
-# Portuguese (Brazil) translations for ddportfolioservice.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the ddportfolioservice
-# project.
+# Portuguese (Brazil) translations for the Debian Member Portfolio Service.
 #
+# Copyright (C) 2012 Daniel Manzano
+# This file is distributed under the same license as the Debian Member
+# Portfolio Service project.
 # Translators:
 # Daniel  Manzano <dzm747@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-01-11 00:25+0000\n"
+"POT-Creation-Date: 2014-02-08 18:14+0100\n"
 "PO-Revision-Date: 2014-01-11 01:27+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
-"debportfolioservice/language/pt_BR/)\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language-Team: Portuguese (Brazil) "
+"(http://www.transifex.net/projects/p/debportfolioservice/language/pt_BR/)"
+"\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
-"X-Generator: Poedit 1.5.4\n"
-"Language: pt_BR\n"

-#: ddportfolioservice/controllers/ddportfolio.py:45
+#: debianmemberportfolio/controllers/portfolio.py:45
 msgid "Overview"
 msgstr "Visão Geral"

-#: ddportfolioservice/controllers/ddportfolio.py:46
+#: debianmemberportfolio/controllers/portfolio.py:46
 msgid "Debian Member's Package Overview"
 msgstr "Visão geral de Pacote de membros Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:47
+#: debianmemberportfolio/controllers/portfolio.py:47
 msgid ""
 "Debian Member's Package Overview\n"
 "... showing all email addresses"
@ -38,382 +37,383 @@ msgstr ""
 "Visão geral de Pacote de membros Debian\n"
 "... mostrando todos os endereços de email"

-#: ddportfolioservice/controllers/ddportfolio.py:51
+#: debianmemberportfolio/controllers/portfolio.py:51
 msgid "Bugs"
 msgstr "Bugs"

-#: ddportfolioservice/controllers/ddportfolio.py:52
+#: debianmemberportfolio/controllers/portfolio.py:52
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"http://bugs.debian.org"
+"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "Bugs recebidos\n"
-"(nota: co-mantenedores não listados, veja <a href=\"http://bugs.debian.org/"
-"cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(nota: co-mantenedores não listados, veja <a "
+"href=\"http://bugs.debian.org/cgi-"
+"bin/bugreport.cgi?bug=430986\">#430986</a>)"

-#: ddportfolioservice/controllers/ddportfolio.py:56
+#: debianmemberportfolio/controllers/portfolio.py:56
 msgid "bugs reported"
 msgstr "Bugs reportados"

-#: ddportfolioservice/controllers/ddportfolio.py:57
+#: debianmemberportfolio/controllers/portfolio.py:57
 msgid "user tags"
 msgstr "Tags de usuário"

-#: ddportfolioservice/controllers/ddportfolio.py:58
-msgid ""
-"all messages (i.e., full text search for developer name on all bug logs)"
+#: debianmemberportfolio/controllers/portfolio.py:58
+msgid "all messages (i.e., full text search for developer name on all bug logs)"
 msgstr ""
-"Todas as mensagens (Ex. pesquisa completa de texto para nome de desenvovedor "
-"em todos os logs de bug)"
+"Todas as mensagens (Ex. pesquisa completa de texto para nome de "
+"desenvovedor em todos os logs de bug)"

-#: ddportfolioservice/controllers/ddportfolio.py:60
+#: debianmemberportfolio/controllers/portfolio.py:60
 msgid "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"
 msgstr "<a href=\"http://wiki.debian.org/WNPP\">WNPP</a>"

-#: ddportfolioservice/controllers/ddportfolio.py:61
+#: debianmemberportfolio/controllers/portfolio.py:61
 msgid "correspondent for bugs"
 msgstr "correspondente para bugs"

-#: ddportfolioservice/controllers/ddportfolio.py:62
+#: debianmemberportfolio/controllers/portfolio.py:62
 msgid "one year open bug history graph"
 msgstr "Gráfico histórico de bug aberto há um ano "

-#: ddportfolioservice/controllers/ddportfolio.py:65
+#: debianmemberportfolio/controllers/portfolio.py:65
 msgid "Build"
 msgstr "Construção"

-#: ddportfolioservice/controllers/ddportfolio.py:66
+#: debianmemberportfolio/controllers/portfolio.py:66
 msgid "buildd.d.o"
 msgstr "buildd.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:67
+#: debianmemberportfolio/controllers/portfolio.py:67
 msgid "igloo"
 msgstr "Iglu"

-#: ddportfolioservice/controllers/ddportfolio.py:70
+#: debianmemberportfolio/controllers/portfolio.py:70
 msgid "Quality Assurance"
 msgstr "Garantia de qualidade"

-#: ddportfolioservice/controllers/ddportfolio.py:71
+#: debianmemberportfolio/controllers/portfolio.py:71
 msgid "maintainer dashboard"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:72
+#: debianmemberportfolio/controllers/portfolio.py:72
 msgid "lintian reports"
 msgstr "relatórios lintian"

-#: ddportfolioservice/controllers/ddportfolio.py:73
+#: debianmemberportfolio/controllers/portfolio.py:73
 msgid "full lintian reports (i.e. including \"info\"-level messages)"
 msgstr "relatórios lintian completos (Ex. incluíndo mensagens \"info\"-level)"

-#: ddportfolioservice/controllers/ddportfolio.py:75
+#: debianmemberportfolio/controllers/portfolio.py:75
 msgid "piuparts"
 msgstr "piuparts"

-#: ddportfolioservice/controllers/ddportfolio.py:76
+#: debianmemberportfolio/controllers/portfolio.py:76
 msgid "Debian patch tracking system"
 msgstr "Sistema de patch tracking Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:77
+#: debianmemberportfolio/controllers/portfolio.py:77
 msgid "Debian Url ChecKer"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:80
+#: debianmemberportfolio/controllers/portfolio.py:80
 msgid "Mailing Lists"
 msgstr "Listas de discussão"

-#: ddportfolioservice/controllers/ddportfolio.py:81
+#: debianmemberportfolio/controllers/portfolio.py:81
 msgid "lists.d.o"
 msgstr "lists.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:82
+#: debianmemberportfolio/controllers/portfolio.py:82
 msgid "lists.a.d.o"
 msgstr "lists.a.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:83
+#: debianmemberportfolio/controllers/portfolio.py:83
 msgid "gmane"
 msgstr "gmane"

-#: ddportfolioservice/controllers/ddportfolio.py:86
+#: debianmemberportfolio/controllers/portfolio.py:86
 msgid "Files"
 msgstr "Arquivos"

-#: ddportfolioservice/controllers/ddportfolio.py:87
+#: debianmemberportfolio/controllers/portfolio.py:87
 msgid "people.d.o"
 msgstr "people.d.o"

-#: ddportfolioservice/controllers/ddportfolio.py:88
+#: debianmemberportfolio/controllers/portfolio.py:88
 msgid "oldpeople"
 msgstr "oldpeople"

-#: ddportfolioservice/controllers/ddportfolio.py:89
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: debianmemberportfolio/controllers/portfolio.py:89
+#: debianmemberportfolio/controllers/portfolio.py:97
 msgid "Alioth"
 msgstr "Alioth"

-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: debianmemberportfolio/controllers/portfolio.py:92
 msgid "Membership"
 msgstr "Associação"

-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: debianmemberportfolio/controllers/portfolio.py:93
 msgid "NM"
 msgstr "NM"

-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: debianmemberportfolio/controllers/portfolio.py:94
 msgid "DB information via finger"
 msgstr "Infomações DB via finger"

-#: ddportfolioservice/controllers/ddportfolio.py:95
+#: debianmemberportfolio/controllers/portfolio.py:95
 msgid "DB information via HTTP"
 msgstr "Informações DB via HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:96
+#: debianmemberportfolio/controllers/portfolio.py:96
 msgid "FOAF profile"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: debianmemberportfolio/controllers/portfolio.py:98
 msgid "Wiki"
 msgstr "Wiki"

-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: debianmemberportfolio/controllers/portfolio.py:99
 msgid "Forum"
 msgstr "Fórum"

-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: debianmemberportfolio/controllers/portfolio.py:102
 msgid "Miscellaneous"
 msgstr "Miscelânea"

-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: debianmemberportfolio/controllers/portfolio.py:103
 msgid "debtags"
 msgstr "debtags"

-#: ddportfolioservice/controllers/ddportfolio.py:104
+#: debianmemberportfolio/controllers/portfolio.py:104
 msgid "Planet Debian (name)"
 msgstr ""

-#: ddportfolioservice/controllers/ddportfolio.py:105
+#: debianmemberportfolio/controllers/portfolio.py:105
 #, fuzzy
-#| msgid "Debian user name"
 msgid "Planet Debian (username)"
 msgstr "Nome de usuário Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: debianmemberportfolio/controllers/portfolio.py:106
 msgid "links"
 msgstr "links"

-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: debianmemberportfolio/controllers/portfolio.py:107
 msgid "Debian website"
 msgstr "Site do Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: debianmemberportfolio/controllers/portfolio.py:108
 msgid "Debian search"
 msgstr "Pesquisa Debian"

-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: debianmemberportfolio/controllers/portfolio.py:109
 msgid "GPG public key via finger"
 msgstr "Chave pública GPG via finger"

-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: debianmemberportfolio/controllers/portfolio.py:110
 msgid "GPG public key via HTTP"
 msgstr "Chave pública GPG via HTTP"

-#: ddportfolioservice/controllers/ddportfolio.py:111
+#: debianmemberportfolio/controllers/portfolio.py:111
 msgid "NM, AM participation"
 msgstr "Participação NM, AM"

-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: debianmemberportfolio/controllers/portfolio.py:112
 #, fuzzy
-#| msgid "Enter your personal information"
 msgid "Contribution information"
 msgstr "Insira suas informações pessoais"

-#: ddportfolioservice/controllers/ddportfolio.py:115
+#: debianmemberportfolio/controllers/portfolio.py:115
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informação alcançável via ssh (para membros Debian)"

-#: ddportfolioservice/controllers/ddportfolio.py:116
+#: debianmemberportfolio/controllers/portfolio.py:116
 msgid "owned debian.net domains"
 msgstr "domínios debian.net adquiridos"

-#: ddportfolioservice/controllers/ddportfolio.py:117
+#: debianmemberportfolio/controllers/portfolio.py:117
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
 msgstr ""
-"<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> informações "
-"de banco de dados"
+"<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
+"informações de banco de dados"

-#: ddportfolioservice/controllers/ddportfolio.py:119
+#: debianmemberportfolio/controllers/portfolio.py:119
 msgid "Group membership information"
 msgstr "Informações de Grupos associados"

-#: ddportfolioservice/controllers/ddportfolio.py:122
+#: debianmemberportfolio/controllers/portfolio.py:122
 msgid "Ubuntu"
 msgstr "Ubuntu"

-#: ddportfolioservice/controllers/ddportfolio.py:123
+#: debianmemberportfolio/controllers/portfolio.py:123
 msgid "Available patches from Ubuntu"
 msgstr "Patches disponíveis para Ubuntu"

-#: ddportfolioservice/model/urlbuilder.py:40
+#: debianmemberportfolio/model/urlbuilder.py:40
 msgid "Email address"
 msgstr "Endereços de email"

-#: ddportfolioservice/model/urlbuilder.py:41
+#: debianmemberportfolio/model/urlbuilder.py:41
 msgid "Name"
 msgstr "Nome"

-#: ddportfolioservice/model/urlbuilder.py:42
+#: debianmemberportfolio/model/urlbuilder.py:42
 msgid "GPG fingerprint"
 msgstr "Fingerprint GPG"

-#: ddportfolioservice/model/urlbuilder.py:43
+#: debianmemberportfolio/model/urlbuilder.py:43
 msgid "Debian user name"
 msgstr "Nome de usuário Debian"

-#: ddportfolioservice/model/urlbuilder.py:44
+#: debianmemberportfolio/model/urlbuilder.py:44
 msgid "Non Debian email address"
 msgstr "Endereço de email não Debian"

-#: ddportfolioservice/model/urlbuilder.py:45
+#: debianmemberportfolio/model/urlbuilder.py:45
 msgid "Alioth user name"
 msgstr "Nome de usuário Alioth"

-#: ddportfolioservice/model/urlbuilder.py:97
-#: ddportfolioservice/model/urlbuilder.py:101
+#: debianmemberportfolio/model/urlbuilder.py:97
+#: debianmemberportfolio/model/urlbuilder.py:101
 #, python-format
 msgid "Missing input: %s"
 msgstr "Entrada restante: %s"

-#: ddportfolioservice/templates/base.mako:25
-#: ddportfolioservice/templates/base.mako:33
+#: debianmemberportfolio/templates/base.mako:25
+#: debianmemberportfolio/templates/base.mako:33
 msgid "Debian Member Portfolio Service"
 msgstr "Membro do Serviço de Portfolio Debian"

-#: ddportfolioservice/templates/base.mako:31
+#: debianmemberportfolio/templates/base.mako:31
 msgid "Debian Logo"
 msgstr "Logo Debian"

-#: ddportfolioservice/templates/base.mako:34
+#: debianmemberportfolio/templates/base.mako:34
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a href=\"http://wiki."
-"debian.org/DDPortfolio\">DDPortfolio page in the Debian Wiki</a>. You can "
-"create a set of customized links leading to a Debian Member's or package "
-"maintainer's information regarding Debian."
+"This service has been inspired by Stefano Zacchiroli's <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio page in the "
+"Debian Wiki</a>. You can create a set of customized links leading to a "
+"Debian Member's or package maintainer's information regarding Debian."
 msgstr ""
-"Este serviço tem sido inspirado por Stefano Zacchiroli's <a href=\"http://"
-"wiki.debian.org/DDPortfolio\">Página DDPortfolio na Debian Wiki</a>. Você "
-"pode criar um conjunto de links customizados apontando para informações, ou "
-"de membro Debian, ou de mantenedor de pacotes a respeito de  Debian."
+"Este serviço tem sido inspirado por Stefano Zacchiroli's <a "
+"href=\"http://wiki.debian.org/DDPortfolio\">Página DDPortfolio na Debian "
+"Wiki</a>. Você pode criar um conjunto de links customizados apontando "
+"para informações, ou de membro Debian, ou de mantenedor de pacotes a "
+"respeito de  Debian."

-#: ddportfolioservice/templates/base.mako:41
+#: debianmemberportfolio/templates/base.mako:41
 msgid "AGPL - Free Software"
 msgstr "AGPL - Sofware Livre"

-#: ddportfolioservice/templates/base.mako:43
+#: debianmemberportfolio/templates/base.mako:43
 #, fuzzy, python-format
 msgid ""
-"The service is available under the terms of the <a href=\"http://www.gnu.org/"
-"licenses/agpl.html\">GNU Affero General Public License</a> as published by "
-"the Free Software Foundation, either version 3 of the License, or (at your "
-"option) any later version. You can <a href=\"%(browseurl)s\" title=\"Gitweb "
-"repository browser URL\">browse the source code</a> or clone it from <a href="
-"\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> using <a href="
-"\"http://git-scm.com/\">git</a>. If you want to translate this service to "
-"your language you can contribute at <a href=\"%(transifexurl)s\" title="
-"\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
+"The service is available under the terms of the <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
+"License</a> as published by the Free Software Foundation, either version "
+"3 of the License, or (at your option) any later version. You can <a "
+"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
+" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
+"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
+"scm.com/\">git</a>. If you want to translate this service to your "
+"language you can contribute at <a href=\"%(transifexurl)s\" "
+"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
 msgstr ""
-"O serviço está disponível sob os termos da <a href=\"http://www.gnu.org/"
-"licenses/agpl.html\">Licença Pública Geral  Affero GNU</a> conforme "
-"publicado pela the Free Software Foundation, tanto na versão 3 da licença, "
-"como (a seu critério) qualquer versão mais recente. Você pode<a href="
-"\"%(browseurl)s\" title=\"Gitweb repository browser URL\">visualizar o "
-"código fonte</a> ou cloná-lo<a href=\"%(cloneurl)s\" title=\"git clone URL\">"
-"%(cloneurl)s</a> usando <a href=\"http://git-scm.com/\">git</a>."
+"O serviço está disponível sob os termos da <a "
+"href=\"http://www.gnu.org/licenses/agpl.html\">Licença Pública Geral  "
+"Affero GNU</a> conforme publicado pela the Free Software Foundation, "
+"tanto na versão 3 da licença, como (a seu critério) qualquer versão mais "
+"recente. Você pode<a href=\"%(browseurl)s\" title=\"Gitweb repository "
+"browser URL\">visualizar o código fonte</a> ou cloná-lo<a "
+"href=\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> usando <a "
+"href=\"http://git-scm.com/\">git</a>."

-#: ddportfolioservice/templates/base.mako:44
-#| msgid "Copyright © 2009, 2010, 2011, 2012 Jan Dittberner"
+#: debianmemberportfolio/templates/base.mako:44
 msgid "Copyright © 2009-2014 Jan Dittberner"
 msgstr "Direitos Autorais © 2009-2014 Jan Dittberner"

-#: ddportfolioservice/templates/showform.mako:24
+#: debianmemberportfolio/templates/showform.mako:24
 msgid "Enter your personal information"
 msgstr "Insira suas informações pessoais"

-#: ddportfolioservice/templates/showform.mako:30
-#: ddportfolioservice/templates/showurls.mako:28
+#: debianmemberportfolio/templates/showform.mako:30
+#: debianmemberportfolio/templates/showurls.mako:27
 msgid "Debian Member Portfolio"
 msgstr "Portfolio de Membro Debian"

-#: ddportfolioservice/templates/showform.mako:36
+#: debianmemberportfolio/templates/showform.mako:36
 msgid "Email address:"
 msgstr "Endereço de email:"

-#: ddportfolioservice/templates/showform.mako:47
+#: debianmemberportfolio/templates/showform.mako:47
 msgid "Show all form fields"
 msgstr "Mostrar todos os campos"

-#: ddportfolioservice/templates/showform.mako:54
+#: debianmemberportfolio/templates/showform.mako:54
 msgid "Name:"
 msgstr "Nome:"

-#: ddportfolioservice/templates/showform.mako:64
+#: debianmemberportfolio/templates/showform.mako:64
 msgid "GPG fingerprint:"
 msgstr "Fingerprint GPG:"

-#: ddportfolioservice/templates/showform.mako:79
+#: debianmemberportfolio/templates/showform.mako:79
 msgid "Debian user name:"
 msgstr "Nome de usuário Debian:"

-#: ddportfolioservice/templates/showform.mako:94
+#: debianmemberportfolio/templates/showform.mako:94
 msgid "Non Debian email address:"
 msgstr "Endereço de email não Debian:"

-#: ddportfolioservice/templates/showform.mako:109
+#: debianmemberportfolio/templates/showform.mako:109
 msgid "Alioth user name:"
 msgstr "Nome de usuário Alioth:"

-#: ddportfolioservice/templates/showform.mako:125
+#: debianmemberportfolio/templates/showform.mako:125
 msgid "Wiki user name:"
 msgstr "Nome de usuário Wiki:"

-#: ddportfolioservice/templates/showform.mako:140
+#: debianmemberportfolio/templates/showform.mako:140
 msgid "Forum user id:"
 msgstr "Id de usuário do fórum:"

-#: ddportfolioservice/templates/showform.mako:151
+#: debianmemberportfolio/templates/showform.mako:151
 msgid "Output format:"
 msgstr "Formato de saída:"

-#: ddportfolioservice/templates/showform.mako:157
+#: debianmemberportfolio/templates/showform.mako:157
 msgid "HTML"
 msgstr "HTML"

-#: ddportfolioservice/templates/showform.mako:159
+#: debianmemberportfolio/templates/showform.mako:159
 msgid "JSON"
 msgstr "JSON"

-#: ddportfolioservice/templates/showform.mako:161
+#: debianmemberportfolio/templates/showform.mako:161
 msgid "Build Debian Member Portfolio URLs"
 msgstr "URLs de Portfolio de  Membros Debian em Construção"

-#: ddportfolioservice/templates/showurls.mako:24
+#: debianmemberportfolio/templates/showurls.mako:23
 msgid "Your personal links"
 msgstr "Seus links pessoais"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "Usage"
 msgstr "MOdo de uso"

-#: ddportfolioservice/templates/showurls.mako:31
+#: debianmemberportfolio/templates/showurls.mako:30
 msgid "URL"
 msgstr "URL"

-#: ddportfolioservice/templates/showurls.mako:41
+#: debianmemberportfolio/templates/showurls.mako:40
 msgid "Error during URL creation:"
 msgstr "Erro durante criação de URL:"

-#: ddportfolioservice/templates/showurls.mako:68
+#: debianmemberportfolio/templates/showurls.mako:67
 msgid "Restart"
 msgstr "Reiniciar"
+
--- a/debianmemberportfolio/lib/init.py
+++ b/debianmemberportfolio/lib/init.py
@ -1,22 +1,22 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service lib package
-# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service lib package
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
--- a/debianmemberportfolio/lib/app_globals.py
+++ b/debianmemberportfolio/lib/app_globals.py
@ -1,26 +1,28 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service application Globals
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service application Globals
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-"""The application's Globals object"""
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+The application's Globals object
+"""

 from beaker.cache import CacheManager
 from beaker.util import parse_cache_config_options
--- a/debianmemberportfolio/lib/base.py
+++ b/debianmemberportfolio/lib/base.py
@ -1,26 +1,27 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service base controller
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service base controller
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-"""The base Controller API
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+The base Controller API

 Provides the BaseController class for subclassing.
 """
@ -45,3 +46,6 @@ class BaseController(WSGIController):
                pass
        c.messages = {'errors': [], 'messages': []}
        return WSGIController.__call__(self, environ, start_response)
+
+
+__all__ = ['BaseController', 'render']
--- a/debianmemberportfolio/lib/helpers.py
+++ b/debianmemberportfolio/lib/helpers.py
@ -1,24 +1,26 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service webhelpers
-# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service webhelpers
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# pymode:lint_ignore=W0611
 #
 """Helper functions

--- a/debianmemberportfolio/model/init.py
+++ b/debianmemberportfolio/model/init.py
@ -1,24 +1,24 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service model package
-# Copyright (c) 2009 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service model package
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
 Model classes and model related utilities for the Debian Member Portfolio
--- a/debianmemberportfolio/model/dddatabuilder.py
+++ b/debianmemberportfolio/model/dddatabuilder.py
@ -1,29 +1,32 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service DD data builder
-# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service data builder
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-"""This file contains code to build a representation of a person based
-on keyring data associated to a given email address."""
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+This file contains code to build a representation of a person based on keyring
+data associated to a given email address.
+"""
+
 import logging
-from ddportfolioservice.model import keyfinder
+from debianmemberportfolio.model import keyfinder

 TYPE_NO = 0
 TYPE_DM = 1
@ -34,8 +37,8 @@ log = logging.getLogger(__name__)

 def build_data(email_address):
    """Build a DD data structure from a given email address."""
-    fields = dict([(field, func(str(email_address))) \
-                       for (field, func) in \
+    fields = dict([(field, func(str(email_address)))
+                   for (field, func) in
                   [('gpgfp', keyfinder.getFingerprintByEmail),
                    ('name', keyfinder.getRealnameByEmail),
                    ('username', keyfinder.getLoginByEmail)]])
--- a/debianmemberportfolio/model/form.py
+++ b/debianmemberportfolio/model/form.py
@ -2,9 +2,10 @@
 # -*- coding: utf-8 -*-
 #
 # Debian Member Portfolio Service form handling model
+#
 # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of Debian Member Portfolio Service.
+# This file is part of the Debian Member Portfolio Service.
 #
 # Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
@ -19,6 +20,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+"""
+This file contains the form definitions used in the controllers.
+"""
+
 import formencode


--- a/debianmemberportfolio/model/keyfinder.py
+++ b/debianmemberportfolio/model/keyfinder.py
@ -2,9 +2,10 @@
 # -*- coding: utf-8 -*-
 #
 # Debian Member Portfolio Service key finder module
-# Copyright (c) 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of Debian Member Portfolio Service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
+#
+# This file is part of the Debian Member Portfolio Service.
 #
 # Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
@ -16,13 +17,14 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
 # General Public License for more details.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
 This module provides tools for finding PGP key information from a
 given keyring.
 """
+
 import logging
 import time
 import sys
--- a/debianmemberportfolio/model/keyringanalyzer.py
+++ b/debianmemberportfolio/model/keyringanalyzer.py
@ -1,25 +1,24 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# Debian Member Portfolio service application key ring analyzer tool
+# Debian Member Portfolio Service application key ring analyzer tool
 #
 # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of the Debian Member Portfolio service.
+# This file is part of the Debian Member Portfolio Service.
 #
-# Debian Member Portfolio service is free software: you can redistribute it
+# Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# Debian Member Portfolio service is distributed in the hope that it will be
+# Debian Member Portfolio Service is distributed in the hope that it will be
 # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
 # General Public License for more details.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
 This is a tool that analyzes GPG and PGP keyrings and stores the
@ -45,7 +44,7 @@ CONFIG = ConfigParser.SafeConfigParser()
 def _get_keyrings():
    """
    Gets the available keyring files from the keyring directory
-    configured in ddportfolio.ini.
+    configured in portfolio.ini.
    """
    keyringdir = os.path.expanduser(CONFIG.get('DEFAULT', 'keyring.dir'))
    logging.debug("keyring dir is %s", keyringdir)
@ -175,7 +174,7 @@ def process_keyrings():
 if __name__ == '__main__':
    logging.basicConfig(stream=sys.stderr, level=logging.WARNING)
    CONFIG.readfp(pkg_resources.resource_stream(
-        __name__, 'ddportfolio.ini'))
+        __name__, 'portfolio.ini'))
    gpghome = os.path.expanduser(CONFIG.get('DEFAULT', 'gnupghome'))
    if not os.path.isdir(gpghome):
        os.makedirs(gpghome, 0700)
--- a/debianmemberportfolio/model/urlbuilder.py
+++ b/debianmemberportfolio/model/urlbuilder.py
@ -1,40 +1,40 @@
 # -*- python -*-
 # -*- coding: utf8 -*-
 #
-# DDPortfolio service url builder
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service url builder
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
 This module provides the function build_urls to build personalized
 URLs using the given information and the URL patterns defined in
-ddportfolio.ini.
+portfolio.ini.
 """

 from ConfigParser import ConfigParser, InterpolationMissingOptionError
 import pkg_resources
-from ddportfolioservice.model import keyfinder
+from debianmemberportfolio.model import keyfinder
 from urllib import quote_plus
 from pylons.i18n.translation import _, N_


 my_config = ConfigParser()
-my_config.readfp(pkg_resources.resource_stream(__name__, 'ddportfolio.ini'))
+my_config.readfp(pkg_resources.resource_stream(__name__, 'portfolio.ini'))

 _FIELDNAMES_MAP = {
    'email': N_('Email address'),
@ -57,10 +57,10 @@ class DDPortfolioEntry(object):
            self.type = 'url'


-def build_urls(fields):
-    """Build personalized URLs using the developer information in
-    fields."""
-    data = []
+def _build_quoted_fields(fields):
+    """
+    Take a dictionary of raw field values and quote the values if required.
+    """
    qfields = {}
    for key, value in fields.iteritems():
        if value is not None:
@ -77,13 +77,21 @@ def build_urls(fields):
            qfields['gpgfp'] = fpr[0]
    qfields['firstchar'] = fields['email'][0].encode('utf8')
    qfields['emailnoq'] = fields['email'].encode('utf8')
-    for section in [section.strip() for section in \
+    return qfields
+
+
+def build_urls(fields):
+    """Build personalized URLs using the developer information in
+    fields."""
+    data = []
+    qfields = _build_quoted_fields(fields)
+    for section in [section.strip() for section in
                    my_config.get('DEFAULT',
                                  'urlbuilder.sections').split(',')]:
        data.append(['section', section])
        if my_config.has_option(section, 'urls'):
            for entry in ([
-                    DDPortfolioEntry(my_config, section, url) for url in \
+                DDPortfolioEntry(my_config, section, url) for url in
                    my_config.get(section, 'urls').split(',')]):
                try:
                    data.append(
@ -94,7 +102,7 @@ def build_urls(fields):
                    if not entry.optional:
                        if e.reference in _FIELDNAMES_MAP:
                            data.append(['error', section, entry,
-                                         _('Missing input: %s') % \
+                                         _('Missing input: %s') %
                                         _(_FIELDNAMES_MAP[e.reference])])
                        else:
                            data.append(['error', section, entry,
--- a/debianmemberportfolio/templates/showform.mako
+++ b/debianmemberportfolio/templates/showform.mako
@ -25,8 +25,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 </%def>
 <%def name="extrahead()">${h.javascript_link('/javascript/jquery/jquery.js',
 h.url(controller='showformscripts', action='index'))}</%def>
-${h.form(h.url(action='urllist', controller='ddportfolio'), method='get')}
-<fieldset id="ddportfolio">
+${h.form(h.url(action='urllist', controller='portfolio'), method='get')}
+<fieldset id="portfolio">
  <legend>${_('Debian Member Portfolio')}</legend>
  <div id="emailfield" \
       % if 'email' in c.messages['errors']:
--- a/debianmemberportfolio/templates/showurls.mako
+++ b/debianmemberportfolio/templates/showurls.mako
@ -23,7 +23,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 - ${_('Your personal links')}
 </%def>
 % if c.urldata:
-<fieldset id="ddportfolio">
+<fieldset id="portfolio">
  <legend>${_('Debian Member Portfolio')}</legend>
  <table id="urltable">
    <thead>
@ -64,4 +64,4 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
  </table>
 </fieldset>
 % endif
-<p>${h.link_to(_('Restart'), h.url(controller='ddportfolio', action='index'))}</p>
+<p>${h.link_to(_('Restart'), h.url(controller='portfolio', action='index'))}</p>
--- a/debianmemberportfolio/tests/init.py
+++ b/debianmemberportfolio/tests/init.py
@ -2,9 +2,10 @@
 # -*- coding: utf-8 -*-
 #
 # Debian Member Portfolio Service tests package
+#
 # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of Debian Member Portfolio Service.
+# This file is part of the Debian Member Portfolio Service.
 #
 # Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
@ -19,16 +20,18 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-"""Pylons application test package
-
-When the test runner finds and executes tests within this directory,
-this file will be loaded to setup the test environment.
-
-It registers the root directory of the project in sys.path and
-pkg_resources, in case the project hasn't been installed with
-setuptools. It also initializes the application via websetup (paster
-setup-app) with the project's test.ini configuration file.
 """
+Pylons application test package
+
+When the test runner finds and executes tests within this directory, this file
+will be loaded to setup the test environment.
+
+It registers the root directory of the project in sys.path and pkg_resources,
+in case the project hasn't been installed with setuptools. It also initializes
+the application via websetup (paster setup-app) with the project's test.ini
+configuration file.
+"""
+
 from unittest import TestCase

 from paste.script.appinstall import SetupCommand
--- a/debianmemberportfolio/tests/functional/init.py
+++ b/debianmemberportfolio/tests/functional/init.py
@ -1,22 +1,22 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service functional tests package
-# Copyright (c) 2009 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service functional tests package
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
--- a/debianmemberportfolio/tests/functional/test_portfolio.py
+++ b/debianmemberportfolio/tests/functional/test_portfolio.py
@ -1,10 +1,11 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# Debian Member Portfolio Service DdportfolioController test
-# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service PortfolioController test
 #
-# This file is part of Debian Member Portfolio Service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
+#
+# This file is part of the Debian Member Portfolio Service.
 #
 # Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
@ -19,13 +20,23 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from ddportfolioservice.tests import TestController, url
+"""
+This module defines test cases for the PortfolioController.
+"""
+
+from debianmemberportfolio.tests import TestController, url


-class TestDdportfolioController(TestController):
+class TestPortfolioController(TestController):
+    """
+    Test cases for PortfolioController.
+    """

    def test_index(self):
-        response = self.app.get(url(controller='ddportfolio', action='index'))
+        """
+        Test for the controller's index action.
+        """
+        response = self.app.get(url(controller='portfolio', action='index'))
        # Test response...
        assert response.status_int == 200
        assert response.content_type == "text/html"
--- a/debianmemberportfolio/tests/functional/test_showformscripts.py
+++ b/debianmemberportfolio/tests/functional/test_showformscripts.py
@ -1,10 +1,11 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# Debian Member Portfolio Service DdportfolioController test
+# Debian Member Portfolio Service ShowformscriptsController test
+#
 # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of Debian Member Portfolio Service.
+# This file is part of the Debian Member Portfolio Service.
 #
 # Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
@ -19,12 +20,22 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from ddportfolioservice.tests import TestController, url
+"""
+This module defines test cases for the ShowformscriptsController.
+"""
+
+from debianmemberportfolio.tests import TestController, url


 class TestShowformscriptsController(TestController):
+    """
+    Test cases for ShowformscriptsController.
+    """

    def test_index(self):
+        """
+        Test for the controller's index action.
+        """
        response = self.app.get(
            url(controller='showformscripts', action='index'))
        # Test response...
--- a/debianmemberportfolio/tests/test_models.py
+++ b/debianmemberportfolio/tests/test_models.py
@ -1,22 +1,22 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service model tests
-# Copyright (c) 2009 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service model tests
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
--- a/debianmemberportfolio/websetup.py
+++ b/debianmemberportfolio/websetup.py
@ -1,39 +1,45 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service websetup
-# Copyright (c) 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Debian Member Portfolio Service websetup
 #
-# This file is part of DDPortfolio service.
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# DDPortfolio service is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
+# This file is part of the Debian Member Portfolio Service.
 #
-# DDPortfolio service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
+# Debian Member Portfolio Service is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+# General Public License for more details.
 #
-"""Setup the ddportfolioservice application"""
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+Setup the debianmemberportfolio application
+
+"""
+
 import logging

 from paste.deploy import appconfig
-from pylons import config
 import pylons.test

-from ddportfolioservice.config.environment import load_environment
+from debianmemberportfolio.config.environment import load_environment

 log = logging.getLogger(__name__)


 def setup_config(command, filename, section, vars):
-    """Place any commands to setup ddportfolioservice here"""
+    """
+    Place any commands to setup debianmemberportfolio here
+
+    """
    conf = appconfig('config:' + filename)

    if not pylons.test.pylonsapp:
--- a/development.ini
+++ b/development.ini
@ -1,5 +1,6 @@
 #
-# ddportfolioservice - Pylons development environment configuration
+# Debian Member Portfolio Service - Pylons development environment
+# configuration
 #
 # The %(here)s variable will be replaced with the parent directory of this file
 #
@ -16,12 +17,12 @@ host = 127.0.0.1
 port = 5000

 [app:main]
-use = egg:ddportfolioservice
+use = egg:debianmemberportfolio
 full_stack = true
 static_files = true

 cache_dir = %(here)s/data
-beaker.session.key = ddportfolioservice
+beaker.session.key = debianmemberportfolio
 beaker.session.secret = somesecret

 # If you'd like to fine-tune the individual locations of the cache data dirs
@ -38,7 +39,7 @@ beaker.session.secret = somesecret

 # Logging configuration
 [loggers]
-keys = root, routes, ddportfolioservice
+keys = root, routes, debianmemberportfolio

 [handlers]
 keys = console
@ -56,10 +57,10 @@ handlers =
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.

-[logger_ddportfolioservice]
+[logger_debianmemberportfolio]
 level = DEBUG
 handlers =
-qualname = ddportfolioservice
+qualname = debianmemberportfolio

 [handler_console]
 class = StreamHandler
--- a/docs/source/devdocs.rst
+++ b/docs/source/devdocs.rst
@ -22,12 +22,12 @@ To start working on the source code you need to have `git`_ installed::
 .. _git: http://www.git-scm.com/

 The canonical git repository for the Debian Member Portfolio Service is
-available at http://debianstuff.dittberner.info/git/ddportfolioservice.git. To
-get a clone of the source code you change to a directory of your choice and
+available at http://debianstuff.dittberner.info/git/debianmemberportfolio.git.
+To get a clone of the source code you change to a directory of your choice and
 invoke git clone::

  cd ~/src
-  git clone http://debianstuff.dittberner.info/git/ddportfolioservice.git
+  git clone http://debianstuff.dittberner.info/git/debianmemberportfolio.git

 You should use `virtualenv`_ to separate the development environment from your
 system wide Python installation. You can install virtualenv using::
@ -43,7 +43,7 @@ requirements using `pip <https://pypi.python.org/pypi/pip>`_::
  mkdir ~/.virtualenvs
  virtualenv --distribute ~/.virtualenvs/dmportfolio
  . ~/.virtualenvs/dmportfolio/bin/activate
-  cd ~/src/ddportfolioservice
+  cd ~/src/debianmemberportfolio
  pip install -r wheezyreq.pip

 .. note::
@ -63,12 +63,12 @@ development::
 Debian Member Portfolio Service needs the JQuery JavaScript library to function
 properly. The JQuery library is not included in the git clone and must be
 copied into the subdirectory
-:file:`ddportfolioservice/public/javascript/jquery`. On Debian systems you can
-install the package libjs-jquery and place a symlink to the directory
-:file:`/usr/share/javascript` into :file:`ddportfolioservice/public`: ::
+:file:`debianmemberportfolio/public/javascript/jquery`. On Debian systems you
+can install the package libjs-jquery and place a symlink to the directory
+:file:`/usr/share/javascript` into :file:`debianmemberportfolio/public`: ::

  sudo aptitude install libjs-jquery
-  ln -s /usr/share/javascript ddportfolioservice/public
+  ln -s /usr/share/javascript debianmemberportfolio/public

 Prepare for first startup
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@ -88,12 +88,12 @@ When you have both installed you can run::

  . ~/.virtualenvs/dmportfolio/bin/activate
  ./synckeyrings.sh
-  python ddportfolioservice/model/keyringanalyzer.py
+  python debianmemberportfolio/model/keyringanalyzer.py

 The first synchronizes the keyrings in :file:`$HOME/debian/keyring.debian.org`
 with files on the `keyring.debian.org <http://keyring.debian.org>`_ host. And
 the second generates a key/value database in
-:file:`ddportfolioservice/model/keyringcache` that is used by the code.
+:file:`debianmemberportfolio/model/keyringcache` that is used by the code.

 Run a development server
 ~~~~~~~~~~~~~~~~~~~~~~~~
@ -120,17 +120,17 @@ Add new URL
 ~~~~~~~~~~~

 Debian Member Portfolio Service uses a ini style configuration file
-:file:`ddportfolioservice/model/ddportfolio.ini` to configure the generated URL
+:file:`debianmemberportfolio/model/portfolio.ini` to configure the generated URL
 patterns. The actual URL generation is done in
-:py:class:`~ddportfolioservice.controllers.ddportfolio.DdportfolioController`
+:py:class:`~debianmemberportfolio.controllers.portfolio.DdportfolioController`
 in the
-:py:meth:`~ddportfolioservice.controllers.ddportfolio.DdportfolioController.urllist`
+:py:meth:`~debianmemberportfolio.controllers.portfolio.DdportfolioController.urllist`
 method.

 If you want to add a new URL type you have to add a line in
-:file:`ddportfolio.ini` and an entry in
-:py:class:`~ddportfolioservice.controllers.ddportfolio.DdportfolioController`'s
-:py:attr:`~ddportfolioservice.controllers.ddportfolio.DdportfolioController._LABELS`
+:file:`portfolio.ini` and an entry in
+:py:class:`~debianmemberportfolio.controllers.portfolio.DdportfolioController`'s
+:py:attr:`~debianmemberportfolio.controllers.portfolio.DdportfolioController._LABELS`
 dictionary. The top level dictionary keys correspond to sections in the ini
 file. The dictionary values are dictionaries themselves that contain a special
 key ``label`` that defines the label of the section in the output and keys for
@ -138,7 +138,7 @@ each entry to be rendered in that section. The values in these sub-dictionaries
 are strings marked for translation using the :py:func:`~pylons.i18n._` function from
 :py:mod:`pylons.i18n`.

-The patterns in :file:`ddportfolio.ini` can contain the following placeholders
+The patterns in :file:`portfolio.ini` can contain the following placeholders
 that are filled at runtime:

 ================== ========================================
@ -158,11 +158,10 @@ Placeholder        Replacement
 .. _alioth.debian.org: http://alioth.debian.org/

 The replacement of placeholders is performed in the
-:py:meth:`~ddportfolioservice.controllers.ddportfolio.DdportfolioController.urllist`
+:py:meth:`~debianmemberportfolio.controllers.portfolio.DdportfolioController.urllist`
 method. And uses data from the Debian keyring. Access to the pre-parsed keyring
 data is performed using the
-:py:func:`~ddportfolioservice.model.dddatabuilder.build_data` function of the
-module :py:mod:`ddportfolioservice.model.dddatabuilder`, which uses several
-helper functions from :py:mod:`ddportfolioservice.model.keyfinder` to access
-the key information.
-
+:py:func:`~debianmemberportfolio.model.dddatabuilder.build_data` function of
+the module :py:mod:`debianmemberportfolio.model.dddatabuilder`, which uses
+several helper functions from :py:mod:`debianmemberportfolio.model.keyfinder`
+to access the key information.
--- a/docs/source/sourcecode.rst
+++ b/docs/source/sourcecode.rst
@ -7,89 +7,89 @@ code of the Debian Member Portfolio Service.
 Controllers
 -----------

-.. automodule:: ddportfolioservice.controllers
+.. automodule:: debianmemberportfolio.controllers
   :members:

-ddportfolio controller
-~~~~~~~~~~~~~~~~~~~~~~
+portfolio controller
+~~~~~~~~~~~~~~~~~~~~

-.. automodule:: ddportfolioservice.controllers.ddportfolio
+.. automodule:: debianmemberportfolio.controllers.portfolio
   :members:

 error controller
 ~~~~~~~~~~~~~~~~

-.. automodule:: ddportfolioservice.controllers.error
+.. automodule:: debianmemberportfolio.controllers.error
   :members:

 showformscripts controller
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

-.. automodule:: ddportfolioservice.controllers.showformscripts
+.. automodule:: debianmemberportfolio.controllers.showformscripts
   :members:

 template controller
 ~~~~~~~~~~~~~~~~~~~

-.. automodule:: ddportfolioservice.controllers.template
+.. automodule:: debianmemberportfolio.controllers.template
   :members:

 Library code
 ------------

-.. automodule:: ddportfolioservice.lib
+.. automodule:: debianmemberportfolio.lib
   :members:

 app_globals
 ~~~~~~~~~~~

-.. automodule:: ddportfolioservice.lib.app_globals
+.. automodule:: debianmemberportfolio.lib.app_globals
   :members:

 base
 ~~~~

-.. automodule:: ddportfolioservice.lib.base
+.. automodule:: debianmemberportfolio.lib.base
   :members:

 helpers
 ~~~~~~~

-.. automodule:: ddportfolioservice.lib.helpers
+.. automodule:: debianmemberportfolio.lib.helpers
   :members:

 Model
 -----

-.. automodule:: ddportfolioservice.model
+.. automodule:: debianmemberportfolio.model
   :members:

 dddatabuilder
 ~~~~~~~~~~~~~

-.. automodule:: ddportfolioservice.model.dddatabuilder
+.. automodule:: debianmemberportfolio.model.dddatabuilder
   :members:

 form
 ~~~~

-.. automodule:: ddportfolioservice.model.form
+.. automodule:: debianmemberportfolio.model.form
   :members:

 keyfinder
 ~~~~~~~~~

-.. automodule:: ddportfolioservice.model.keyfinder
+.. automodule:: debianmemberportfolio.model.keyfinder
   :members:

 keyringanalyzer
 ~~~~~~~~~~~~~~~

-.. automodule:: ddportfolioservice.model.keyringanalyzer
+.. automodule:: debianmemberportfolio.model.keyringanalyzer
   :members:

 urlbuilder
 ~~~~~~~~~~

-.. automodule:: ddportfolioservice.model.urlbuilder
+.. automodule:: debianmemberportfolio.model.urlbuilder
   :members:
--- a/setup.cfg
+++ b/setup.cfg
@ -2,9 +2,6 @@
 tag_build = dev
 tag_svn_revision = true

-[easy_install]
-find_links = http://www.pylonshq.com/download/
-
 [build_sphinx]
 source-dir = docs/source
 build-dir = docs/build
@ -16,26 +13,28 @@ make-dirs=1

 [nosetests]
 with-pylons = test.ini
-cover-package = ddportfolioservice
+cover-package = debianmemberportfolio

 # Babel configuration
 [compile_catalog]
-domain = ddportfolioservice
-directory = ddportfolioservice/i18n
+domain = debianmemberportfolio
+directory = debianmemberportfolio/i18n
 statistics = true

 [extract_messages]
+charset = UTF-8
 add_comments = TRANSLATORS:
-output_file = ddportfolioservice/i18n/ddportfolioservice.pot
+output_file = debianmemberportfolio/i18n/debianmemberportfolio.pot
 width = 80
+msgid_bugs_address = jan@dittberner.info

 [init_catalog]
-domain = ddportfolioservice
-input_file = ddportfolioservice/i18n/ddportfolioservice.pot
-output_dir = ddportfolioservice/i18n
+domain = debianmemberportfolio
+input_file = debianmemberportfolio/i18n/debianmemberportfolio.pot
+output_dir = debianmemberportfolio/i18n

 [update_catalog]
-domain = ddportfolioservice
-input_file = ddportfolioservice/i18n/ddportfolioservice.pot
-output_dir = ddportfolioservice/i18n
+domain = debianmemberportfolio
+input_file = debianmemberportfolio/i18n/debianmemberportfolio.pot
+output_dir = debianmemberportfolio/i18n
 previous = true
--- a/setup.py
+++ b/setup.py
@ -1,17 +1,17 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# Debian Member Portfolio service setup
+# Debian Member Portfolio Service setup
 # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of the Debian Member Portfolio service.
+# This file is part of the Debian Member Portfolio Service.
 #
-# Debian Member Portfolio service is free software: you can redistribute it
+# Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the License,
 # or (at your option) any later version.
 #
-# Debian Member Portfolio service is distributed in the hope that it will be
+# Debian Member Portfolio Service is distributed in the hope that it will be
 # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
 # General Public License for more details.
@ -27,14 +27,13 @@ except ImportError:
    from setuptools import setup, find_packages

 setup(
-    name='ddportfolioservice',
-    version='0.3',
+    name='debianmemberportfolio',
+    version='0.3.1',
    description='service to create Debian Member Portfolio URLs',
-    long_description="""This is a service implementation that
-returns a set of personalized URLs as outlined in
-http://wiki.debian.org/DDPortfolio. It takes the Debian Member's
-full name and email address as input and returns a JSON formatted
-array of URLs.""",
+    long_description="""This is a service implementation that returns a set of
+    personalized URLs as outlined in http://wiki.debian.org/DDPortfolio. It
+    takes the Debian Member's full name and email address as input and returns
+    a JSON formatted array of URLs.""",
    # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
    classifiers=['Development Status :: 3 - Alpha',
                 'Environment :: Web Environment',
@ -45,21 +44,22 @@ array of URLs.""",
    keywords='Debian service JSON',
    author='Jan Dittberner',
    author_email='jan@dittberner.info',
-    url='http://debian-stuff.dittberner.info/ddportfolioservice',
+    url='http://debian-stuff.dittberner.info/debianmemberportfolio',
    license='AGPL-3.0+',
    install_requires=["Pylons>=0.10rc1", 'babel>=0.9.4'],
    packages=find_packages(exclude=['ez_setup']),
    include_package_data=True,
    test_suite='nose.collector',
-    package_data={'ddportfolioservice': ['*.ini', 'i18n/*/LC_MESSAGES/*.mo']},
-    message_extractors={'ddportfolioservice': [
+    package_data={'debianmemberportfolio':
+                  ['*.ini', 'i18n/*/LC_MESSAGES/*.mo']},
+    message_extractors={'debianmemberportfolio': [
            ('**.py', 'python', None),
            ('templates/**.mako', 'mako', None),
            ('public/**', 'ignore', None)]},
    zip_safe=False,
    entry_points="""
    [paste.app_factory]
-    main = ddportfolioservice.config.middleware:make_app
+    main = debianmemberportfolio.config.middleware:make_app

    [paste.app_install]
    main = pylons.util:PylonsInstaller
--- a/test.ini
+++ b/test.ini
@ -1,5 +1,5 @@
 #
-# ddportfolioservice - Pylons testing environment configuration
+# Debian Member Portfolio Service - Pylons testing environment configuration
 #
 # The %(here)s variable will be replaced with the parent directory of this file
 #