Merge branch 'master' into sendmail_for_blank_subjects

Conflicts: src/locale/pt_BR/LC_MESSAGES/django.mo src/locale/pt_BR/LC_MESSAGES/django.po

Merge branch 'master' into sendmail_for_blank_subjects
Conflicts: src/locale/pt_BR/LC_MESSAGES/django.mo src/locale/pt_BR/LC_MESSAGES/django.po
Luan
2 parents 2434376a 7489e9c4
Showing 11 changed files with 147 additions and 105 deletions Show diff stats
src/accounts/templates/accounts/user_create_form.html
src/accounts/templates/accounts/user_detail.html
src/accounts/templates/accounts/user_update_form.html
src/accounts/views.py
src/locale/pt_BR/LC_MESSAGES/django.mo
src/locale/pt_BR/LC_MESSAGES/django.po
src/planet/templates/feedzilla/base.html
src/search/base_indexes.py
src/super_archives/templates/message-thread.html
src/super_archives/templates/superarchives/thread-dashboard.html
src/templates/base.html
@@ -43,7 +43,7 @@
       <div class="col-md-6 col-lg-6 col-sm-6 col-xs-12" style="display: inline-block; vertical-align:top;">
         <div class="well">
           <fieldset>
-            <legend>{% trans 'Subscribe to mail lists' %}</legend>
+            <legend>{% trans 'Subscribe to groups' %}</legend>
             {% for choice in lists_form.lists %}
               <div class="checkbox">{{ choice }}</div>
             {% endfor %}
@@ -29,9 +29,7 @@
       <div class="divider"></div>
       {% if request.user.is_active %}
         <ul class="unstyled-list">
-        {% for email in user_.emails.iterator %}
-          <li><span class="icon-envelope icon-fixed-width"></span> {{ email.address }}</li>
-        {% endfor %}
+          <li><span class="icon-envelope icon-fixed-width"></span> <a href="mailto:{{ user_.email }}">{{ user_.email }}</a></li>
         </ul>
         <div class="divider"></div>
       {% endif %}
@@ -65,7 +63,7 @@
       </ul>
       {% if user_.mailinglists %}
-        <b>{% trans 'Subscribes: ' %}</b>
+        <b>{% trans 'Groups: ' %}</b>
         {% for list in user_.mailinglists %}
           <span class="label label-primary">{{ list }}</span>
         {% endfor %}
@@ -90,7 +88,7 @@
     <div class="col-lg-4 col-md-4 col-sm-7">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title">{% trans "Mailing list Participation" %}</h3>
+          <h3 class="panel-title">{% trans "Groups Inscriptions" %}</h3>
         </div>
         <div class="panel-body">
           <div id="collabs2"></div>
