[damned-lies] String improvements (fixes #628600)

[Claude Paroz <claudep src gnome org>]

commit 04f7209c6d62b95aef51c26d9e4cc348d8394e86
Author: Claude Paroz <claude 2xlibre net>
Date:   Thu Sep 2 22:48:12 2010 +0200

    String improvements (fixes #628600)
    
    Thanks to Friedel Wolff for the review.

 people/models.py                                |    2 +-
 templates/base.html                             |    2 +-
 templates/languages/language_release.html       |    2 +-
 templates/languages/language_release_stats.html |    2 +-
 templates/people/person_detail.html             |    4 ++--
 templates/people/person_team_membership.html    |    2 +-
 templates/stats_show.html                       |    2 +-
 templates/vertimus/vertimus_detail.html         |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/people/models.py b/people/models.py
index 8345fa3..380d679 100644
--- a/people/models.py
+++ b/people/models.py
@@ -38,7 +38,7 @@ class Person(User):
     webpage_url = models.URLField(_("Web page"), null=True, blank=True)
     irc_nick = models.SlugField(_("IRC nickname"), max_length=20, null=True, blank=True)
     bugzilla_account = models.EmailField(_("Bugzilla account"), null=True, blank=True,
-                                         help_text=_("This should be an email address, useful if not equal to 'email' field"))
+                                         help_text=_("This should be an email address, useful if not equal to 'E-mail address' field"))
     activation_key = models.CharField(max_length=40, null=True, blank=True)
 
     # Use UserManager to get the create_user method, etc.
diff --git a/templates/base.html b/templates/base.html
index 278130a..1ef1beb 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -95,7 +95,7 @@
     <br />
 {% trans "Maintained in the <a href='http://git.gnome.org/browse/damned-lies/'>damned-lies</a> module on <a href='http://git.gnome.org/'>git.gnome.org</a>" %}
  <br />
-    {% trans "Hosted by" %} <a href="http://www.canonical.com/";>Canonical</a>.
+    {% blocktrans with "<a href='http://www.canonical.com/'>Canonical</a>" as link %}Hosted by {{ link }}.{% endblocktrans %}
   </div>
 
 </div> <!-- end of div.body -->
diff --git a/templates/languages/language_release.html b/templates/languages/language_release.html
index aa0aa33..2f64805 100644
--- a/templates/languages/language_release.html
+++ b/templates/languages/language_release.html
@@ -30,7 +30,7 @@ $(document).ready(function()
 </p>
 
 {% if release.status == "xternal" %}
-<p><i>{% trans "The modules of this release are not part of the GNOME git repository. Please check each module's web page to see where to send translations." %}</i></p>
+<p><i>{% trans "The modules of this release are not part of the GNOME Git repository. Please check each module's web page to see where to send translations." %}</i></p>
 {% endif %}
 
 <h3>{{ stats_title }}</h3>
diff --git a/templates/languages/language_release_stats.html b/templates/languages/language_release_stats.html
index 735c257..6fc13e8 100644
--- a/templates/languages/language_release_stats.html
+++ b/templates/languages/language_release_stats.html
@@ -62,7 +62,7 @@
             <img src="{{ err.get_icon }}" title="{{ err.get_description|striptags }}" alt="{{ err.type }}" />
           {% endfor %}
           {% if stat|domain_type == "mallard" %}
-            <img src="{{ MEDIA_URL }}img/mallard.png" width="16" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/>
+            <img src="{{ MEDIA_URL }}img/mallard.png" width="18" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/>
           {% endif %}
         </td>
           <td><span class="branch">{{ branch }}</span></td>
diff --git a/templates/people/person_detail.html b/templates/people/person_detail.html
index 884a510..61ee0ee 100644
--- a/templates/people/person_detail.html
+++ b/templates/people/person_detail.html
@@ -40,7 +40,7 @@ $(document).ready(function()
 {% endif %}
 
 {% if person.maintains_modules.all %}
-<h2>{% trans "Maintains:" %}</h2>
+<h2>{% trans "Module maintenance" %}</h2>
 <ul>
   {% for module in person.maintains_modules.all %}
   <li><a href="{{ module.get_absolute_url }}">{{ module.get_description }}</a></li>
@@ -51,7 +51,7 @@ $(document).ready(function()
 {% include "people/person_team_membership.html" %}
 
 {% if states %}
-<h2>{% trans "Working on" %}</h2>
+<h2>{% trans "Current activity" %}</h2>
 
 <table class="tablesorter" id="working_on">
 <thead><tr>
diff --git a/templates/people/person_team_membership.html b/templates/people/person_team_membership.html
index 81b0971..9d71d54 100644
--- a/templates/people/person_team_membership.html
+++ b/templates/people/person_team_membership.html
@@ -2,7 +2,7 @@
 {% load stats_extras %}
 
 {% if person.role_set.all %}
-<h2>{% trans "Member of teams" %}</h2>
+<h2>{% trans "Team membership" %}</h2>
 <ul>
   {% for role in person.role_set.all %}
   {% with role.get_role_display as role_name %}
diff --git a/templates/stats_show.html b/templates/stats_show.html
index 5688a54..eaf144e 100644
--- a/templates/stats_show.html
+++ b/templates/stats_show.html
@@ -4,7 +4,7 @@
   {% with stat|first as pot_stat %}
   <h3>{% trans pot_stat.domain.get_description %}
   {% if pot_stat|domain_type == "mallard" %}
-    <img src="{{ MEDIA_URL }}img/mallard.png" width="20" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/>
+    <img src="{{ MEDIA_URL }}img/mallard.png" width="18" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/>
   {% endif %}
   {% if pot_stat.domain.directory != 'help' and pot_stat.domain.directory != 'po' %}
     <br />
diff --git a/templates/vertimus/vertimus_detail.html b/templates/vertimus/vertimus_detail.html
index 4309e35..abf0cf0 100644
--- a/templates/vertimus/vertimus_detail.html
+++ b/templates/vertimus/vertimus_detail.html
@@ -107,7 +107,7 @@ $(document).ready(function() {
     {% else %}
       {% blocktrans with level|ordinal|safe as human_level %}Archived Actions ({{ human_level }} archived series){% endblocktrans %}
       <a href="{% url vertimus_by_names module.name,branch.name,domain.name,language.locale %}">
-        {% trans "(Return to current)" %}
+        {% trans "(Return to current actions)" %}
       </a>
     {% endif %}
     {% if grandparent_level %}