diff --git a/ChangeLog b/ChangeLog
index 675dbfe..3fe6db0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-09  Jan Dittberner  <jan@dittberner.info>
+	* add patch by Paul Wise to provide Salsa links
+	* Update translations
+
 2015-11-12  Jan Dittberner  <jan@dittberner.info>
 	* port to Python 3 and Flask
 
diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py
index d4c87fc..a309dcd 100644
--- a/debianmemberportfolio/forms.py
+++ b/debianmemberportfolio/forms.py
@@ -56,6 +56,9 @@ class DeveloperData(FlaskForm):
     ])
     username = StringField('username', validators=[Optional(), PlainText()])
     nonddemail = StringField('nonddemail', validators=[Optional(), Email()])
+    salsausername = StringField('salsausername', validators=[
+        Optional(), PlainText()
+    ])
     aliothusername = StringField('aliothusername', validators=[
         Optional(), PlainText()
     ])
diff --git a/debianmemberportfolio/model/portfolio.ini b/debianmemberportfolio/model/portfolio.ini
index 3a45504..921d5ba 100644
--- a/debianmemberportfolio/model/portfolio.ini
+++ b/debianmemberportfolio/model/portfolio.ini
@@ -78,6 +78,8 @@ db.pattern=https://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search
 db.optional=true
 webid.pattern=http://webid.debian.net/maintainers/%(username)s
 webid.optional=true
+salsa.pattern=https://salsa.debian.org/%(salsausername)s
+salsa.optional=true
 alioth.pattern=https://alioth.debian.org/users/%(aliothusername)s/
 alioth.optional=true
 wiki.pattern=https://wiki.debian.org/%(wikihomepage)s
diff --git a/debianmemberportfolio/model/urlbuilder.py b/debianmemberportfolio/model/urlbuilder.py
index d84e302..d107fc8 100644
--- a/debianmemberportfolio/model/urlbuilder.py
+++ b/debianmemberportfolio/model/urlbuilder.py
@@ -45,6 +45,7 @@ _FIELDNAMES_MAP = {
     'gpgfp': N_('GPG fingerprint'),
     'username': N_('Debian user name'),
     'nonddemail': N_('Non Debian email address'),
+    'salsausername': N_('Salsa user name'),
     'aliothusername': N_('Alioth user name'),
 }
 
