Merge branch 'master' into ubuntu-master

diff --combined templates/html/show.tmpl
index e72e61a253e667967a13cd8728334167ddc5f870,b8cc43e97cfeedda8f62381fc15f0912712099fe..c72596432b1fc6437763f078f64f8e4a0a6399bc
--- 1/templates/html/show.tmpl
--- 2/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -63,9 -63,15 +63,9 @@@
  [% UNLESS is_virtual %]
  <div id="pmoreinfo">
  <h2>[% g('Links for %s', pkg) %]</h2>
- <h3>[% g('Debian Resources:') %]</h3>
+ <h3>[% g('%s Resources:', organisation) %]</h3>
  <ul>
 -<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg %]">[% g('Bug Reports') %]</a></li>
 -
 -[% IF src.pkg -%]
 -<li><a href="[% pts_url _ src.pkg %]">[% g('Developer Information (PTS)') %]</a></li>
 -[% ELSIF is_source %]
 -<li><a href="[% pts_url _ pkg %]">[% g('Developer Information (PTS)') %]</a></li>
 -[%- END %]
 +<li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' %]">[% g('Bug Reports') %]</a></li>
  
  [% IF files && (!archive or archive == main_archive or archive == 'security') %]
  <li><a href="[% changelogs_url _ files.changelog.path %]">[% g('%s Changelog', organisation) %]</a></li>
@@@ -114,7 -120,8 +114,7 @@@
    END -%]
    [%- '<ul>' IF loop.first -%]
        <li><a href="mailto:[% mail %]">[% name | html %]</a>
 -      (<a href="[% ddpo_url _ mail %]" title="[% g("An overview over the maintainer's packages and uploads") %]">[% g('QA Page') %]</a>
 -      [%- IF mailarchiveurl %], <a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive') %]</a>[% END %])
 +      [%- IF mailarchiveurl %](<a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive') %]</a>)[% END %]
        </li>
    [%- '</ul>' IF loop.last -%]
  [%- END -%]