@@ -178,22 +178,26 @@ $(function() {
           </div>
         </div>
       </div>
+    </div>
-      <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h3 class="panel-title">{% trans "Change SVN and XMPP Client password" %}</h3>
-          </div>
-          <div class="panel-body">
-            <div class="form-group">
-            {% trans "You don't need to change this password. Change it only if you really know what you are doing." %}
-            </div>
-            <a href="{% url 'change_password' %}" class="btn btn-primary pull-right">{% trans "Change Password" %}</a>
+    <div class="row">
+      <div class="col-lg-12">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h3 class="panel-title">
+            {% blocktrans %}Change <a href="http://repositorio.interlegis.gov.br/">SVN</a> and <a href="http://mensageiro.interlegis.gov.br/">XMPP Client</a> password{% endblocktrans %}
+          </h3>
+        </div>
+        <div class="panel-body">
+          <div class="form-group">
+          {% trans "This feature is available only for who needs to change the password for some reason as having an old user with the same username, forgot your password to commit, usage of other XMPP Client for connection. Usually, you won't need to change this password. Only change it if you are sure about what you are doing." %}
           </div>
+          <a href="{% url 'change_password' %}" class="btn btn-default pull-right"><span class="icon-warning-sign"></span> {% trans "Change Password" %}</a>
         </div>
       </div>
-
+      </div>
     </div>
+
     <div class="row">
       <div class="submit">
         <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
@@ -71,6 +71,7 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
             'ticket': TicketCollabCount,
         }
+        messages = Message.objects.filter(from_address__user__pk=user.pk)
         for type in ['thread', 'ticket', 'wiki', 'changeset', 'attachment']:
             CounterClass = counter_class.get(type)
             if CounterClass:
@@ -80,6 +81,8 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
                     count_types[trans(type)] = 0
                 else:
                     count_types[trans(type)] = counter.count
+            elif type == 'thread':
+                count_types[trans(type)] = messages.count()
             else:
                 sqs = SearchQuerySet()
                 for filter_or in fields_or_lookup:
@@ -100,7 +103,6 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
         context['emails'] = query[:10]
         count_by = 'thread__mailinglist__name'
-        messages = Message.objects.filter(from_address__user__pk=user.pk)
         context['list_activity'] = dict(messages.values_list(count_by)\
                                            .annotate(Count(count_by))\
                                            .order_by(count_by))
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-04 18:28+0000\n"
+"POT-Creation-Date: 2013-12-06 10:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,11 +53,11 @@ msgstr &quot;Digite a mesma senha que acima, para verificação.&quot;
 msgid "Password mismatch"
 msgstr "Senhas diferentes"
-#: accounts/views.py:142
+#: accounts/views.py:144
 msgid "Your profile has been created!"
 msgstr "Seu perfil foi criado!"
-#: accounts/views.py:143
+#: accounts/views.py:145
 msgid ""
 "You must login to validated your profile. Profiles not validated are deleted "
 "in 24h."
@@ -65,12 +65,12 @@ msgstr &quot;&quot;
 "Você deve se logar para validar seu perfil. Perfis não validados serão "
 "deletados em 24h."
-#: accounts/views.py:224
+#: accounts/views.py:226
 msgid "Could not change your password. Please, try again later."
 msgstr ""
 "Não conseguimos alterar sua senha. Por favor, tente novamente mais tarde."
-#: accounts/views.py:233
+#: accounts/views.py:235
 msgid "You've changed your password successfully!"
 msgstr "Senha alterada com sucesso!"
@@ -81,10 +81,10 @@ msgstr &quot;%(count)s usuários deletados.&quot;
 #: accounts/templates/accounts/change_password.html:8
 msgid "Change XMPP Client and SVN Password"
-msgstr "Trocar senha do SVN e do Mensageiro"
+msgstr "Trocar senha do Repositório e do Mensageiro"
 #: accounts/templates/accounts/change_password.html:17
-#: accounts/templates/accounts/user_update_form.html:191
+#: accounts/templates/accounts/user_update_form.html:195
 msgid "Change Password"
 msgstr "Trocar senha"
@@ -113,8 +113,8 @@ msgid &quot;Personal Information&quot;
 msgstr "Informações pessoais"
 #: accounts/templates/accounts/user_create_form.html:46
-msgid "Subscribe to mail lists"
-msgstr "Inscreva-se para listas de e-mails"
+msgid "Subscribe to groups"
+msgstr "Inscreva-se nos grupos"
 #: accounts/templates/accounts/user_create_form.html:60 templates/base.html:98
 msgid "Register"
@@ -128,47 +128,47 @@ msgstr &quot;perfil&quot;
 msgid "list membership"
 msgstr "participação em listas"
-#: accounts/templates/accounts/user_detail.html:51
+#: accounts/templates/accounts/user_detail.html:49
 msgid "Twitter account"
 msgstr "Conta Twitter"
-#: accounts/templates/accounts/user_detail.html:54
+#: accounts/templates/accounts/user_detail.html:52
 msgid "Facebook account"
 msgstr "Conta Facebook"
-#: accounts/templates/accounts/user_detail.html:62
+#: accounts/templates/accounts/user_detail.html:60
 msgid "Personal webpage"
 msgstr "Página web pessoal"
-#: accounts/templates/accounts/user_detail.html:68
-msgid "Subscribes: "
-msgstr "Inscrições: "
+#: accounts/templates/accounts/user_detail.html:66
+msgid "Groups: "
+msgstr "Grupos: "
-#: accounts/templates/accounts/user_detail.html:81
+#: accounts/templates/accounts/user_detail.html:79
 msgid "Contributions by Area"
 msgstr "Contribuições por área"
-#: accounts/templates/accounts/user_detail.html:93
-msgid "Mailing list Participation"
-msgstr "Participação em listas de e-mail"
+#: accounts/templates/accounts/user_detail.html:91
+msgid "Groups Inscriptions"
+msgstr "Inscrições em grupos"
-#: accounts/templates/accounts/user_detail.html:106 badger/models.py:70
+#: accounts/templates/accounts/user_detail.html:104 badger/models.py:70
 msgid "Badges"
 msgstr "Medalhas"
-#: accounts/templates/accounts/user_detail.html:125
+#: accounts/templates/accounts/user_detail.html:123
 msgid "Latest posted"
 msgstr "Últimas postagens"
-#: accounts/templates/accounts/user_detail.html:130
+#: accounts/templates/accounts/user_detail.html:128
 msgid "There are no posts by this user so far."
 msgstr "Não há posts deste usuário até agora."
-#: accounts/templates/accounts/user_detail.html:136 badger/models.py:23
+#: accounts/templates/accounts/user_detail.html:134 badger/models.py:23
 msgid "Contributions"
 msgstr "Contribuições"
-#: accounts/templates/accounts/user_detail.html:141
+#: accounts/templates/accounts/user_detail.html:139
 msgid "No contributions of this user so far."
 msgstr "Não há posts deste usuário até agora."
@@ -229,19 +229,30 @@ msgstr &quot;Adicionar outro endereço de e-mail&quot;
 msgid "Add"
 msgstr "Adicionar"
-#: accounts/templates/accounts/user_update_form.html:185
-msgid "Change SVN and XMPP Client password"
-msgstr "Trocar a senha do SVN e do Mensageiro"
+#: accounts/templates/accounts/user_update_form.html:188
+msgid ""
+"Change <a href=\"http://repositorio.interlegis.gov.br/\">SVN</a> and <a href="
+"\"http://mensageiro.interlegis.gov.br/\">XMPP Client</a> password"
+msgstr ""
+"Trocar a senha do <a href=\"http://repositorio.interlegis.gov.br/"
+"\">Repositório</a> e do <a href=\"http://mensageiro.interlegis.gov.br/"
+"\">Mensageiro</a>"
-#: accounts/templates/accounts/user_update_form.html:189
+#: accounts/templates/accounts/user_update_form.html:193
 msgid ""
-"You don't need to change this password. Change it only if you really know "
-"what you are doing."
+"This feature is available only for who needs to change the password for some "
+"reason as having an old user with the same username, forgot your password to "
+"commit, usage of other XMPP Client for connection. Usually, you won't need "
+"to change this password. Only change it if you are sure about what you are "
+"doing."
 msgstr ""
-"Você não precisa trocar essa senha. Troque-a somente se tem certeza do que "
-"está fazendo."
+"Este recurso está disponível para quem precisa trocar a senha por algum "
+"motivo como ter um usuário antigo com mesmo nome de usuário, esqueceu da "
+"senha antiga para commit, uso de outro cliente XMPP para conexão. "
+"Normalmente, você não terá que trocar essa senha. Somente troque essa senha "
+"se tiver certeza do que está fazendo."
-#: accounts/templates/accounts/user_update_form.html:199
+#: accounts/templates/accounts/user_update_form.html:203
 msgid "Update"
 msgstr "Atualizar"
@@ -394,19 +405,23 @@ msgstr &quot;em&quot;
 msgid "Read original"
 msgstr "Leia o original"
-#: planet/templates/feedzilla/base.html:5 templates/base.html:76
+#: planet/templates/feedzilla/base.html:4
+msgid "Community Blogs"
+msgstr "Blogs da comunidade"
+
+#: planet/templates/feedzilla/base.html:7 templates/base.html:76
 msgid "Planet"
 msgstr ""
-#: planet/templates/feedzilla/base.html:15
+#: planet/templates/feedzilla/base.html:17
 msgid "Tags"
 msgstr "Etiquetas"
-#: planet/templates/feedzilla/base.html:19
+#: planet/templates/feedzilla/base.html:21
 msgid "Source Blogs"
 msgstr "Blogs de origem"
-#: planet/templates/feedzilla/base.html:22
+#: planet/templates/feedzilla/base.html:24
 #: planet/templates/feedzilla/submit_blog.html:5
 msgid "Submit a blog"
 msgstr "Sugerir um blog"
@@ -741,7 +756,7 @@ msgstr &quot;Endereço de e-mail verificado!&quot;
 #: super_archives/management/commands/import_emails.py:205
 msgid "[Colab] Warning - Email sent with a blank subject."
-msgstr "[Colab] Aviso - E-mail enviado com o campo assunto em branco."
+msgstr ""
 #: super_archives/templates/message-preview.html:42
 #: super_archives/templates/message-preview.html:62
@@ -749,64 +764,64 @@ msgid &quot;by&quot;
 msgstr "por"
 #: super_archives/templates/message-preview.html:65
-#: super_archives/templates/message-thread.html:157
+#: super_archives/templates/message-thread.html:159
 msgid "ago"
 msgstr "atrás"
-#: super_archives/templates/message-thread.html:33
+#: super_archives/templates/message-thread.html:35
 msgid "You must login before voting."
 msgstr "Você deve estar logado antes de votar."
-#: super_archives/templates/message-thread.html:128
+#: super_archives/templates/message-thread.html:130
 msgid "Order by"
 msgstr "Ordernar por"
-#: super_archives/templates/message-thread.html:132
+#: super_archives/templates/message-thread.html:134
 msgid "Votes"
 msgstr "Votos"
-#: super_archives/templates/message-thread.html:136
+#: super_archives/templates/message-thread.html:138
 msgid "Date"
 msgstr "Data"
-#: super_archives/templates/message-thread.html:141
+#: super_archives/templates/message-thread.html:143
 msgid "Related:"
 msgstr "Relacionado:"
-#: super_archives/templates/message-thread.html:152
+#: super_archives/templates/message-thread.html:154
 msgid "Statistics:"
 msgstr "Estátisticas:"
-#: super_archives/templates/message-thread.html:156
+#: super_archives/templates/message-thread.html:158
 msgid "started at"
 msgstr "começou às"
-#: super_archives/templates/message-thread.html:162
+#: super_archives/templates/message-thread.html:164
 msgid "viewed"
 msgstr "visualizado"
-#: super_archives/templates/message-thread.html:163
-#: super_archives/templates/message-thread.html:168
-#: super_archives/templates/message-thread.html:173
+#: super_archives/templates/message-thread.html:165
+#: super_archives/templates/message-thread.html:170
+#: super_archives/templates/message-thread.html:175
 msgid "times"
 msgstr "vezes"
-#: super_archives/templates/message-thread.html:167
+#: super_archives/templates/message-thread.html:169
 msgid "answered"
 msgstr "respondido"
-#: super_archives/templates/message-thread.html:172
+#: super_archives/templates/message-thread.html:174
 msgid "voted"
 msgstr "votado"
-#: super_archives/templates/message-thread.html:178
+#: super_archives/templates/message-thread.html:180
 msgid "Tags:"
 msgstr "Etiquetas:"
 #: super_archives/templates/superarchives/thread-dashboard.html:5
 #: templates/base.html:73
-msgid "Discussions"
-msgstr "Discussões"
+msgid "Groups"
+msgstr "Grupos"
 #: super_archives/templates/superarchives/thread-dashboard.html:15
 msgid "latest"
@@ -823,7 +838,7 @@ msgstr &quot;mais relevantes&quot;
 #: super_archives/templates/superarchives/emails/email_blank_subject.txt:2
 msgid "Hello"
-msgstr "Olá"
+msgstr ""
 #: super_archives/templates/superarchives/emails/email_blank_subject.txt:3
 #, python-format
@@ -838,15 +853,6 @@ msgid &quot;&quot;
 "\n"
 "Thank you.\n"
 msgstr ""
-"\n"
-"Você enviou um e-mail para %(mailinglist)s com o campo Assunto em branco e "
-"o seguinte conteúdo:\n"
-"\n"
-"\"%(body)s\"\n"
-"\n"
-"Por favor, preencha o assunto em todos os e-mails que você enviar.\n"
-"\n"
-"Obrigado.\n"
 #: super_archives/templates/superarchives/emails/email_verification.txt:2
 #, python-format
@@ -906,47 +912,55 @@ msgstr &quot;Opa... algo saiu errado!&quot;
 msgid "Contribute"
 msgstr "Contribua"
-#: templates/base.html:83
-msgid "New Ticket"
-msgstr "Novo Tíquete"
-
-#: templates/base.html:85
+#: templates/base.html:82
 msgid "Timeline"
 msgstr "Histórico"
-#: templates/base.html:86
+#: templates/base.html:83
 msgid "Roadmap"
 msgstr "Planejamento"
-#: templates/base.html:87
+#: templates/base.html:84
 msgid "Browse Source"
 msgstr "Ver Código"
+#: templates/base.html:86
+msgid "New Ticket"
+msgstr "Novo Tíquete"
+
 #: templates/base.html:88
 msgid "View Tickets"
 msgstr "Visualizar Tiquetes"
-#: templates/base.html:112
+#: templates/base.html:99
+msgid "Login"
+msgstr "Entrar"
+
+#: templates/base.html:113
 msgid "My Profile"
 msgstr "Meu Perfil"
-#: templates/base.html:124 templates/base.html.py:127
+#: templates/base.html:114
+msgid "Logout"
+msgstr "Sair"
+
+#: templates/base.html:126 templates/base.html.py:129
 msgid "Search here..."
 msgstr "Pesquise aqui..."
-#: templates/base.html:140
+#: templates/base.html:142
 msgid "The login has failed. Please, try again."
 msgstr "O login falhou. Por favor, tente novamente."
-#: templates/base.html:165
+#: templates/base.html:167
 msgid "Last email imported at"
 msgstr "Último e-mail importado em"
-#: templates/base.html:170
+#: templates/base.html:172
 msgid "The contents of this site is published under license"
 msgstr "O conteúdo deste site está publicado sob a licença"
-#: templates/base.html:172
+#: templates/base.html:174
 msgid "Creative Commons - attribution, non-commercial"
 msgstr "Creative Commons - atribuição e não-comercial"
@@ -994,6 +1008,22 @@ msgstr &quot;Vontade de ajudar&quot;
 msgid "INTERLEGIS COMMUNITIES"
 msgstr "COMUNIDADES INTERLEGIS"
+#~ msgid "Change SVN and XMPP Client password"
+#~ msgstr "Trocar a senha do SVN e do Mensageiro"
+
+#~ msgid ""
+#~ "You don't need to change this password. Change it only if you really know "
+#~ "what you are doing."
+#~ msgstr ""
+#~ "Você não precisa trocar essa senha. Troque-a somente se tem certeza do "
+#~ "que está fazendo."
+
+#~ msgid "Subscribes: "
+#~ msgstr "Inscrições: "
+
+#~ msgid "Discussions"
+#~ msgstr "Discussões"
+
 #~ msgid "Community inside participations"
 #~ msgstr "Participações internas da comunidade"
 {% extends 'base.html' %}
 {% load i18n feedzilla_tags %}
+{% block title %}{% trans "Community Blogs" %}{% endblock %}
+
 {% block main-content %}
     <h2>{% trans 'Planet' %}</h2>
     <hr/>
@@ -17,7 +19,7 @@
         </div>
         <div class="well">
           <h3>{% trans 'Source Blogs' %}</h3>
-          {% feedzilla_donor_list %}
+          {% feedzilla_donor_list order_by="title" %}
           <div class="text-center">
             <a class="btn btn-primary" href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
           </div>
@@ -77,7 +77,9 @@ class BaseIndex(indexes.SearchIndex):
     def prepare_modified_by(self, obj):
         if hasattr(obj, 'modified_by'):
-            return obj.modified_by
+            modified_by = obj.get_modified_by()
+            if modified_by:
+                return modified_by.get_full_name()
         if self.author_obj:
             return self.author_obj.get_full_name()
         return obj.author
@@ -3,6 +3,8 @@
 {% trans "Anonymous" as anonymous %}
+{% block title %}{{ first_msg.subject_clean }}{% endblock %}
+
 {% block head_js %}
 <script>
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block main-content %}
-  <h2>{% trans 'Discussions'|title %}</h2>
+  <h2>{% trans 'Groups'|title %}</h2>
   <hr/>
   {% for listname, latest, most_relevant in lists %}