diff --git a/debianmemberportfolio/templates/base.html b/debianmemberportfolio/templates/base.html
index b2a7903..9c7ff17 100644
--- a/debianmemberportfolio/templates/base.html
+++ b/debianmemberportfolio/templates/base.html
@@ -2,7 +2,7 @@
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 {# vim: ft=jinja
 Base template for XHTML templates.
-Copyright © 2009-2017 Jan Dittberner <jan@dittberner.info>
+Copyright © 2009-2018 Jan Dittberner <jan@dittberner.info>
 
 This file is part of the Debian Member Portfolio service.
 
@@ -38,7 +38,7 @@ with this program.  If not, see <https://www.gnu.org/licenses/>.
     <div id="footer">
       <img alt="{{ _('AGPL - Free Software') }}" id="agpllogo" src="{{ url_for('static', filename='images/agplv3-88x31.png') }}" width="88" height="31" />
       <p>{% trans browseurl='https://debianstuff.dittberner.info/gitweb/?p=debianmemberportfolio.git;a=summary', cloneurl='https://debianstuff.dittberner.info/git/debianmemberportfolio.git', weblateurl='https://hosted.weblate.org/projects/debian-member-portfolio-service/' %}The service is available under the terms of the <a href="https://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 }}" title="Gitweb repository browser URL">browse the source code</a> or clone it from <a href="{{ cloneurl }}" title="git clone URL">{{ cloneurl }}</a> using <a href="https://git-scm.com/">git</a>. If you want to translate this service to your language you can contribute at <a href="{{ weblateurl }}" title="Debian Member Portfolio Service at Weblate">Weblate</a>.{% endtrans %}</p>
-      <p>{{ _('Copyright © 2009-2017 Jan Dittberner') }}</p>
+      <p>{{ _('Copyright © 2009-2018 Jan Dittberner') }}</p>
     </div>
     <script type="text/javascript">
         var flattr_url = '{{ request.scheme }}://portfolio.debian.net/';
diff --git a/debianmemberportfolio/templates/showform.html b/debianmemberportfolio/templates/showform.html
index e0b40c0..ccef9f2 100644
--- a/debianmemberportfolio/templates/showform.html
+++ b/debianmemberportfolio/templates/showform.html
@@ -67,6 +67,13 @@ with this program.  If not, see <https://www.gnu.org/licenses/>.
       </label><br />
       {{ form.nonddemail }}
     </div>
+    <div id="salsausernamefield"{% if form.salsausername.errors %} class="witherrors"{% endif %}>
+      <label for="salsausername">{{ _('Salsa user name:') }}{% if form.salsausername.errors %}<br />
+        <span class="errormsg">{{ form.salsausername.errors|join(', ') }}</span>
+        {% endif %}
+      </label><br />
+      {{ form.salsausername }}
+    </div>
     <div id="aliothusernamefield"{% if form.aliothusername.errors %} class="witherrors"{% endif %}>
       <label for="aliothusername">{{ _('Alioth user name:') }}{% if form.aliothusername.errors %}<br />
         <span class="errormsg">{{ form.aliothusername.errors|join(', ') }}</span>
diff --git a/debianmemberportfolio/templates/showformscript.js b/debianmemberportfolio/templates/showformscript.js
index 74c0151..6adc302 100644
--- a/debianmemberportfolio/templates/showformscript.js
+++ b/debianmemberportfolio/templates/showformscript.js
@@ -19,13 +19,13 @@ with this program.  If not, see <https://www.gnu.org/licenses/>.
 #}
 var defaulthiddendivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
+    '#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
 var maskedfielddivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
+    '#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
 var allfielddivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
+    '#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
 
 function updateFields(data, textStatus) {
     if (data.type == 2) { // DD
@@ -34,6 +34,7 @@ function updateFields(data, textStatus) {
         $('#username').prop('value', data.username).prop(
             'readonly', 'readonly');
         $('#nonddemail').prop('value', data.email).focus();
+        $('#salsausername').prop('value', data.username);
         $('#aliothusername').prop('value', data.username);
         $('#wikihomepage').prop('value', data.wikihomepage);
 
@@ -41,6 +42,7 @@ function updateFields(data, textStatus) {
         $('#gpgfpfield').show();
         $('#usernamefield').show();
         $('#nonddemailfield').show();
+        $('#salsausernamefield').show();
         $('#aliothusernamefield').show();
         $('#wikihomepagefield').show();
         $('#forumsidfield').show();
@@ -57,11 +59,12 @@ function updateFields(data, textStatus) {
         $('#gpgfpfield').show();
         $('#usernamefield').hide();
         $('#nonddemailfield').hide();
+        $('#salsausernamefield').show();
         $('#aliothusernamefield').show();
         $('#wikihomepagefield').show();
         $('#forumsidfield').show();
 
-        $('#aliothusername').focus().select();
+        $('#salsausername').focus().select();
     } else {
         $('#nonddemail').prop('value', data.email);
         $('#name').removeAttr('readonly');
@@ -72,6 +75,7 @@ function updateFields(data, textStatus) {
         $('#gpgfpfield').hide();
         $('#nonddemailfield').hide();
         $('#namefield').show();
+        $('#salsausernamefield').show();
         $('#aliothusernamefield').show();
         $('#wikihomepagefield').show();
         $('#forumsidfield').show();
diff --git a/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po
index da54890..0554e74 100644
--- a/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po
+++ b/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po
@@ -9,23 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service 0.3.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2017-09-10 10:49+0200\n"
-"PO-Revision-Date: 2017-02-17 11:19+0000\n"
-"Last-Translator: Jan Dittberner <jandd@debian.org>\n"
+"POT-Creation-Date: 2018-02-09 10:14+0100\n"
+"PO-Revision-Date: 2018-02-09 10:29+0100\n"
+"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language: de\n"
 "Language-Team: German <https://hosted.weblate.org/projects/debian-member-"
 "portfolio-service/translations/de/>\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-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.0\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "JSON"
 msgstr "JSON"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "HTML"
 msgstr "HTML"
 
@@ -52,13 +53,12 @@ msgstr "Fehler"
 #: debianmemberportfolio/views.py:47
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org"
-"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"https://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=\"https://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(Anmerkung: Co-Maintainer werden nicht aufgeführt, siehe <a href=\"https://"
+"bugs.debian.org/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 
 #: debianmemberportfolio/views.py:51
 msgid "bugs reported"
@@ -113,8 +113,7 @@ msgstr "Lintian-Berichte"
 #: debianmemberportfolio/views.py:68
 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\")"
 
 #: debianmemberportfolio/views.py:70
 msgid "piuparts"
@@ -156,7 +155,7 @@ msgstr "people.d.o"
 msgid "oldpeople"
 msgstr "oldpeople"
 
-#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:92
+#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:93
 msgid "Alioth"
 msgstr "Alioth"
 
@@ -180,83 +179,87 @@ msgstr "DB-Informationen per HTTP"
 msgid "FOAF profile"
 msgstr "FOAF-Profil"
 
-#: debianmemberportfolio/views.py:93
+#: debianmemberportfolio/views.py:92
+msgid "Salsa"
+msgstr "Salsa"
+
+#: debianmemberportfolio/views.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: debianmemberportfolio/views.py:94
+#: debianmemberportfolio/views.py:95
 msgid "Forum"
 msgstr "Forum"
 
-#: debianmemberportfolio/views.py:97
+#: debianmemberportfolio/views.py:98
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
-#: debianmemberportfolio/views.py:98
+#: debianmemberportfolio/views.py:99
 msgid "debtags"
 msgstr "debtags"
 
-#: debianmemberportfolio/views.py:99
+#: debianmemberportfolio/views.py:100
 msgid "Planet Debian (name)"
 msgstr "Planet Debian (Name)"
 
-#: debianmemberportfolio/views.py:100
+#: debianmemberportfolio/views.py:101
 msgid "Planet Debian (username)"
 msgstr "Planet Debian (Benutzername)"
 
-#: debianmemberportfolio/views.py:101
+#: debianmemberportfolio/views.py:102
 msgid "links"
 msgstr "Links"
 
-#: debianmemberportfolio/views.py:102
+#: debianmemberportfolio/views.py:103
 msgid "Debian website"
 msgstr "Debian Webseite"
 
-#: debianmemberportfolio/views.py:103
+#: debianmemberportfolio/views.py:104
 msgid "Debian search"
 msgstr "Debian-Suche"
 
-#: debianmemberportfolio/views.py:104
+#: debianmemberportfolio/views.py:105
 msgid "GPG public key via finger"
 msgstr "öffentlicher GPG-Schlüssel per finger"
 
-#: debianmemberportfolio/views.py:105
+#: debianmemberportfolio/views.py:106
 msgid "GPG public key via HTTP"
 msgstr "öffentlicher GPG-Schlüssel per HTTP"
 
-#: debianmemberportfolio/views.py:106
+#: debianmemberportfolio/views.py:107
 msgid "NM, AM participation"
 msgstr "NM-, AM-Mitwirkung"
 
-#: debianmemberportfolio/views.py:107
+#: debianmemberportfolio/views.py:108
 msgid "Contribution information"
 msgstr "Debian Contributor-Informationen"
 
-#: debianmemberportfolio/views.py:110
+#: debianmemberportfolio/views.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Per ssh erreichbare Informationen (für Debian Mitglieder)"
 
-#: debianmemberportfolio/views.py:111
+#: debianmemberportfolio/views.py:112
 msgid "owned debian.net domains"
 msgstr "Besitz von debian.net-Domains"
 
-#: debianmemberportfolio/views.py:112
+#: debianmemberportfolio/views.py:113
 msgid ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"database information"
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+"information"
 msgstr ""
-"Informationen in der <a "
-"href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
+"Informationen in der <a href=\"https://wiki.debian.org/qa.debian.org/MIATeam"
+"\">MIA</a>-Datenbank"
 
-#: debianmemberportfolio/views.py:114
+#: debianmemberportfolio/views.py:115
 msgid "Group membership information"
 msgstr "Information über Gruppenmitgliedschaften"
 
-#: debianmemberportfolio/views.py:117
+#: debianmemberportfolio/views.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: debianmemberportfolio/views.py:118
+#: debianmemberportfolio/views.py:119
 msgid "Available patches from Ubuntu"
 msgstr "Verfügbare Patches aus Ubuntu"
 
@@ -281,11 +284,15 @@ msgid "Non Debian email address"
 msgstr "Nicht-Debian-E-Mailadresse"
 
 #: debianmemberportfolio/model/urlbuilder.py:48
+msgid "Salsa user name"
+msgstr "Salsa-Benutzername"
+
+#: debianmemberportfolio/model/urlbuilder.py:49
 msgid "Alioth user name"
 msgstr "Alioth-Benutzername"
 
-#: debianmemberportfolio/model/urlbuilder.py:109
-#: debianmemberportfolio/model/urlbuilder.py:113
+#: debianmemberportfolio/model/urlbuilder.py:110
+#: debianmemberportfolio/model/urlbuilder.py:114
 #, python-format
 msgid "Missing input: %s"
 msgstr "Fehlende Eingabe: %s"
@@ -301,16 +308,15 @@ msgstr "Debian-Logo"
 
 #: debianmemberportfolio/templates/base.html:32
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a "
-"href=\"https://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=\"https://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."
 
 #: debianmemberportfolio/templates/base.html:39
 msgid "AGPL - Free Software"
@@ -319,32 +325,30 @@ msgstr "AGPL - Freie Software"
 #: debianmemberportfolio/templates/base.html:40
 #, python-format
 msgid ""
-"The service is available under the terms of the <a "
-"href=\"https://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=\"https://git-"
-"scm.com/\">git</a>. If you want to translate this service to your "
-"language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
+"The service is available under the terms of the <a href=\"https://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="
+"\"https://git-scm.com/\">git</a>. If you want to translate this service to "
+"your language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
 "Member Portfolio Service at Weblate\">Weblate</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=\"%(weblateurl)s\" title=\"Debian Member Portfolio"
-" Service bei Weblate\">Weblate</a> dazu beitragen."
+"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=\"%(weblateurl)s\" title=\"Debian Member "
+"Portfolio Service bei Weblate\">Weblate</a> dazu beitragen."
 
 #: debianmemberportfolio/templates/base.html:41
-msgid "Copyright © 2009-2017 Jan Dittberner"
-msgstr "Copyright © 2009-2017 Jan Dittberner"
+msgid "Copyright © 2009-2018 Jan Dittberner"
+msgstr "Copyright © 2009-2018 Jan Dittberner"
 
 #: debianmemberportfolio/templates/showform.html:22
 msgid "Enter your personal information"
@@ -379,22 +383,26 @@ msgid "Non Debian email address:"
 msgstr "Nicht-Debian-E-Mailadresse:"
 
 #: debianmemberportfolio/templates/showform.html:71
+msgid "Salsa user name:"
+msgstr "Salsa-Benutzername:"
+
+#: debianmemberportfolio/templates/showform.html:78
 msgid "Alioth user name:"
 msgstr "Alioth-Benutzername:"
 
-#: debianmemberportfolio/templates/showform.html:78
+#: debianmemberportfolio/templates/showform.html:85
 msgid "Wiki user name:"
 msgstr "Wiki-Benutzername:"
 
-#: debianmemberportfolio/templates/showform.html:85
+#: debianmemberportfolio/templates/showform.html:92
 msgid "Forum user id:"
 msgstr "Forumsbenutzernummer:"
 
-#: debianmemberportfolio/templates/showform.html:92
+#: debianmemberportfolio/templates/showform.html:99
 msgid "Output format:"
 msgstr "Ausgabeformat:"
 
-#: debianmemberportfolio/templates/showform.html:99
+#: debianmemberportfolio/templates/showform.html:106
 msgid "Build Debian Member Portfolio URLs"
 msgstr "Debian-Mitgliedsportfolio-URLs bauen"
 
@@ -421,4 +429,3 @@ msgstr "Fehler bei der URL-Erzeugung:"
 #: debianmemberportfolio/templates/showurls.html:59
 msgid "Restart"
 msgstr "Neu beginnen"
-
diff --git a/debianmemberportfolio/translations/fr/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/fr/LC_MESSAGES/messages.po
index d7ad2d1..197d316 100644
--- a/debianmemberportfolio/translations/fr/LC_MESSAGES/messages.po
+++ b/debianmemberportfolio/translations/fr/LC_MESSAGES/messages.po
@@ -9,23 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-09-10 10:49+0200\n"
-"PO-Revision-Date: 2014-01-11 01:29+0100\n"
+"POT-Creation-Date: 2018-02-09 10:14+0100\n"
+"PO-Revision-Date: 2018-02-09 10:29+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language: fr\n"
-"Language-Team: French "
-"(https://www.transifex.com/projects/p/debportfolioservice/language/fr/)\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Language-Team: French (https://www.transifex.com/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-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.0\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "JSON"
 msgstr "JSON"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "HTML"
 msgstr "HTML"
 
@@ -52,12 +53,11 @@ msgstr "Bogues"
 #: debianmemberportfolio/views.py:47
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org"
-"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"https://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=\"https://bugs.debian.org/cgi-"
+"(note : co-responsables non listés, voir <a href=\"https://bugs.debian.org/cgi-"
 "bin/bugreport.cgi?bug=430986\">#430986</a>)"
 
 #: debianmemberportfolio/views.py:51
@@ -71,8 +71,8 @@ msgstr "Tags utilisateur"
 #: debianmemberportfolio/views.py:53
 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)"
+"Tous les messages (c-à-d, recherche plein texte sur le nom du développeur dans "
+"tous les journaux de bogue)"
 
 #: debianmemberportfolio/views.py:55
 msgid "<a href=\"https://wiki.debian.org/WNPP\">WNPP</a>"
@@ -154,7 +154,7 @@ msgstr "people.d.o"
 msgid "oldpeople"
 msgstr "oldpeople"
 
-#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:92
+#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:93
 msgid "Alioth"
 msgstr "Alioth"
 
@@ -178,85 +178,89 @@ msgstr "BD d'informations via HTTP"
 msgid "FOAF profile"
 msgstr ""
 
-#: debianmemberportfolio/views.py:93
+#: debianmemberportfolio/views.py:92
+msgid "Salsa"
+msgstr "Salsa"
+
+#: debianmemberportfolio/views.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: debianmemberportfolio/views.py:94
+#: debianmemberportfolio/views.py:95
 msgid "Forum"
 msgstr "Forum"
 
-#: debianmemberportfolio/views.py:97
+#: debianmemberportfolio/views.py:98
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: debianmemberportfolio/views.py:98
+#: debianmemberportfolio/views.py:99
 msgid "debtags"
 msgstr "Debtags"
 
-#: debianmemberportfolio/views.py:99
+#: debianmemberportfolio/views.py:100
 msgid "Planet Debian (name)"
 msgstr ""
 
-#: debianmemberportfolio/views.py:100
+#: debianmemberportfolio/views.py:101
 #, fuzzy
 msgid "Planet Debian (username)"
 msgstr "Nom d'utilisateur Debian"
 
-#: debianmemberportfolio/views.py:101
+#: debianmemberportfolio/views.py:102
 msgid "links"
 msgstr "Liens"
 
-#: debianmemberportfolio/views.py:102
+#: debianmemberportfolio/views.py:103
 msgid "Debian website"
 msgstr "Site web de Debian"
 
-#: debianmemberportfolio/views.py:103
+#: debianmemberportfolio/views.py:104
 msgid "Debian search"
 msgstr "Recherche Debian"
 
-#: debianmemberportfolio/views.py:104
+#: debianmemberportfolio/views.py:105
 msgid "GPG public key via finger"
 msgstr "Clef GPG publique via finger"
 
-#: debianmemberportfolio/views.py:105
+#: debianmemberportfolio/views.py:106
 msgid "GPG public key via HTTP"
 msgstr "Clef GPG publique via HTTP"
 
-#: debianmemberportfolio/views.py:106
+#: debianmemberportfolio/views.py:107
 msgid "NM, AM participation"
 msgstr "NM, AM participation"
 
-#: debianmemberportfolio/views.py:107
+#: debianmemberportfolio/views.py:108
 #, fuzzy
 msgid "Contribution information"
 msgstr "Saisissez vos informations personnelles"
 
-#: debianmemberportfolio/views.py:110
+#: debianmemberportfolio/views.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informations accessibles via ssh (pour les membres de Debian)"
 
-#: debianmemberportfolio/views.py:111
+#: debianmemberportfolio/views.py:112
 msgid "owned debian.net domains"
 msgstr "Propriété des domaines debian.net"
 
-#: debianmemberportfolio/views.py:112
+#: debianmemberportfolio/views.py:113
 msgid ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"database information"
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+"information"
 msgstr ""
-"Informations de la base de données <a "
-"href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>"
+"Informations de la base de données <a href=\"https://wiki.debian.org/qa.debian."
+"org/MIATeam\">MIA</a>"
 
-#: debianmemberportfolio/views.py:114
+#: debianmemberportfolio/views.py:115
 msgid "Group membership information"
 msgstr "Information sur l'adhésion de groupe"
 
-#: debianmemberportfolio/views.py:117
+#: debianmemberportfolio/views.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: debianmemberportfolio/views.py:118
+#: debianmemberportfolio/views.py:119
 msgid "Available patches from Ubuntu"
 msgstr "Patchs disponibles pour Ubuntu"
 
@@ -281,11 +285,15 @@ msgid "Non Debian email address"
 msgstr "Courriel hors Debian"
 
 #: debianmemberportfolio/model/urlbuilder.py:48
+msgid "Salsa user name"
+msgstr "Nom d'utilisateur Salsa"
+
+#: debianmemberportfolio/model/urlbuilder.py:49
 msgid "Alioth user name"
 msgstr "Nom d'utilisateur Alioth"
 
-#: debianmemberportfolio/model/urlbuilder.py:109
-#: debianmemberportfolio/model/urlbuilder.py:113
+#: debianmemberportfolio/model/urlbuilder.py:110
+#: debianmemberportfolio/model/urlbuilder.py:114
 #, python-format
 msgid "Missing input: %s"
 msgstr "Entrée manquante : %s"
@@ -301,16 +309,15 @@ msgstr "Logo Debian"
 
 #: debianmemberportfolio/templates/base.html:32
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a "
-"href=\"https://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=\"https://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=\"https://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=\"https://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."
 
 #: debianmemberportfolio/templates/base.html:39
 msgid "AGPL - Free Software"
@@ -319,30 +326,27 @@ msgstr "AGPL - Logiciel libre"
 #: debianmemberportfolio/templates/base.html:40
 #, fuzzy, python-format
 msgid ""
-"The service is available under the terms of the <a "
-"href=\"https://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=\"https://git-"
-"scm.com/\">git</a>. If you want to translate this service to your "
-"language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
-"Member Portfolio Service at Weblate\">Weblate</a>."
+"The service is available under the terms of the <a href=\"https://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=\"https://git-scm.com/"
+"\">git</a>. If you want to translate this service to your language you can "
+"contribute at <a href=\"%(weblateurl)s\" title=\"Debian Member Portfolio Service "
+"at Weblate\">Weblate</a>."
 msgstr ""
-"Ce service est disponible sous les termes de la licence <a "
-"href=\"https://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=\"https://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>."
 
 #: debianmemberportfolio/templates/base.html:41
-#, fuzzy
-msgid "Copyright © 2009-2017 Jan Dittberner"
-msgstr "Copyright © 2009-2014 Jan Dittberner"
+msgid "Copyright © 2009-2018 Jan Dittberner"
+msgstr "Copyright © 2009-2018 Jan Dittberner"
 
 #: debianmemberportfolio/templates/showform.html:22
 msgid "Enter your personal information"
@@ -377,22 +381,26 @@ msgid "Non Debian email address:"
 msgstr "Courriel hors Debian :"
 
 #: debianmemberportfolio/templates/showform.html:71
+msgid "Salsa user name:"
+msgstr "Nom d'utilisateur Salsa :"
+
+#: debianmemberportfolio/templates/showform.html:78
 msgid "Alioth user name:"
 msgstr "Nom d'utilisateur Alioth :"
 
-#: debianmemberportfolio/templates/showform.html:78
+#: debianmemberportfolio/templates/showform.html:85
 msgid "Wiki user name:"
 msgstr "Nom d'utilisateur Wiki :"
 
-#: debianmemberportfolio/templates/showform.html:85
+#: debianmemberportfolio/templates/showform.html:92
 msgid "Forum user id:"
 msgstr "Numéro d'utilisateur Forum :"
 
-#: debianmemberportfolio/templates/showform.html:92
+#: debianmemberportfolio/templates/showform.html:99
 msgid "Output format:"
 msgstr "Format de sortie :"
 
-#: debianmemberportfolio/templates/showform.html:99
+#: debianmemberportfolio/templates/showform.html:106
 msgid "Build Debian Member Portfolio URLs"
 msgstr "Construire les URLs du portefeuille du membre de Debian"
 
@@ -420,4 +428,3 @@ msgstr "Erreur durant la création de l'URL :"
 #: debianmemberportfolio/templates/showurls.html:59
 msgid "Restart"
 msgstr "Recommencer"
-
diff --git a/debianmemberportfolio/translations/id/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/id/LC_MESSAGES/messages.po
index cf0fc5e..587f9f9 100644
--- a/debianmemberportfolio/translations/id/LC_MESSAGES/messages.po
+++ b/debianmemberportfolio/translations/id/LC_MESSAGES/messages.po
@@ -9,23 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service\n"
 "Report-Msgid-Bugs-To: atoz.chevara@yahoo.com\n"
-"POT-Creation-Date: 2017-09-10 10:49+0200\n"
-"PO-Revision-Date: 2016-08-27 20:15+0000\n"
-"Last-Translator: Izharul Haq <atoz.chevara.2013@gmail.com>\n"
+"POT-Creation-Date: 2018-02-09 10:14+0100\n"
+"PO-Revision-Date: 2018-02-09 10:29+0100\n"
+"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language: id\n"
-"Language-Team: Indonesian <https://hosted.weblate.org/projects/debian-"
-"member-portfolio-service/translations/id/>\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language-Team: Indonesian <https://hosted.weblate.org/projects/debian-member-"
+"portfolio-service/translations/id/>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.0\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "JSON"
 msgstr "JSON"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "HTML"
 msgstr "HTML"
 
@@ -52,13 +53,12 @@ msgstr "Kutu"
 #: debianmemberportfolio/views.py:47
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org"
-"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org/cgi-"
+"bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "bugs diterima\n"
-"(catatan: co-maintainers tidak tercantum, lihat <a "
-"href=\"https://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(catatan: co-maintainers tidak tercantum, lihat <a href=\"https://bugs.debian."
+"org/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 
 #: debianmemberportfolio/views.py:51
 msgid "bugs reported"
@@ -71,8 +71,8 @@ msgstr "label pengguna"
 #: debianmemberportfolio/views.py:53
 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)"
 
 #: debianmemberportfolio/views.py:55
 msgid "<a href=\"https://wiki.debian.org/WNPP\">WNPP</a>"
@@ -154,7 +154,7 @@ msgstr "people.d.o"
 msgid "oldpeople"
 msgstr "oldpeople"
 
-#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:92
+#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:93
 msgid "Alioth"
 msgstr "Alioth"
 
@@ -178,85 +178,89 @@ msgstr "informasi DB melalui HTTP"
 msgid "FOAF profile"
 msgstr "profil FOAF"
 
-#: debianmemberportfolio/views.py:93
+#: debianmemberportfolio/views.py:92
+msgid "Salsa"
+msgstr "Salsa"
+
+#: debianmemberportfolio/views.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: debianmemberportfolio/views.py:94
+#: debianmemberportfolio/views.py:95
 msgid "Forum"
 msgstr "Forum"
 
-#: debianmemberportfolio/views.py:97
+#: debianmemberportfolio/views.py:98
 msgid "Miscellaneous"
 msgstr "Lain-Lain"
 
-#: debianmemberportfolio/views.py:98
+#: debianmemberportfolio/views.py:99
 msgid "debtags"
 msgstr "debtags"
 
-#: debianmemberportfolio/views.py:99
+#: debianmemberportfolio/views.py:100
 msgid "Planet Debian (name)"
 msgstr "Planet Debian (nama)"
 
-#: debianmemberportfolio/views.py:100
+#: debianmemberportfolio/views.py:101
 #, fuzzy
 msgid "Planet Debian (username)"
 msgstr "Planet Debian (nama pengguna)"
 
-#: debianmemberportfolio/views.py:101
+#: debianmemberportfolio/views.py:102
 msgid "links"
 msgstr "tautan"
 
-#: debianmemberportfolio/views.py:102
+#: debianmemberportfolio/views.py:103
 msgid "Debian website"
 msgstr "website Debian"
 
-#: debianmemberportfolio/views.py:103
+#: debianmemberportfolio/views.py:104
 msgid "Debian search"
 msgstr "pencarian Debian"
 
-#: debianmemberportfolio/views.py:104
+#: debianmemberportfolio/views.py:105
 msgid "GPG public key via finger"
 msgstr "kunci publik GPG melalui finger"
 
-#: debianmemberportfolio/views.py:105
+#: debianmemberportfolio/views.py:106
 msgid "GPG public key via HTTP"
 msgstr "kunci publik GPG melalui HTTP"
 
-#: debianmemberportfolio/views.py:106
+#: debianmemberportfolio/views.py:107
 msgid "NM, AM participation"
 msgstr "partisipasi NM, AM"
 
-#: debianmemberportfolio/views.py:107
+#: debianmemberportfolio/views.py:108
 #, fuzzy
 msgid "Contribution information"
 msgstr "Informasi kontribusi"
 
-#: debianmemberportfolio/views.py:110
+#: debianmemberportfolio/views.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informasi dicapai melalui ssh (untuk Anggota Debian)"
 
-#: debianmemberportfolio/views.py:111
+#: debianmemberportfolio/views.py:112
 msgid "owned debian.net domains"
 msgstr "domain debian.net sendiri"
 
-#: debianmemberportfolio/views.py:112
+#: debianmemberportfolio/views.py:113
 msgid ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"database information"
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+"information"
 msgstr ""
-"informasi database <a "
-"href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>"
+"informasi database <a href=\"https://wiki.debian.org/qa.debian.org/MIATeam"
+"\">MIA</a>"
 
-#: debianmemberportfolio/views.py:114
+#: debianmemberportfolio/views.py:115
 msgid "Group membership information"
 msgstr "Informasi keanggotaan kelompok"
 
-#: debianmemberportfolio/views.py:117
+#: debianmemberportfolio/views.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: debianmemberportfolio/views.py:118
+#: debianmemberportfolio/views.py:119
 msgid "Available patches from Ubuntu"
 msgstr "Tambalan dari Ubuntu yang tersedia"
 
@@ -281,11 +285,16 @@ msgid "Non Debian email address"
 msgstr "Selain alamat email Debian"
 
 #: debianmemberportfolio/model/urlbuilder.py:48
+#, fuzzy
+msgid "Salsa user name"
+msgstr "nama pengguna Salsa"
+
+#: debianmemberportfolio/model/urlbuilder.py:49
 msgid "Alioth user name"
 msgstr "nama pengguna Alioth"
 
-#: debianmemberportfolio/model/urlbuilder.py:109
-#: debianmemberportfolio/model/urlbuilder.py:113
+#: debianmemberportfolio/model/urlbuilder.py:110
+#: debianmemberportfolio/model/urlbuilder.py:114
 #, python-format
 msgid "Missing input: %s"
 msgstr "Tidak ada masukan: %s"
@@ -301,16 +310,15 @@ msgstr "Logo Debian"
 
 #: debianmemberportfolio/templates/base.html:32
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a "
-"href=\"https://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=\"https://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=\"https://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=\"https://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."
 
 #: debianmemberportfolio/templates/base.html:39
 msgid "AGPL - Free Software"
@@ -319,32 +327,30 @@ msgstr "AGPL - Free Software"
 #: debianmemberportfolio/templates/base.html:40
 #, fuzzy, python-format
 msgid ""
-"The service is available under the terms of the <a "
-"href=\"https://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=\"https://git-"
-"scm.com/\">git</a>. If you want to translate this service to your "
-"language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
+"The service is available under the terms of the <a href=\"https://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="
+"\"https://git-scm.com/\">git</a>. If you want to translate this service to "
+"your language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
 "Member Portfolio Service at Weblate\">Weblate</a>."
 msgstr ""
-"Layanan ini tersedia di bawah persyaratan <a "
-"href=\"https://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>.\n"
-"Jika anda ingin menerjemahkan layanan ini ke dalam bahasa anda, anda "
-"dapat berkontribusi di <a href=\"%(weblateurl)s\" title=\"Debian Member"
-" Portfolio Service at Weblate\">Weblate</a>."
+"Layanan ini tersedia di bawah persyaratan <a href=\"https://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>.\n"
+"Jika anda ingin menerjemahkan layanan ini ke dalam bahasa anda, anda dapat "
+"berkontribusi di <a href=\"%(weblateurl)s\" title=\"Debian Member Portfolio "
+"Service at Weblate\">Weblate</a>."
 
 #: debianmemberportfolio/templates/base.html:41
-msgid "Copyright © 2009-2017 Jan Dittberner"
-msgstr "Hak Cipta © 2009-2017 Jan Dittberner"
+msgid "Copyright © 2009-2018 Jan Dittberner"
+msgstr "Hak Cipta © 2009-2018 Jan Dittberner"
 
 #: debianmemberportfolio/templates/showform.html:22
 msgid "Enter your personal information"
@@ -379,22 +385,27 @@ msgid "Non Debian email address:"
 msgstr "Selain alamat email Debian:"
 
 #: debianmemberportfolio/templates/showform.html:71
+#, fuzzy
+msgid "Salsa user name:"
+msgstr "Nama pengguna Salsa:"
+
+#: debianmemberportfolio/templates/showform.html:78
 msgid "Alioth user name:"
 msgstr "Nama pengguna Alioth:"
 
-#: debianmemberportfolio/templates/showform.html:78
+#: debianmemberportfolio/templates/showform.html:85
 msgid "Wiki user name:"
 msgstr "Nama pengguna Wiki:"
 
-#: debianmemberportfolio/templates/showform.html:85
+#: debianmemberportfolio/templates/showform.html:92
 msgid "Forum user id:"
 msgstr "ID pengguna Forum:"
 
-#: debianmemberportfolio/templates/showform.html:92
+#: debianmemberportfolio/templates/showform.html:99
 msgid "Output format:"
 msgstr "Format Keluaran:"
 
-#: debianmemberportfolio/templates/showform.html:99
+#: debianmemberportfolio/templates/showform.html:106
 msgid "Build Debian Member Portfolio URLs"
 msgstr "Membangun URL Portfolio Anggota Debian"
 
@@ -422,4 +433,3 @@ msgstr "Kesalahan selama pembuatan URL:"
 #: debianmemberportfolio/templates/showurls.html:59
 msgid "Restart"
 msgstr "Mulai ulang"
-
diff --git a/debianmemberportfolio/translations/nb/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/nb/LC_MESSAGES/messages.po
index 8c0ea20..64dda95 100644
--- a/debianmemberportfolio/translations/nb/LC_MESSAGES/messages.po
+++ b/debianmemberportfolio/translations/nb/LC_MESSAGES/messages.po
@@ -9,23 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service 0.3.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2017-09-10 10:49+0200\n"
-"PO-Revision-Date: 2017-09-10 10:52+0200\n"
-"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
+"POT-Creation-Date: 2018-02-09 10:14+0100\n"
+"PO-Revision-Date: 2018-02-09 10:28+0100\n"
+"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language: nb\n"
-"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects"
-"/debian-member-portfolio-service/translations/nb/>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
+"member-portfolio-service/translations/nb/>\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.0\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "JSON"
 msgstr "JSON"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "HTML"
 msgstr "HTML"
 
@@ -52,12 +53,12 @@ msgstr "Feil"
 #: debianmemberportfolio/views.py:47
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org"
-"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org/cgi-"
+"bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "feilrapporter mottatt\n"
-"(merk: med-vedlikeholdere er ikke listet opp, se <a "
-"href=\"https://bugs.debian.org/430986\">#430986</a>)"
+"(merk: med-vedlikeholdere er ikke listet opp, se <a href=\"https://bugs."
+"debian.org/430986\">#430986</a>)"
 
 #: debianmemberportfolio/views.py:51
 msgid "bugs reported"
@@ -83,7 +84,7 @@ msgstr "korrespondent for feilrapporter"
 
 #: debianmemberportfolio/views.py:57
 msgid "one year open bug history graph"
-msgstr ""
+msgstr "Graf over feilrapporter som har vært åpen mer enn et år"
 
 #: debianmemberportfolio/views.py:60
 msgid "Build"
@@ -103,7 +104,7 @@ msgstr "Kvalitetssikring"
 
 #: debianmemberportfolio/views.py:66
 msgid "maintainer dashboard"
-msgstr ""
+msgstr "Vedlikeholdersoversikt"
 
 #: debianmemberportfolio/views.py:67
 msgid "lintian reports"
@@ -111,7 +112,7 @@ msgstr "lintian-rapporter"
 
 #: debianmemberportfolio/views.py:68
 msgid "full lintian reports (i.e. including \"info\"-level messages)"
-msgstr ""
+msgstr "Komplette lintian-rapporter (dvs. også meldinger med nivå «info»)"
 
 #: debianmemberportfolio/views.py:70
 msgid "piuparts"
@@ -119,11 +120,11 @@ msgstr "piuparts"
 
 #: debianmemberportfolio/views.py:71
 msgid "Debian patch tracking system"
-msgstr ""
+msgstr "Debians sporingssystem for patcher"
 
 #: debianmemberportfolio/views.py:72
 msgid "Debian Url ChecKer"
-msgstr ""
+msgstr "Debian URL-sjekker"
 
 #: debianmemberportfolio/views.py:75
 msgid "Mailing Lists"
@@ -151,9 +152,9 @@ msgstr "people.d.o"
 
 #: debianmemberportfolio/views.py:83
 msgid "oldpeople"
-msgstr ""
+msgstr "oldpeople"
 
-#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:92
+#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:93
 msgid "Alioth"
 msgstr "Alioth"
 
@@ -177,83 +178,89 @@ msgstr "DB-informasjon via HTTP"
 msgid "FOAF profile"
 msgstr "FOAF-profil"
 
-#: debianmemberportfolio/views.py:93
+#: debianmemberportfolio/views.py:92
+msgid "Salsa"
+msgstr "Salsa"
+
+#: debianmemberportfolio/views.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: debianmemberportfolio/views.py:94
+#: debianmemberportfolio/views.py:95
 msgid "Forum"
 msgstr "Forum"
 
-#: debianmemberportfolio/views.py:97
+#: debianmemberportfolio/views.py:98
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: debianmemberportfolio/views.py:98
+#: debianmemberportfolio/views.py:99
 msgid "debtags"
 msgstr "debtags"
 
-#: debianmemberportfolio/views.py:99
-msgid "Planet Debian (name)"
-msgstr ""
-
 #: debianmemberportfolio/views.py:100
-msgid "Planet Debian (username)"
-msgstr ""
+msgid "Planet Debian (name)"
+msgstr "Planet Debian (navn)"
 
 #: debianmemberportfolio/views.py:101
+msgid "Planet Debian (username)"
+msgstr "Planet Debian (brukernavn)"
+
+#: debianmemberportfolio/views.py:102
 msgid "links"
 msgstr "lenker"
 
-#: debianmemberportfolio/views.py:102
-msgid "Debian website"
-msgstr ""
-
 #: debianmemberportfolio/views.py:103
+msgid "Debian website"
+msgstr "Debian-nettsiden"
+
+#: debianmemberportfolio/views.py:104
 msgid "Debian search"
 msgstr "Debian-søk"
 
-#: debianmemberportfolio/views.py:104
+#: debianmemberportfolio/views.py:105
 msgid "GPG public key via finger"
 msgstr "Offentlig GPG-nøkkel via finger"
 
-#: debianmemberportfolio/views.py:105
+#: debianmemberportfolio/views.py:106
 msgid "GPG public key via HTTP"
 msgstr "Offentlig GPG-nøkkel via HTTP"
 
-#: debianmemberportfolio/views.py:106
-msgid "NM, AM participation"
-msgstr ""
-
 #: debianmemberportfolio/views.py:107
+msgid "NM, AM participation"
+msgstr "NM-, AM-deltagelse"
+
+#: debianmemberportfolio/views.py:108
 msgid "Contribution information"
 msgstr "Bidragsinformasjon"
 
-#: debianmemberportfolio/views.py:110
+#: debianmemberportfolio/views.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informasjon tilgjengelig via ssh (for Debian-medlemmer)"
 
-#: debianmemberportfolio/views.py:111
-msgid "owned debian.net domains"
-msgstr ""
-
 #: debianmemberportfolio/views.py:112
-msgid ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"database information"
-msgstr ""
+msgid "owned debian.net domains"
+msgstr "eide debian.net -domener"
 
-#: debianmemberportfolio/views.py:114
+#: debianmemberportfolio/views.py:113
+msgid ""
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+"information"
+msgstr ""
+"Informasjon i <a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</"
+"a>-databasen"
+
+#: debianmemberportfolio/views.py:115
 msgid "Group membership information"
 msgstr "Gruppemedlemskapsinformasjon"
 
-#: debianmemberportfolio/views.py:117
+#: debianmemberportfolio/views.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: debianmemberportfolio/views.py:118
+#: debianmemberportfolio/views.py:119
 msgid "Available patches from Ubuntu"
-msgstr ""
+msgstr "Tilgjengelige programfikser fra Ubuntu"
 
 #: debianmemberportfolio/model/urlbuilder.py:43
 msgid "Email address"
@@ -276,19 +283,23 @@ msgid "Non Debian email address"
 msgstr "Epostadresser utenom Debian"
 
 #: debianmemberportfolio/model/urlbuilder.py:48
+msgid "Salsa user name"
+msgstr "Salsa-brukernavn"
+
+#: debianmemberportfolio/model/urlbuilder.py:49
 msgid "Alioth user name"
 msgstr "Alioth-brukernavn"
 
-#: debianmemberportfolio/model/urlbuilder.py:109
-#: debianmemberportfolio/model/urlbuilder.py:113
+#: debianmemberportfolio/model/urlbuilder.py:110
+#: debianmemberportfolio/model/urlbuilder.py:114
 #, python-format
 msgid "Missing input: %s"
-msgstr ""
+msgstr "Manglende inndata: %s"
 
 #: debianmemberportfolio/templates/base.html:24
 #: debianmemberportfolio/templates/base.html:31
 msgid "Debian Member Portfolio Service"
-msgstr ""
+msgstr "Debian-medlems portfoliotjeneste"
 
 #: debianmemberportfolio/templates/base.html:30
 msgid "Debian Logo"
@@ -296,11 +307,15 @@ msgstr "Debian-logo"
 
 #: debianmemberportfolio/templates/base.html:32
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a "
-"href=\"https://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=\"https://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 ""
+"Denne tjenesten er inspirert av Stefano Zacchiroli sin <a href=\"https://wiki."
+"debian.org/DDPortfolio\"> DDPortfolio-side i Debian-wikien</a>.  Du kan lage "
+"et sett med tilpassede lenker som leder til et Debian-medlems eller -"
+"pakkevedlikeholders informasjon om Debian."
 
 #: debianmemberportfolio/templates/base.html:39
 msgid "AGPL - Free Software"
@@ -309,21 +324,29 @@ msgstr "AGPL - Fri programvare"
 #: debianmemberportfolio/templates/base.html:40
 #, python-format
 msgid ""
-"The service is available under the terms of the <a "
-"href=\"https://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=\"https://git-"
-"scm.com/\">git</a>. If you want to translate this service to your "
-"language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
+"The service is available under the terms of the <a href=\"https://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="
+"\"https://git-scm.com/\">git</a>. If you want to translate this service to "
+"your language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
 "Member Portfolio Service at Weblate\">Weblate</a>."
 msgstr ""
+"Tjenesten er tilgjengelig i tråd med vilkårene i  <a href=\"https://www.gnu."
+"org/licenses/agpl.html\">GNU Affero General Public License</a> som publisert "
+"av Free Software Foundation, enten versjon 3 av lisensen eller (etter ditt "
+"valg) enhver senere versjon.  Du kan <a href=\"%(browseurl)s\" title=\"Gitweb "
+"repository browser URL\">se igjennom kildekoden</a> eller klode det fra <a "
+"href=\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> ved å bruke <a "
+"href=\"https://git-scm.com/\">git</a>. Hvis du ønsker a oversette denne "
+"tjenesten til ditt språk kan du bidra ved å bruke<a href=\"%(weblateurl)s\" "
+"title=\"Debian Member Portfolio Service at Weblate\"> Weblate</a>."
 
 #: debianmemberportfolio/templates/base.html:41
-msgid "Copyright © 2009-2017 Jan Dittberner"
-msgstr ""
+msgid "Copyright © 2009-2018 Jan Dittberner"
+msgstr "Kopirett © 2009-2018 Jan Dittberner"
 
 #: debianmemberportfolio/templates/showform.html:22
 msgid "Enter your personal information"
@@ -331,7 +354,7 @@ msgstr "Skriv inn informasjon om deg selv"
 
 #: debianmemberportfolio/templates/showform.html:29
 msgid "Debian Member Portfolio"
-msgstr ""
+msgstr "Debian-medlems portfolio"
 
 #: debianmemberportfolio/templates/showform.html:31
 msgid "Email address:"
@@ -358,24 +381,28 @@ msgid "Non Debian email address:"
 msgstr "Epostadresse utenom Debian:"
 
 #: debianmemberportfolio/templates/showform.html:71
+msgid "Salsa user name:"
+msgstr "Salsa-brukernavn:"
+
+#: debianmemberportfolio/templates/showform.html:78
 msgid "Alioth user name:"
 msgstr "Alioth-brukernavn:"
 
-#: debianmemberportfolio/templates/showform.html:78
+#: debianmemberportfolio/templates/showform.html:85
 msgid "Wiki user name:"
 msgstr "Wiki-brukernavn:"
 
-#: debianmemberportfolio/templates/showform.html:85
+#: debianmemberportfolio/templates/showform.html:92
 msgid "Forum user id:"
 msgstr "Forum-brukerid:"
 
-#: debianmemberportfolio/templates/showform.html:92
+#: debianmemberportfolio/templates/showform.html:99
 msgid "Output format:"
 msgstr "Fremvisningsformat:"
 
-#: debianmemberportfolio/templates/showform.html:99
+#: debianmemberportfolio/templates/showform.html:106
 msgid "Build Debian Member Portfolio URLs"
-msgstr ""
+msgstr "Bygg Debian-medlemsportfolio-URLer"
 
 #: debianmemberportfolio/templates/showurls.html:21
 msgid "Your personal links"
@@ -383,7 +410,7 @@ msgstr "Dine personlige lenker"
 
 #: debianmemberportfolio/templates/showurls.html:25
 msgid "Debian Member Porfolio"
-msgstr ""
+msgstr "Debian-medlems portfolio"
 
 #: debianmemberportfolio/templates/showurls.html:28
 msgid "Usage"
diff --git a/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po
index ca8eba5..cd9adf3 100644
--- a/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po
+++ b/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po
@@ -9,24 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service 0.3.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2017-09-10 10:49+0200\n"
-"PO-Revision-Date: 2017-09-10 10:53+0200\n"
-"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"POT-Creation-Date: 2018-02-09 10:14+0100\n"
+"PO-Revision-Date: 2018-02-09 10:27+0100\n"
+"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language: nl\n"
-"Language-Team: Dutch <https://hosted.weblate.org/projects/debian-member-"
-"portfolio-service/translations/nl/>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Language-Team: Dutch <https://hosted.weblate.org/projects/debian-member-portfolio-service/translations/nl/>\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Weblate 2.12-dev\n"
 "Generated-By: Babel 2.5.0\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "JSON"
 msgstr "JSON"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "HTML"
 msgstr "HTML"
 
@@ -53,13 +52,10 @@ msgstr "Fouten"
 #: debianmemberportfolio/views.py:47
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org"
-"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "fouten ontvangen\n"
-"(let op: mede-beheerders staan niet op de lijst, zie <a "
-"href=\"https://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>"
+"(let op: mede-beheerders staan niet op de lijst, zie <a href=\"https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>"
 
 #: debianmemberportfolio/views.py:51
 msgid "bugs reported"
@@ -71,9 +67,7 @@ msgstr "gebruikerslabels"
 
 #: debianmemberportfolio/views.py:53
 msgid "all messages (i.e., full text search for developer name on all bug logs)"
-msgstr ""
-"alle berichten (zoals zoeken in volledige tekst voor naam van "
-"ontwikkelaar in alle foutlogs)"
+msgstr "alle berichten (zoals zoeken in volledige tekst voor naam van ontwikkelaar in alle foutlogs)"
 
 #: debianmemberportfolio/views.py:55
 msgid "<a href=\"https://wiki.debian.org/WNPP\">WNPP</a>"
@@ -155,7 +149,7 @@ msgstr "people.d.o"
 msgid "oldpeople"
 msgstr "oudemensen"
 
-#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:92
+#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:93
 msgid "Alioth"
 msgstr "Alioth"
 
@@ -179,83 +173,83 @@ msgstr "DB-informatie over HTTP"
 msgid "FOAF profile"
 msgstr "FOAF-profiel"
 
-#: debianmemberportfolio/views.py:93
+#: debianmemberportfolio/views.py:92
+msgid "Salsa"
+msgstr "Salsa"
+
+#: debianmemberportfolio/views.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: debianmemberportfolio/views.py:94
+#: debianmemberportfolio/views.py:95
 msgid "Forum"
 msgstr "Forum"
 
-#: debianmemberportfolio/views.py:97
+#: debianmemberportfolio/views.py:98
 msgid "Miscellaneous"
 msgstr "Diversen"
 
-#: debianmemberportfolio/views.py:98
+#: debianmemberportfolio/views.py:99
 msgid "debtags"
 msgstr "deblabels"
 
-#: debianmemberportfolio/views.py:99
+#: debianmemberportfolio/views.py:100
 msgid "Planet Debian (name)"
 msgstr "Planet Debian (naam)"
 
-#: debianmemberportfolio/views.py:100
+#: debianmemberportfolio/views.py:101
 msgid "Planet Debian (username)"
 msgstr "Planet Debian (gebruikersnaam)"
 
-#: debianmemberportfolio/views.py:101
+#: debianmemberportfolio/views.py:102
 msgid "links"
 msgstr "links"
 
-#: debianmemberportfolio/views.py:102
+#: debianmemberportfolio/views.py:103
 msgid "Debian website"
 msgstr "Debian-website"
 
-#: debianmemberportfolio/views.py:103
+#: debianmemberportfolio/views.py:104
 msgid "Debian search"
 msgstr "Debian-zoeken"
 
-#: debianmemberportfolio/views.py:104
+#: debianmemberportfolio/views.py:105
 msgid "GPG public key via finger"
 msgstr "GPG openbare sleutel via finger"
 
-#: debianmemberportfolio/views.py:105
+#: debianmemberportfolio/views.py:106
 msgid "GPG public key via HTTP"
 msgstr "GPG openbare sleutel over HTTP"
 
-#: debianmemberportfolio/views.py:106
+#: debianmemberportfolio/views.py:107
 msgid "NM, AM participation"
 msgstr "NM, AM-deelname"
 
-#: debianmemberportfolio/views.py:107
+#: debianmemberportfolio/views.py:108
 msgid "Contribution information"
 msgstr "Bijdraaginformatie"
 
-#: debianmemberportfolio/views.py:110
+#: debianmemberportfolio/views.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informatie is bereikbaar over ssh (voor Debian-leden)"
 
-#: debianmemberportfolio/views.py:111
+#: debianmemberportfolio/views.py:112
 msgid "owned debian.net domains"
 msgstr "debian.net-domeinnamen in eigendom"
 
-#: debianmemberportfolio/views.py:112
-msgid ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"database information"
-msgstr ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a"
-">-database-informatie"
+#: debianmemberportfolio/views.py:113
+msgid "<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database information"
+msgstr "<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-database-informatie"
 
-#: debianmemberportfolio/views.py:114
+#: debianmemberportfolio/views.py:115
 msgid "Group membership information"
 msgstr "Groepslidmaatschap-informatie"
 
-#: debianmemberportfolio/views.py:117
+#: debianmemberportfolio/views.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: debianmemberportfolio/views.py:118
+#: debianmemberportfolio/views.py:119
 msgid "Available patches from Ubuntu"
 msgstr "Beschikbare patches van Ubuntu"
 
@@ -280,11 +274,15 @@ msgid "Non Debian email address"
 msgstr "Geen Debian-e-mailadres"
 
 #: debianmemberportfolio/model/urlbuilder.py:48
+msgid "Salsa user name"
+msgstr "Salsa-gebruikersnaam"
+
+#: debianmemberportfolio/model/urlbuilder.py:49
 msgid "Alioth user name"
 msgstr "Alioth-gebruikersnaam"
 
-#: debianmemberportfolio/model/urlbuilder.py:109
-#: debianmemberportfolio/model/urlbuilder.py:113
+#: debianmemberportfolio/model/urlbuilder.py:110
+#: debianmemberportfolio/model/urlbuilder.py:114
 #, python-format
 msgid "Missing input: %s"
 msgstr "Ontbrekende invoer: %s"
@@ -299,16 +297,8 @@ msgid "Debian Logo"
 msgstr "Debian-logo"
 
 #: debianmemberportfolio/templates/base.html:32
-msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a "
-"href=\"https://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 ""
-"Deze dienst is geïnspireerd op Stefano Zacchiroli's <a "
-"href=\"https://wiki.debian.org/DDPortfolio\">DDPortfolio-pagina op de "
-"Debian-wiki</a>. U kunt een set aangepaste links creëren die leiden naar "
-"een Debian-lid of pakketbeheerder-informatie aangaande Debian."
+msgid "This service has been inspired by Stefano Zacchiroli's <a href=\"https://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 "Deze dienst is geïnspireerd op Stefano Zacchiroli's <a href=\"https://wiki.debian.org/DDPortfolio\">DDPortfolio-pagina op de Debian-wiki</a>. U kunt een set aangepaste links creëren die leiden naar een Debian-lid of pakketbeheerder-informatie aangaande Debian."
 
 #: debianmemberportfolio/templates/base.html:39
 msgid "AGPL - Free Software"
@@ -316,32 +306,12 @@ msgstr "AGPL - Vrije software"
 
 #: debianmemberportfolio/templates/base.html:40
 #, python-format
-msgid ""
-"The service is available under the terms of the <a "
-"href=\"https://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=\"https://git-"
-"scm.com/\">git</a>. If you want to translate this service to your "
-"language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
-"Member Portfolio Service at Weblate\">Weblate</a>."
-msgstr ""
-"Deze dienst is beschikbaar onder de voorwaarden van de <a "
-"href=\"https://www.gnu.org/licenses/agpl.html\">GNU Affero General Public"
-" License</a>, zoals gepubliceerd door de Free Software Foundation, zowel "
-"versie 3, als (optioneel) een hogere versie. U kunt <a "
-"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">door de "
-"broncode bladeren</a> of deze klonen <a href=\"%(cloneurl)s\" title=\"git"
-" clone URL\">%(cloneurl)s</a> m.b.v. <a href=\"http://git-"
-"scm.com/\">git</a>. Als u deze dienst wilt vertalen naar uw eigen taal, "
-"dan kunt u bijdragen op <a href=\"%(weblateurl)s\" title=\"Debian "
-"Member Portfolio Service at Weblate\">Weblate</a>."
+msgid "The service is available under the terms of the <a href=\"https://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=\"https://git-scm.com/\">git</a>. If you want to translate this service to your language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian Member Portfolio Service at Weblate\">Weblate</a>."
+msgstr "Deze dienst is beschikbaar onder de voorwaarden van de <a href=\"https://www.gnu.org/licenses/agpl.html\">GNU Affero General Public License</a>, zoals gepubliceerd door de Free Software Foundation, zowel versie 3, als (optioneel) een hogere versie. U kunt <a href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">door de broncode bladeren</a> of deze klonen <a href=\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> m.b.v. <a href=\"http://git-scm.com/\">git</a>. Als u deze dienst wilt vertalen naar uw eigen taal, dan kunt u bijdragen op <a href=\"%(weblateurl)s\" title=\"Debian Member Portfolio Service at Weblate\">Weblate</a>."
 
 #: debianmemberportfolio/templates/base.html:41
-msgid "Copyright © 2009-2017 Jan Dittberner"
-msgstr "Copyright © 2009-2017 Jan Dittberner"
+msgid "Copyright © 2009-2018 Jan Dittberner"
+msgstr "Copyright © 2009-2018 Jan Dittberner"
 
 #: debianmemberportfolio/templates/showform.html:22
 msgid "Enter your personal information"
@@ -376,22 +346,26 @@ msgid "Non Debian email address:"
 msgstr "Geen Debian-e-mailadres:"
 
 #: debianmemberportfolio/templates/showform.html:71
+msgid "Salsa user name:"
+msgstr "Salsa-gebruikersnaam:"
+
+#: debianmemberportfolio/templates/showform.html:78
 msgid "Alioth user name:"
 msgstr "Alioth-gebruikersnaam:"
 
-#: debianmemberportfolio/templates/showform.html:78
+#: debianmemberportfolio/templates/showform.html:85
 msgid "Wiki user name:"
 msgstr "Wiki-gebruikersnaam:"
 
-#: debianmemberportfolio/templates/showform.html:85
+#: debianmemberportfolio/templates/showform.html:92
 msgid "Forum user id:"
 msgstr "Forum-gebruikersid:"
 
-#: debianmemberportfolio/templates/showform.html:92
+#: debianmemberportfolio/templates/showform.html:99
 msgid "Output format:"
 msgstr "Uitvoerformaat:"
 
-#: debianmemberportfolio/templates/showform.html:99
+#: debianmemberportfolio/templates/showform.html:106
 msgid "Build Debian Member Portfolio URLs"
 msgstr "Debian-ledenportfolio URL's bouwen"
 
@@ -418,10 +392,3 @@ msgstr "Er is een fout opgetreden tijdens de URL-creatie:"
 #: debianmemberportfolio/templates/showurls.html:59
 msgid "Restart"
 msgstr "Herstarten"
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "Copyright © 2009-2014 Jan Dittberner"
-#~ msgstr "Copyright © 2009-2014 Jan Dittberner"
-
diff --git a/debianmemberportfolio/translations/pt_BR/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/pt_BR/LC_MESSAGES/messages.po
index 926fbb1..dd609b1 100644
--- a/debianmemberportfolio/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/debianmemberportfolio/translations/pt_BR/LC_MESSAGES/messages.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-09-10 10:49+0200\n"
-"PO-Revision-Date: 2014-01-11 01:27+0100\n"
+"POT-Creation-Date: 2018-02-09 10:14+0100\n"
+"PO-Revision-Date: 2018-02-09 10:18+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language: pt_BR\n"
-"Language-Team: Portuguese (Brazil) "
-"(https://www.transifex.com/projects/p/debportfolioservice/language/pt_BR/)"
-"\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/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-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.0\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "JSON"
 msgstr "JSON"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "HTML"
 msgstr "HTML"
 
@@ -53,13 +53,12 @@ msgstr "Bugs"
 #: debianmemberportfolio/views.py:47
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org"
-"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org/cgi-"
+"bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "Bugs recebidos\n"
-"(nota: co-mantenedores não listados, veja <a "
-"href=\"https://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(nota: co-mantenedores não listados, veja <a href=\"https://bugs.debian.org/"
+"cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
 
 #: debianmemberportfolio/views.py:51
 msgid "bugs reported"
@@ -72,8 +71,8 @@ msgstr "Tags de usuário"
 #: debianmemberportfolio/views.py:53
 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)"
 
 #: debianmemberportfolio/views.py:55
 msgid "<a href=\"https://wiki.debian.org/WNPP\">WNPP</a>"
@@ -155,7 +154,7 @@ msgstr "people.d.o"
 msgid "oldpeople"
 msgstr "oldpeople"
 
-#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:92
+#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:93
 msgid "Alioth"
 msgstr "Alioth"
 
@@ -179,85 +178,87 @@ msgstr "Informações DB via HTTP"
 msgid "FOAF profile"
 msgstr ""
 
-#: debianmemberportfolio/views.py:93
+#: debianmemberportfolio/views.py:92
+msgid "Salsa"
+msgstr ""
+
+#: debianmemberportfolio/views.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: debianmemberportfolio/views.py:94
+#: debianmemberportfolio/views.py:95
 msgid "Forum"
 msgstr "Fórum"
 
-#: debianmemberportfolio/views.py:97
+#: debianmemberportfolio/views.py:98
 msgid "Miscellaneous"
 msgstr "Miscelânea"
 
-#: debianmemberportfolio/views.py:98
+#: debianmemberportfolio/views.py:99
 msgid "debtags"
 msgstr "debtags"
 
-#: debianmemberportfolio/views.py:99
+#: debianmemberportfolio/views.py:100
 msgid "Planet Debian (name)"
 msgstr ""
 
-#: debianmemberportfolio/views.py:100
-#, fuzzy
+#: debianmemberportfolio/views.py:101
 msgid "Planet Debian (username)"
 msgstr "Nome de usuário Debian"
 
-#: debianmemberportfolio/views.py:101
+#: debianmemberportfolio/views.py:102
 msgid "links"
 msgstr "links"
 
-#: debianmemberportfolio/views.py:102
+#: debianmemberportfolio/views.py:103
 msgid "Debian website"
 msgstr "Site do Debian"
 
-#: debianmemberportfolio/views.py:103
+#: debianmemberportfolio/views.py:104
 msgid "Debian search"
 msgstr "Pesquisa Debian"
 
-#: debianmemberportfolio/views.py:104
+#: debianmemberportfolio/views.py:105
 msgid "GPG public key via finger"
 msgstr "Chave pública GPG via finger"
 
-#: debianmemberportfolio/views.py:105
+#: debianmemberportfolio/views.py:106
 msgid "GPG public key via HTTP"
 msgstr "Chave pública GPG via HTTP"
 
-#: debianmemberportfolio/views.py:106
+#: debianmemberportfolio/views.py:107
 msgid "NM, AM participation"
 msgstr "Participação NM, AM"
 
-#: debianmemberportfolio/views.py:107
-#, fuzzy
+#: debianmemberportfolio/views.py:108
 msgid "Contribution information"
 msgstr "Insira suas informações pessoais"
 
-#: debianmemberportfolio/views.py:110
+#: debianmemberportfolio/views.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "Informação alcançável via ssh (para membros Debian)"
 
-#: debianmemberportfolio/views.py:111
+#: debianmemberportfolio/views.py:112
 msgid "owned debian.net domains"
 msgstr "domínios debian.net adquiridos"
 
-#: debianmemberportfolio/views.py:112
+#: debianmemberportfolio/views.py:113
 msgid ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"database information"
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+"information"
 msgstr ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"informações de banco de dados"
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> informações "
+"de banco de dados"
 
-#: debianmemberportfolio/views.py:114
+#: debianmemberportfolio/views.py:115
 msgid "Group membership information"
 msgstr "Informações de Grupos associados"
 
-#: debianmemberportfolio/views.py:117
+#: debianmemberportfolio/views.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: debianmemberportfolio/views.py:118
+#: debianmemberportfolio/views.py:119
 msgid "Available patches from Ubuntu"
 msgstr "Patches disponíveis para Ubuntu"
 
@@ -282,11 +283,15 @@ msgid "Non Debian email address"
 msgstr "Endereço de email não Debian"
 
 #: debianmemberportfolio/model/urlbuilder.py:48
+msgid "Salsa user name"
+msgstr "Nome de usuário Debian"
+
+#: debianmemberportfolio/model/urlbuilder.py:49
 msgid "Alioth user name"
 msgstr "Nome de usuário Alioth"
 
-#: debianmemberportfolio/model/urlbuilder.py:109
-#: debianmemberportfolio/model/urlbuilder.py:113
+#: debianmemberportfolio/model/urlbuilder.py:110
+#: debianmemberportfolio/model/urlbuilder.py:114
 #, python-format
 msgid "Missing input: %s"
 msgstr "Entrada restante: %s"
@@ -302,16 +307,15 @@ msgstr "Logo Debian"
 
 #: debianmemberportfolio/templates/base.html:32
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a "
-"href=\"https://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=\"https://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=\"https://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=\"https://"
+"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."
 
 #: debianmemberportfolio/templates/base.html:39
 msgid "AGPL - Free Software"
@@ -320,30 +324,29 @@ msgstr "AGPL - Sofware Livre"
 #: debianmemberportfolio/templates/base.html:40
 #, fuzzy, python-format
 msgid ""
-"The service is available under the terms of the <a "
-"href=\"https://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=\"https://git-"
-"scm.com/\">git</a>. If you want to translate this service to your "
-"language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
+"The service is available under the terms of the <a href=\"https://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="
+"\"https://git-scm.com/\">git</a>. If you want to translate this service to "
+"your language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
 "Member Portfolio Service at Weblate\">Weblate</a>."
 msgstr ""
-"O serviço está disponível sob os termos da <a "
-"href=\"https://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=\"https://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>. If you want to translate this "
+"service to your language you can contribute at <a href=\"%(weblateurl)s\" "
+"title=\"Debian Member Portfolio Service at Weblate\">Weblate</a>."
 
 #: debianmemberportfolio/templates/base.html:41
-#, fuzzy
-msgid "Copyright © 2009-2017 Jan Dittberner"
-msgstr "Direitos Autorais © 2009-2014 Jan Dittberner"
+msgid "Copyright © 2009-2018 Jan Dittberner"
+msgstr "Direitos Autorais © 2009-2018 Jan Dittberner"
 
 #: debianmemberportfolio/templates/showform.html:22
 msgid "Enter your personal information"
@@ -378,22 +381,26 @@ msgid "Non Debian email address:"
 msgstr "Endereço de email não Debian:"
 
 #: debianmemberportfolio/templates/showform.html:71
+msgid "Salsa user name:"
+msgstr ""
+
+#: debianmemberportfolio/templates/showform.html:78
 msgid "Alioth user name:"
 msgstr "Nome de usuário Alioth:"
 
-#: debianmemberportfolio/templates/showform.html:78
+#: debianmemberportfolio/templates/showform.html:85
 msgid "Wiki user name:"
 msgstr "Nome de usuário Wiki:"
 
-#: debianmemberportfolio/templates/showform.html:85
+#: debianmemberportfolio/templates/showform.html:92
 msgid "Forum user id:"
 msgstr "Id de usuário do fórum:"
 
-#: debianmemberportfolio/templates/showform.html:92
+#: debianmemberportfolio/templates/showform.html:99
 msgid "Output format:"
 msgstr "Formato de saída:"
 
-#: debianmemberportfolio/templates/showform.html:99
+#: debianmemberportfolio/templates/showform.html:106
 msgid "Build Debian Member Portfolio URLs"
 msgstr "URLs de Portfolio de  Membros Debian em Construção"
 
@@ -402,7 +409,6 @@ msgid "Your personal links"
 msgstr "Seus links pessoais"
 
 #: debianmemberportfolio/templates/showurls.html:25
-#, fuzzy
 msgid "Debian Member Porfolio"
 msgstr "Portfolio de Membro Debian"
 
@@ -421,4 +427,3 @@ msgstr "Erro durante criação de URL:"
 #: debianmemberportfolio/templates/showurls.html:59
 msgid "Restart"
 msgstr "Reiniciar"
-
diff --git a/debianmemberportfolio/translations/zh_CN/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/zh_CN/LC_MESSAGES/messages.po
index f4c54c6..11c04bc 100644
--- a/debianmemberportfolio/translations/zh_CN/LC_MESSAGES/messages.po
+++ b/debianmemberportfolio/translations/zh_CN/LC_MESSAGES/messages.po
@@ -8,24 +8,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Member Portfolio Service 0.3.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2017-09-10 10:49+0200\n"
-"PO-Revision-Date: 2016-08-18 03:24+0000\n"
-"Last-Translator: chimez <chimez@163.com>\n"
-"Language: zh_Hans_CN\n"
-"Language-Team: Chinese (China) <https://hosted.weblate.org/projects"
-"/debian-member-portfolio-service/translations/zh_CN/>\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"POT-Creation-Date: 2018-02-09 10:14+0100\n"
+"PO-Revision-Date: 2018-02-09 10:27+0100\n"
+"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
+"Language: zh_CN\n"
+"Language-Team: Chinese (China) <https://hosted.weblate.org/projects/debian-"
+"member-portfolio-service/translations/zh_CN/>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Weblate 2.13-dev\n"
 "Generated-By: Babel 2.5.0\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "JSON"
 msgstr "JSON"
 
-#: debianmemberportfolio/forms.py:33
+#: debianmemberportfolio/forms.py:67
 msgid "HTML"
 msgstr "HTML"
 
@@ -52,12 +52,12 @@ msgstr "缺陷"
 #: debianmemberportfolio/views.py:47
 msgid ""
 "bugs received\n"
-"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org"
-"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(note: co-maintainers not listed, see <a href=\"https://bugs.debian.org/cgi-"
+"bin/bugreport.cgi?bug=430986\">#430986</a>)"
 msgstr ""
 "bugs 接收\n"
-"(注意: 合作维护者未列入, 详见 <a href=\"https://bugs.debian.org/cgi-"
-"bin/bugreport.cgi?bug=430986\">#430986</a>)"
+"(注意: 合作维护者未列入, 详见 <a href=\"https://bugs.debian.org/cgi-bin/"
+"bugreport.cgi?bug=430986\">#430986</a>)"
 
 #: debianmemberportfolio/views.py:51
 msgid "bugs reported"
@@ -73,7 +73,8 @@ msgstr "所有信息 （即，开发者名下所有缺陷日志的全文搜索
 
 #: debianmemberportfolio/views.py:55
 msgid "<a href=\"https://wiki.debian.org/WNPP\">WNPP</a>"
-msgstr "<a href=\"https://wiki.debian.org/WNPP\">需要支持的和未来应有的包（WNPP）</a>"
+msgstr ""
+"<a href=\"https://wiki.debian.org/WNPP\">需要支持的和未来应有的包（WNPP）</a>"
 
 #: debianmemberportfolio/views.py:56
 msgid "correspondent for bugs"
@@ -151,7 +152,7 @@ msgstr "people.d.o"
 msgid "oldpeople"
 msgstr "老人"
 
-#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:92
+#: debianmemberportfolio/views.py:84 debianmemberportfolio/views.py:93
 msgid "Alioth"
 msgstr "北斗五(Alioth)"
 
@@ -175,81 +176,86 @@ msgstr "DB信息,通过HTTP"
 msgid "FOAF profile"
 msgstr "FOAF档案"
 
-#: debianmemberportfolio/views.py:93
+#: debianmemberportfolio/views.py:92
+msgid "Salsa"
+msgstr "Salsa"
+
+#: debianmemberportfolio/views.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: debianmemberportfolio/views.py:94
+#: debianmemberportfolio/views.py:95
 msgid "Forum"
 msgstr "论坛"
 
-#: debianmemberportfolio/views.py:97
+#: debianmemberportfolio/views.py:98
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: debianmemberportfolio/views.py:98
+#: debianmemberportfolio/views.py:99
 msgid "debtags"
 msgstr "包标签"
 
-#: debianmemberportfolio/views.py:99
+#: debianmemberportfolio/views.py:100
 msgid "Planet Debian (name)"
 msgstr "Planet Debian (名字)"
 
-#: debianmemberportfolio/views.py:100
+#: debianmemberportfolio/views.py:101
 msgid "Planet Debian (username)"
 msgstr "Planet Debian (用户名)"
 
-#: debianmemberportfolio/views.py:101
+#: debianmemberportfolio/views.py:102
 msgid "links"
 msgstr "链接"
 
-#: debianmemberportfolio/views.py:102
+#: debianmemberportfolio/views.py:103
 msgid "Debian website"
 msgstr "Debian网站"
 
-#: debianmemberportfolio/views.py:103
+#: debianmemberportfolio/views.py:104
 msgid "Debian search"
 msgstr "Debian搜索"
 
-#: debianmemberportfolio/views.py:104
+#: debianmemberportfolio/views.py:105
 msgid "GPG public key via finger"
 msgstr "GPG公钥,通过finger"
 
-#: debianmemberportfolio/views.py:105
+#: debianmemberportfolio/views.py:106
 msgid "GPG public key via HTTP"
 msgstr "GPG公钥,通过HTTP"
 
-#: debianmemberportfolio/views.py:106
+#: debianmemberportfolio/views.py:107
 msgid "NM, AM participation"
 msgstr "NM, AM 参加"
 
-#: debianmemberportfolio/views.py:107
+#: debianmemberportfolio/views.py:108
 msgid "Contribution information"
 msgstr "贡献信息"
 
-#: debianmemberportfolio/views.py:110
+#: debianmemberportfolio/views.py:111
 msgid "Information reachable via ssh (for Debian Members)"
 msgstr "信息可获取,通过ssh(DM专用)"
 
-#: debianmemberportfolio/views.py:111
+#: debianmemberportfolio/views.py:112
 msgid "owned debian.net domains"
 msgstr "拥有 debian.net 领域"
 
-#: debianmemberportfolio/views.py:112
+#: debianmemberportfolio/views.py:113
 msgid ""
-"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
-"database information"
-msgstr "<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> 数据库信息"
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+"information"
+msgstr ""
+"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> 数据库信息"
 
-#: debianmemberportfolio/views.py:114
+#: debianmemberportfolio/views.py:115
 msgid "Group membership information"
 msgstr "群组会员信息"
 
-#: debianmemberportfolio/views.py:117
+#: debianmemberportfolio/views.py:118
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: debianmemberportfolio/views.py:118
+#: debianmemberportfolio/views.py:119
 msgid "Available patches from Ubuntu"
 msgstr "来自Ubuntu的可用补丁"
 
@@ -274,11 +280,15 @@ msgid "Non Debian email address"
 msgstr "非Debian邮件地址"
 
 #: debianmemberportfolio/model/urlbuilder.py:48
+msgid "Salsa user name"
+msgstr "Salsa用户名"
+
+#: debianmemberportfolio/model/urlbuilder.py:49
 msgid "Alioth user name"
 msgstr "Alioth用户名"
 
-#: debianmemberportfolio/model/urlbuilder.py:109
-#: debianmemberportfolio/model/urlbuilder.py:113
+#: debianmemberportfolio/model/urlbuilder.py:110
+#: debianmemberportfolio/model/urlbuilder.py:114
 #, python-format
 msgid "Missing input: %s"
 msgstr "缺少输入: %s"
@@ -294,14 +304,14 @@ msgstr "Debian Logo"
 
 #: debianmemberportfolio/templates/base.html:32
 msgid ""
-"This service has been inspired by Stefano Zacchiroli's <a "
-"href=\"https://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=\"https://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 ""
-"这个服务由 Stefano Zacchiroli的 <a "
-"href=\"https://wiki.debian.org/DDPortfolio\">DDPortfolio 的 Debian "
-"Wiki页面</a> 得到灵感. 你可以创建一个指向 Debian Member 的或包维护者的关于Debian的信息的定制链接集合."
+"这个服务由 Stefano Zacchiroli的 <a href=\"https://wiki.debian.org/DDPortfolio"
+"\">DDPortfolio 的 Debian Wiki页面</a> 得到灵感. 你可以创建一个指向 Debian "
+"Member 的或包维护者的关于Debian的信息的定制链接集合."
 
 #: debianmemberportfolio/templates/base.html:39
 msgid "AGPL - Free Software"
@@ -310,29 +320,27 @@ msgstr "AGPL - 自由软件"
 #: debianmemberportfolio/templates/base.html:40
 #, python-format
 msgid ""
-"The service is available under the terms of the <a "
-"href=\"https://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=\"https://git-"
-"scm.com/\">git</a>. If you want to translate this service to your "
-"language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
+"The service is available under the terms of the <a href=\"https://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="
+"\"https://git-scm.com/\">git</a>. If you want to translate this service to "
+"your language you can contribute at <a href=\"%(weblateurl)s\" title=\"Debian "
 "Member Portfolio Service at Weblate\">Weblate</a>."
 msgstr ""
-"这个服务在由自由软件基金会(FSF)发布的 <a "
-"href=\"https://www.gnu.org/licenses/agpl.html\">GNU Affero General Public"
-" License</a> 第三版或(可选)更高版本协议下可用  你可以点击 <a href=\"%(browseurl)s\" "
-"title=\"Gitweb repository browser URL\">查看源代码</a> 或从 <a "
-"href=\"%(cloneurl)s\" title=\"git clone URL\">%(cloneurl)s</a> 使用 <a "
-"href=\"http://git-scm.com/\">git</a> clone . 如果你想翻译这个服务到你的语言 你可以在这里投稿 <a "
-"href=\"%(weblateurl)s\" title=\"Debian Member Portfolio Service at "
-"Weblate\">Weblate</a>."
+"这个服务在由自由软件基金会(FSF)发布的 <a href=\"https://www.gnu.org/licenses/"
+"agpl.html\">GNU Affero General Public License</a> 第三版或(可选)更高版本协议下"
+"可用  你可以点击 <a href=\"%(browseurl)s\" title=\"Gitweb repository browser "
+"URL\">查看源代码</a> 或从 <a href=\"%(cloneurl)s\" title=\"git clone URL\">"
+"%(cloneurl)s</a> 使用 <a href=\"http://git-scm.com/\">git</a> clone . 如果你想"
+"翻译这个服务到你的语言 你可以在这里投稿 <a href=\"%(weblateurl)s\" title="
+"\"Debian Member Portfolio Service at Weblate\">Weblate</a>."
 
 #: debianmemberportfolio/templates/base.html:41
-msgid "Copyright © 2009-2017 Jan Dittberner"
-msgstr "Copyright © 2009-2017 Jan Dittberner"
+msgid "Copyright © 2009-2018 Jan Dittberner"
+msgstr "Copyright © 2009-2018 Jan Dittberner"
 
 #: debianmemberportfolio/templates/showform.html:22
 msgid "Enter your personal information"
@@ -367,22 +375,26 @@ msgid "Non Debian email address:"
 msgstr "非Debian邮件地址:"
 
 #: debianmemberportfolio/templates/showform.html:71
+msgid "Salsa user name:"
+msgstr "Salsa用户名:"
+
+#: debianmemberportfolio/templates/showform.html:78
 msgid "Alioth user name:"
 msgstr "Alioth用户名:"
 
-#: debianmemberportfolio/templates/showform.html:78
+#: debianmemberportfolio/templates/showform.html:85
 msgid "Wiki user name:"
 msgstr "Wiki用户名:"
 
-#: debianmemberportfolio/templates/showform.html:85
+#: debianmemberportfolio/templates/showform.html:92
 msgid "Forum user id:"
 msgstr "论坛用户id:"
 
-#: debianmemberportfolio/templates/showform.html:92
+#: debianmemberportfolio/templates/showform.html:99
 msgid "Output format:"
 msgstr "输出格式:"
 
-#: debianmemberportfolio/templates/showform.html:99
+#: debianmemberportfolio/templates/showform.html:106
 msgid "Build Debian Member Portfolio URLs"
 msgstr "构建Debian Member Prortfolio链接"
 
@@ -391,9 +403,8 @@ msgid "Your personal links"
 msgstr "你的个人链接"
 
 #: debianmemberportfolio/templates/showurls.html:25
-#, fuzzy
 msgid "Debian Member Porfolio"
-msgstr "Debian Member Porfolio"
+msgstr ""
 
 #: debianmemberportfolio/templates/showurls.html:28
 msgid "Usage"
@@ -410,4 +421,3 @@ msgstr "在 URL 创建过程中的错误:"
 #: debianmemberportfolio/templates/showurls.html:59
 msgid "Restart"
 msgstr "重启"
-
diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py
index dd88aa3..a4e9d28 100644
--- a/debianmemberportfolio/views.py
+++ b/debianmemberportfolio/views.py
@@ -89,6 +89,7 @@ developer name on all bug logs)'),
         'dbfinger': N_('DB information via finger'),
         'db': N_('DB information via HTTP'),
         'webid': N_('FOAF profile'),
+        'salsa': N_('Salsa'),
         'alioth': N_('Alioth'),
         'wiki': N_('Wiki'),
         'forum': N_('Forum'),
@@ -126,6 +127,7 @@ DM_TUPLES = (('name', 'name'),
 
 #: list of field name tuples for Debian Developers
 DD_TUPLES = (('username', 'username'),
+             ('salsausername', 'username'),
              ('aliothusername', 'username'))
 
 
diff --git a/docs/source/devdocs.rst b/docs/source/devdocs.rst
index bff484c..cb5a515 100644
--- a/docs/source/devdocs.rst
+++ b/docs/source/devdocs.rst
@@ -132,6 +132,7 @@ that are filled at runtime:
 ================== ========================================
 Placeholder        Replacement
 ================== ========================================
+%(salsausername)s  user name on `salsa.debian.org`_
 %(aliothusername)s user name on `alioth.debian.org`_
 %(email)s          email address (URL encoded)
 %(emailnoq)s       email address
@@ -143,6 +144,7 @@ Placeholder        Replacement
 %(wikihomepage)s   full name in camel case (i.e. JohnSmith)
 ================== ========================================
 
+.. _salsa.debian.org: https://salsa.debian.org/
 .. _alioth.debian.org: https://alioth.debian.org/
 
 The replacement of placeholders is performed in the
diff --git a/setup.py b/setup.py
index 052ce33..d4a598e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Debian Member Portfolio Service setup
-# Copyright © 2009-2017 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2018 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -29,7 +29,7 @@ except ImportError:
 
 setup(
     name='debianmemberportfolio',
-    version='0.5.2',
+    version='0.6.0',
     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 https://wiki.debian.org/DDPortfolio. It