@@ -70,7 +70,7 @@
         <div class="collapse navbar-collapse navbar-main">
           <ul class="nav navbar-nav">
             <li>
-              <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a>
+              <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
             </li>
             <li>
               <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a>
@@ -79,12 +79,12 @@
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a>
               <ul class="dropdown-menu">
                 <li><a href="/wiki">Wiki</a></li>
-                {% if user.is_active %}
-                <li><a href="/newticket">{% trans "New Ticket" %}</a></li>
-                {% endif %}
                 <li><a href="/timeline">{% trans "Timeline" %}</a></li>
                 <li><a href="/roadmap">{% trans "Roadmap" %}</a></li>
                 <li><a href="/browser">{% trans "Browse Source" %}</a></li>
+                {% if user.is_active %}
+                <li><a href="/newticket">{% trans "New Ticket" %}</a></li>
+                {% endif %}
                 <li><a href="/report">{% trans "View Tickets" %}</a></li>
               </ul>
             </li>
@@ -96,7 +96,8 @@
           <ul class="nav navbar-nav navbar-right">
             {% if not user.is_authenticated %}
               <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
-              <li>{% browserid_login text='Login' %}</li>
+              {% trans 'Login' as login_text %}
+              <li>{% browserid_login text=login_text %}</li>
             {% else %}
               <li id="user-menu" class="dropdown">
                 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
@@ -110,7 +111,8 @@
                       </div>
                       <div>
                         <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
-                        {% browserid_logout text='Logout' link_class='btn btn-default pull-right' %}
+                        {% trans 'Logout' as logout_text %}
+                        {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
                       </div>
                     </div>
                   </li>
	@@ -43,7 +43,7 @@		@@ -43,7 +43,7 @@
43	<div class="col-md-6 col-lg-6 col-sm-6 col-xs-12" style="display: inline-block; vertical-align:top;">	43	<div class="col-md-6 col-lg-6 col-sm-6 col-xs-12" style="display: inline-block; vertical-align:top;">
44	<div class="well">	44	<div class="well">
45	<fieldset>	45	<fieldset>
46	- <legend>{% trans 'Subscribe to mail lists' %}</legend>	46	+ <legend>{% trans 'Subscribe to groups' %}</legend>
47	{% for choice in lists_form.lists %}	47	{% for choice in lists_form.lists %}
48	<div class="checkbox">{{ choice }}</div>	48	<div class="checkbox">{{ choice }}</div>
49	{% endfor %}	49	{% endfor %}
	@@ -3,6 +3,8 @@		@@ -3,6 +3,8 @@
3		3
4	{% trans "Anonymous" as anonymous %}	4	{% trans "Anonymous" as anonymous %}
5		5
		6	+{% block title %}{{ first_msg.subject_clean }}{% endblock %}
		7	+
6	{% block head_js %}	8	{% block head_js %}
7		9
8	<script>	10	<script>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	{% load i18n %}	2	{% load i18n %}
3		3
4	{% block main-content %}	4	{% block main-content %}
5	- <h2>{% trans 'Discussions'\|title %}</h2>	5	+ <h2>{% trans 'Groups'\|title %}</h2>
6	<hr/>	6	<hr/>
7		7
8	{% for listname, latest, most_relevant in lists %}	8	{% for listname, latest, most_relevant in lists %}