Merge branch '1.12.x' of github.com:colab/colab into 1.12.x

Sergio Oliveira
2 parents 8c92837a e7ff7b51
Showing 11 changed files with 415 additions and 405 deletions Show diff stats
colab/accounts/templates/search/user_search_preview.html
colab/accounts/templatetags/date_format.py
colab/locale/en/LC_MESSAGES/django.mo
colab/locale/en/LC_MESSAGES/django.po
colab/locale/pt_BR/LC_MESSAGES/django.mo
colab/locale/pt_BR/LC_MESSAGES/django.po
colab/super_archives/locale/en/LC_MESSAGES/django.mo
colab/super_archives/locale/en/LC_MESSAGES/django.po
colab/super_archives/locale/pt_BR/LC_MESSAGES/django.mo
colab/super_archives/locale/pt_BR/LC_MESSAGES/django.po
colab/super_archives/templates/search/thread_search_preview.html
-{% load i18n tz highlight gravatar date_format %}
+{% load i18n tz highlight gravatar %}
 <div class="row">
   <div class="col-md-2 center">
@@ -16,7 +16,7 @@
         {% endif %}
     </strong>
-    <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
+    <small><strong>{% trans "Since" %}: {{ result.date_joined|date:"d F Y" }}</strong></small><br>
     <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
   </div>
 </div>
@@ -1,20 +0,0 @@
-from django import template
-from django.utils.translation import ugettext as _
-register = template.Library()
-
-
-@register.simple_tag(takes_context=True)
-def date_format(context, date):
-    formatted_date = _('%(m)s %(d)s %(y)s' % {'m': date.strftime('%B'),
-                                              'd': date.day,
-                                              'y': date.year})
-    return formatted_date
-
-
-@register.simple_tag(takes_context=True)
-def datetime_format(context, date):
-    formatted_date = date_format(context, date)
-    formatted_time = _('%(hour)s:%(min)s' % {'hour': date.hour,
-                                             'min': date.strftime('%I')})
-    formatted_datetime = _('%s at %s' % (formatted_date, formatted_time))
-    return formatted_datetime
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: colab\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-24 17:46+0000\n"
+"POT-Creation-Date: 2015-12-11 14:07+0000\n"
 "PO-Revision-Date: 2015-09-04 19:21+0000\n"
 "Last-Translator: Lucas Kanashiro Duarte <kanashiro.duarte@gmail.com>\n"
 "Language-Team: English (http://www.transifex.com/colab/colab/language/en/)\n"
@@ -17,30 +17,6 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:21
-msgid "Social"
-msgstr ""
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:26
-#, fuzzy
-#| msgid "Username"
-msgid "Users"
-msgstr "Username"
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:28
-msgid "Communities"
-msgstr "Communities"
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:30
-#, fuzzy
-#| msgid "My Profile"
-msgid "Profile"
-msgstr "My Profile"
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:32
-msgid "Control Panel"
-msgstr ""
-
 #: colab/accounts/admin.py:18
 msgid "Personal info"
 msgstr "Personal info"
@@ -54,14 +30,14 @@ msgid &quot;Important dates&quot;
 msgstr "Important dates"
 #: colab/accounts/filters.py:7
-#: colab/accounts/templates/search/user_search_preview.html:12
+#: colab/accounts/templates/search/user_search_preview.html:20
 #, fuzzy
 #| msgid "Username"
 msgid "User"
 msgstr "Username"
-#: colab/accounts/filters.py:12 colab/accounts/forms.py:175
-#: colab/accounts/forms.py:246
+#: colab/accounts/filters.py:12 colab/accounts/forms.py:212
+#: colab/accounts/forms.py:290
 #, fuzzy
 #| msgid "Filename"
 msgid "Username"
@@ -79,58 +55,58 @@ msgstr &quot;Institution&quot;
 msgid "Role"
 msgstr "Role"
-#: colab/accounts/forms.py:30
+#: colab/accounts/forms.py:33
 msgid "Social account does not exist"
 msgstr "Social account does not exist"
-#: colab/accounts/forms.py:58 colab/accounts/forms.py:64
-#: colab/accounts/forms.py:70
+#: colab/accounts/forms.py:61 colab/accounts/forms.py:67
+#: colab/accounts/forms.py:73
 msgid "This field cannot be blank."
 msgstr "This field cannot be blank."
-#: colab/accounts/forms.py:111
+#: colab/accounts/forms.py:114
 #: colab/accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr "Bio"
-#: colab/accounts/forms.py:112
+#: colab/accounts/forms.py:115
 msgid "Write something about you in 200 characters or less."
 msgstr "Write something about you in 200 characters or less."
-#: colab/accounts/forms.py:157
+#: colab/accounts/forms.py:160
 msgid "Mailing lists"
 msgstr "Mailing lists"
-#: colab/accounts/forms.py:170
+#: colab/accounts/forms.py:207
 #, python-format
 msgid "Email already used. Is it you?  Please <a href='%(url)s'>login</a>"
 msgstr "Email already used. Is it you?  Please <a href='%(url)s'>login</a>"
-#: colab/accounts/forms.py:172
+#: colab/accounts/forms.py:209
 msgid "A user with that username already exists."
 msgstr "A user with that username already exists."
-#: colab/accounts/forms.py:173
+#: colab/accounts/forms.py:210
 msgid "The two password fields didn't match."
 msgstr "The two password fields didn't match."
-#: colab/accounts/forms.py:183 colab/accounts/forms.py:251
+#: colab/accounts/forms.py:220 colab/accounts/forms.py:295
 msgid "Password"
 msgstr "Password"
-#: colab/accounts/forms.py:185
+#: colab/accounts/forms.py:222
 msgid "Password confirmation"
 msgstr "Password confirmation"
-#: colab/accounts/forms.py:247 colab/accounts/models.py:77
+#: colab/accounts/forms.py:291 colab/accounts/models.py:91
 msgid "Required. 30 characters or fewer. Letters and digits."
 msgstr "Required. 30 characters or fewer. Letters and digits."
-#: colab/accounts/forms.py:249
+#: colab/accounts/forms.py:293
 msgid "This value may contain only letters and numbers."
 msgstr "This value may contain only letters and numbers."
-#: colab/accounts/forms.py:252
+#: colab/accounts/forms.py:296
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -250,76 +226,76 @@ msgstr &quot;No contributions of this user so far.&quot;
 msgid "View more contributions..."
 msgstr "View more contributions..."
-#: colab/accounts/templates/accounts/user_update_form.html:70
+#: colab/accounts/templates/accounts/user_update_form.html:65
 msgid "We sent a verification email to "
 msgstr "We sent a verification email to "
-#: colab/accounts/templates/accounts/user_update_form.html:71
+#: colab/accounts/templates/accounts/user_update_form.html:66
 msgid "Please follow the instructions in it."
 msgstr "Please follow the instructions in it."
-#: colab/accounts/templates/accounts/user_update_form.html:123
+#: colab/accounts/templates/accounts/user_update_form.html:109
 msgid "profile information"
 msgstr "profile information"
-#: colab/accounts/templates/accounts/user_update_form.html:128
+#: colab/accounts/templates/accounts/user_update_form.html:114
 msgid "Change your avatar at Gravatar.com"
 msgstr "Change your avatar at Gravatar.com"
-#: colab/accounts/templates/accounts/user_update_form.html:178
-#: colab/search/utils.py:56
+#: colab/accounts/templates/accounts/user_update_form.html:152
+#: colab/plugins/utils/collaborations.py:27
 msgid "Emails"
 msgstr "Emails"
-#: colab/accounts/templates/accounts/user_update_form.html:187
+#: colab/accounts/templates/accounts/user_update_form.html:161
 msgid "Primary"
 msgstr "Primary"
-#: colab/accounts/templates/accounts/user_update_form.html:190
+#: colab/accounts/templates/accounts/user_update_form.html:164
 msgid "Setting..."
 msgstr "Setting..."
-#: colab/accounts/templates/accounts/user_update_form.html:190
+#: colab/accounts/templates/accounts/user_update_form.html:164
 msgid "Set as Primary"
 msgstr "Set as Primary"
-#: colab/accounts/templates/accounts/user_update_form.html:191
+#: colab/accounts/templates/accounts/user_update_form.html:165
 msgid "Deleting..."
 msgstr "Deleting..."
-#: colab/accounts/templates/accounts/user_update_form.html:191
-#: colab/accounts/templates/accounts/user_update_form.html:203
+#: colab/accounts/templates/accounts/user_update_form.html:165
+#: colab/accounts/templates/accounts/user_update_form.html:177
 msgid "Delete"
 msgstr "Delete"
-#: colab/accounts/templates/accounts/user_update_form.html:202
+#: colab/accounts/templates/accounts/user_update_form.html:176
 msgid "Sending verification..."
 msgstr "Sending verification..."
-#: colab/accounts/templates/accounts/user_update_form.html:202
+#: colab/accounts/templates/accounts/user_update_form.html:176
 msgid "Verify"
 msgstr "Verify"
-#: colab/accounts/templates/accounts/user_update_form.html:210
+#: colab/accounts/templates/accounts/user_update_form.html:184
 msgid "Add another email address:"
 msgstr "Add another email address:"
-#: colab/accounts/templates/accounts/user_update_form.html:213
+#: colab/accounts/templates/accounts/user_update_form.html:187
 msgid "Add"
 msgstr "Add"
-#: colab/accounts/templates/accounts/user_update_form.html:221
-#: colab/accounts/templates/accounts/user_update_form.html:225
+#: colab/accounts/templates/accounts/user_update_form.html:195
+#: colab/accounts/templates/accounts/user_update_form.html:199
 #: colab/accounts/templates/registration/password_change_form_custom.html:26
 #: colab/accounts/templates/registration/password_reset_confirm_custom.html:28
 msgid "Change Password"
 msgstr "Change Password"
-#: colab/accounts/templates/accounts/user_update_form.html:233
+#: colab/accounts/templates/accounts/user_update_form.html:207
 msgid "Update"
 msgstr "Update"
-#: colab/accounts/templates/accounts/user_update_form.html:234
+#: colab/accounts/templates/accounts/user_update_form.html:208
 msgid "Go to profile panel"
 msgstr ""
@@ -365,7 +341,7 @@ msgstr &quot;Email address:&quot;
 msgid "Reset password"
 msgstr "Reset password"
-#: colab/accounts/templates/search/user_search_preview.html:11
+#: colab/accounts/templates/search/user_search_preview.html:19
 #: colab/search/forms.py:19
 #: colab/search/templates/search/includes/search_filters.html:134
 #: colab/search/templates/search/includes/search_filters.html:136
@@ -374,7 +350,7 @@ msgstr &quot;Reset password&quot;
 msgid "Since"
 msgstr "Since"
-#: colab/accounts/templates/search/user_search_preview.html:12
+#: colab/accounts/templates/search/user_search_preview.html:20
 #, fuzzy
 #| msgid "Register"
 msgid "Registered in"
@@ -392,18 +368,18 @@ msgstr &quot;&quot;
 #: colab/accounts/templatetags/date_format.py:19
 #, python-format
-msgid "%s at %s"
+msgid "%(formatted_date)s at %(formatted_time)s"
 msgstr ""
-#: colab/accounts/views.py:126
+#: colab/accounts/views.py:127
 msgid "Your profile has been created!"
 msgstr "Your profile has been created!"
-#: colab/accounts/views.py:186
+#: colab/accounts/views.py:187
 msgid "Your password was changed."
 msgstr "Your password was changed."
-#: colab/accounts/views.py:202
+#: colab/accounts/views.py:203
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr "Your password has been set. You may go ahead and log in now."
@@ -428,7 +404,7 @@ msgstr &quot;Latest collaborations&quot;
 msgid "Search"
 msgstr "Search"
-#: colab/search/forms.py:18
+#: colab/search/forms.py:18 colab/settings.py:144
 msgid "Type"
 msgstr "Type"
@@ -477,11 +453,11 @@ msgstr &quot;Search here&quot;
 msgid "Filters"
 msgstr "Filters"
-#: colab/search/templates/search/search.html:76
+#: colab/search/templates/search/search.html:77
 msgid "No results for your search."
 msgstr "No results for your search."
-#: colab/search/templates/search/search.html:78
+#: colab/search/templates/search/search.html:79
 msgid "You are searching for"
 msgstr "You are searching for"
@@ -505,31 +481,31 @@ msgstr &quot;Recent activity&quot;
 msgid "Relevance"
 msgstr "Relevance"
-#: colab/settings.py:149
+#: colab/settings.py:153
 msgid "Document"
 msgstr "Document"
-#: colab/settings.py:151
+#: colab/settings.py:155
 msgid "Presentation"
 msgstr "Presentation"
-#: colab/settings.py:152
+#: colab/settings.py:156
 msgid "Text"
 msgstr "Text"
-#: colab/settings.py:153
+#: colab/settings.py:157
 msgid "Code"
 msgstr "Code"
-#: colab/settings.py:155
+#: colab/settings.py:159
 msgid "Compressed"
 msgstr "Compressed"
-#: colab/settings.py:156
+#: colab/settings.py:160
 msgid "Image"
 msgstr "Image"
-#: colab/settings.py:158
+#: colab/settings.py:162
 msgid "Spreadsheet"
 msgstr "Spreadsheet"
@@ -541,7 +517,7 @@ msgstr &quot;Not found. Keep searching! :)&quot;
 msgid "Ooopz... something went wrong!"
 msgstr "Ooopz... something went wrong!"
-#: colab/templates/base.html:74
+#: colab/templates/base.html:79
 msgid "The login has failed. Please, try again."
 msgstr "The login has failed. Please, try again."
@@ -617,6 +593,11 @@ msgstr &quot;RSS - Latest Threads&quot;
 #~ msgstr "Gitlab Projects"
 #, fuzzy
+#~| msgid "My Profile"
+#~ msgid "Profile"
+#~ msgstr "My Profile"
+
+#, fuzzy
 #~| msgid "Gitlab Project"
 #~ msgid "New Project"
 #~ msgstr "Gitlab Project"
@@ -636,6 +617,14 @@ msgstr &quot;RSS - Latest Threads&quot;
 #~ msgid "Merge Requests"
 #~ msgstr "Gitlab Merge Requests"
+#, fuzzy
+#~| msgid "Username"
+#~ msgid "Users"
+#~ msgstr "Username"
+
+#~ msgid "Communities"
+#~ msgstr "Communities"
+
 #~ msgid ""
 #~ "Please enter a correct %(username)s and password. Note that both fields "
 #~ "may be case-sensitive."
@@ -10,7 +10,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: colab\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-24 17:46+0000\n"
+"POT-Creation-Date: 2015-12-11 14:10+0000\n"
 "PO-Revision-Date: 2015-09-07 19:13+0000\n"
 "Last-Translator: Lucas Kanashiro Duarte <kanashiro.duarte@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/colab/colab/"
@@ -21,30 +21,6 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:21
-msgid "Social"
-msgstr "Social"
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:26
-#, fuzzy
-#| msgid "Username"
-msgid "Users"
-msgstr "Usuário"
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:28
-msgid "Communities"
-msgstr "Comunidades"
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:30
-#, fuzzy
-#| msgid "My Profile"
-msgid "Profile"
-msgstr "Meu Perfil"
-
-#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:32
-msgid "Control Panel"
-msgstr "Painel de Controle"
-
 #: colab/accounts/admin.py:18
 msgid "Personal info"
 msgstr "Informações Pessoais"
@@ -58,14 +34,14 @@ msgid &quot;Important dates&quot;
 msgstr "Datas importantes"
 #: colab/accounts/filters.py:7
-#: colab/accounts/templates/search/user_search_preview.html:12
+#: colab/accounts/templates/search/user_search_preview.html:20
 #, fuzzy
 #| msgid "Username"
 msgid "User"
 msgstr "Usuário"
-#: colab/accounts/filters.py:12 colab/accounts/forms.py:175
-#: colab/accounts/forms.py:246
+#: colab/accounts/filters.py:12 colab/accounts/forms.py:212
+#: colab/accounts/forms.py:290
 #, fuzzy
 #| msgid "Filename"
 msgid "Username"
@@ -83,60 +59,60 @@ msgstr &quot;Instituição&quot;
 msgid "Role"
 msgstr "Papel"
-#: colab/accounts/forms.py:30
+#: colab/accounts/forms.py:33
 msgid "Social account does not exist"
 msgstr "Conta social não existe"
-#: colab/accounts/forms.py:58 colab/accounts/forms.py:64
-#: colab/accounts/forms.py:70
+#: colab/accounts/forms.py:61 colab/accounts/forms.py:67
+#: colab/accounts/forms.py:73
 msgid "This field cannot be blank."
 msgstr "Este campo não pode ficar em branco."
-#: colab/accounts/forms.py:111
+#: colab/accounts/forms.py:114
 #: colab/accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr "Bio"
-#: colab/accounts/forms.py:112
+#: colab/accounts/forms.py:115
 msgid "Write something about you in 200 characters or less."
 msgstr "Escreva algo sobre você em 200 caracteres ou menos."
-#: colab/accounts/forms.py:157
+#: colab/accounts/forms.py:160
 msgid "Mailing lists"
 msgstr "Listas de e-mail"
-#: colab/accounts/forms.py:170
+#: colab/accounts/forms.py:207
 #, python-format
 msgid "Email already used. Is it you?  Please <a href='%(url)s'>login</a>"
 msgstr ""
 "Este email ja está sendo utilizado.Caso seja o seu efetue o <a "
 "href='%(url)s'>login</a>"
-#: colab/accounts/forms.py:172
+#: colab/accounts/forms.py:209
 msgid "A user with that username already exists."
 msgstr "Já existe um usuário com este nome."
-#: colab/accounts/forms.py:173
+#: colab/accounts/forms.py:210
 msgid "The two password fields didn't match."
 msgstr "Os dois campos de senha não conferem."
-#: colab/accounts/forms.py:183 colab/accounts/forms.py:251
+#: colab/accounts/forms.py:220 colab/accounts/forms.py:295
 msgid "Password"
 msgstr "Senha"
-#: colab/accounts/forms.py:185
+#: colab/accounts/forms.py:222
 msgid "Password confirmation"
 msgstr "Confirmação de senha"
-#: colab/accounts/forms.py:247 colab/accounts/models.py:77
+#: colab/accounts/forms.py:291 colab/accounts/models.py:91
 msgid "Required. 30 characters or fewer. Letters and digits."
 msgstr "Obrigatório. 30 caracteres ou menos. Letras ou digitos."
-#: colab/accounts/forms.py:249
+#: colab/accounts/forms.py:293
 msgid "This value may contain only letters and numbers."
 msgstr "Este campo pode conter apenas letras e números."
-#: colab/accounts/forms.py:252
+#: colab/accounts/forms.py:296
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -256,77 +232,76 @@ msgstr &quot;Não há contribuições deste usuário até agora.&quot;
 msgid "View more contributions..."
 msgstr "Ver mais colaborações..."
-#: colab/accounts/templates/accounts/user_update_form.html:70
+#: colab/accounts/templates/accounts/user_update_form.html:65
 msgid "We sent a verification email to "
 msgstr "Enviamos um email de verificação para "
-#: colab/accounts/templates/accounts/user_update_form.html:71
+#: colab/accounts/templates/accounts/user_update_form.html:66
 msgid "Please follow the instructions in it."
 msgstr "Por favor, siga as instruções."
-#: colab/accounts/templates/accounts/user_update_form.html:123
+#: colab/accounts/templates/accounts/user_update_form.html:109
 msgid "profile information"
 msgstr "informações do perfil"
-#: colab/accounts/templates/accounts/user_update_form.html:128
+#: colab/accounts/templates/accounts/user_update_form.html:114
 msgid "Change your avatar at Gravatar.com"
 msgstr "Troque seu avatar em Gravatar.com"
-#: colab/accounts/templates/accounts/user_update_form.html:178
-#: colab/search/utils.py:56
+#: colab/accounts/templates/accounts/user_update_form.html:152
+#: colab/plugins/utils/collaborations.py:27
 msgid "Emails"
 msgstr "Emails"
-#: colab/accounts/templates/accounts/user_update_form.html:187
+#: colab/accounts/templates/accounts/user_update_form.html:161
 msgid "Primary"
 msgstr "Primário"
-#: colab/accounts/templates/accounts/user_update_form.html:190
+#: colab/accounts/templates/accounts/user_update_form.html:164
 msgid "Setting..."
 msgstr "Definindo..."
-#: colab/accounts/templates/accounts/user_update_form.html:190
+#: colab/accounts/templates/accounts/user_update_form.html:164
 msgid "Set as Primary"
 msgstr "Definir como Primário"
-#: colab/accounts/templates/accounts/user_update_form.html:191
+#: colab/accounts/templates/accounts/user_update_form.html:165
 msgid "Deleting..."
 msgstr "Apagando..."
-#: colab/accounts/templates/accounts/user_update_form.html:191
-#: colab/accounts/templates/accounts/user_update_form.html:203
+#: colab/accounts/templates/accounts/user_update_form.html:165
+#: colab/accounts/templates/accounts/user_update_form.html:177
 msgid "Delete"
 msgstr "Apagar"
-#: colab/accounts/templates/accounts/user_update_form.html:202
+#: colab/accounts/templates/accounts/user_update_form.html:176
 msgid "Sending verification..."
 msgstr "Enviando verificação..."
-#: colab/accounts/templates/accounts/user_update_form.html:202
+#: colab/accounts/templates/accounts/user_update_form.html:176
 msgid "Verify"
 msgstr "Verificar"
-#: colab/accounts/templates/accounts/user_update_form.html:210
+#: colab/accounts/templates/accounts/user_update_form.html:184
 msgid "Add another email address:"
 msgstr "Adicionar outro endereço de email"
-#: colab/accounts/templates/accounts/user_update_form.html:213
+#: colab/accounts/templates/accounts/user_update_form.html:187
 msgid "Add"
 msgstr "Adicionar"
-#: colab/accounts/templates/accounts/user_update_form.html:221
-#: colab/accounts/templates/accounts/user_update_form.html:225
+#: colab/accounts/templates/accounts/user_update_form.html:195
+#: colab/accounts/templates/accounts/user_update_form.html:199
 #: colab/accounts/templates/registration/password_change_form_custom.html:26
 #: colab/accounts/templates/registration/password_reset_confirm_custom.html:28
 msgid "Change Password"
 msgstr "Trocar senha"
-#: colab/accounts/templates/accounts/user_update_form.html:233
+#: colab/accounts/templates/accounts/user_update_form.html:207
 msgid "Update"
 msgstr "Atualizar"
-#: colab/accounts/templates/accounts/user_update_form.html:234
-#| msgid "Control Panel"
+#: colab/accounts/templates/accounts/user_update_form.html:208
 msgid "Go to profile panel"
 msgstr "Ir para meu perfil"
@@ -372,7 +347,7 @@ msgstr &quot;Endereço de email: &quot;
 msgid "Reset password"
 msgstr "Redefinir senha"
-#: colab/accounts/templates/search/user_search_preview.html:11
+#: colab/accounts/templates/search/user_search_preview.html:19
 #: colab/search/forms.py:19
 #: colab/search/templates/search/includes/search_filters.html:134
 #: colab/search/templates/search/includes/search_filters.html:136
@@ -381,36 +356,35 @@ msgstr &quot;Redefinir senha&quot;
 msgid "Since"
 msgstr "Desde"
-#: colab/accounts/templates/search/user_search_preview.html:12
-#, fuzzy
-#| msgid "Register"
+
+#: colab/accounts/templates/search/user_search_preview.html
 msgid "Registered in"
-msgstr "Cadastre-se"
+msgstr "Registrado em"
 #: colab/accounts/templatetags/date_format.py:8
 #, python-format
 msgid "%(m)s %(d)s %(y)s"
-msgstr ""
+msgstr "%(d)s %(m)s %(y)s"
 #: colab/accounts/templatetags/date_format.py:17
 #, python-format
 msgid "%(hour)s:%(min)s"
-msgstr ""
+msgstr "%(hour)s:%(min)s"
 #: colab/accounts/templatetags/date_format.py:19
 #, python-format
-msgid "%s at %s"
-msgstr ""
+msgid "%(formatted_date)s at %(formatted_time)s"
+msgstr "%(formatted_date)s as %(formatted_time)s"
-#: colab/accounts/views.py:126
+#: colab/accounts/views.py:127
 msgid "Your profile has been created!"
 msgstr "Seu perfil foi criado!"
-#: colab/accounts/views.py:186
+#: colab/accounts/views.py:187
 msgid "Your password was changed."
 msgstr "Sua senha foi modificada."
-#: colab/accounts/views.py:202
+#: colab/accounts/views.py:203
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr "Sua senha foi modificada. Você já pode efetuar o login agora."
@@ -435,7 +409,7 @@ msgstr &quot;Últimas colaborações&quot;
 msgid "Search"
 msgstr "Busca"
-#: colab/search/forms.py:18
+#: colab/search/forms.py:18 colab/settings.py:144
 msgid "Type"
 msgstr "Tipo"
@@ -484,11 +458,11 @@ msgstr &quot;Pesquise aqui&quot;
 msgid "Filters"
 msgstr "Filtros"
-#: colab/search/templates/search/search.html:76
+#: colab/search/templates/search/search.html:77
 msgid "No results for your search."
 msgstr "Não há resultados para sua busca."
-#: colab/search/templates/search/search.html:78
+#: colab/search/templates/search/search.html:79
 msgid "You are searching for"
 msgstr "Você está procurando por"
@@ -512,31 +486,31 @@ msgstr &quot;Atividade recente&quot;
 msgid "Relevance"
 msgstr "Relevância"
-#: colab/settings.py:149
+#: colab/settings.py:153
 msgid "Document"
 msgstr "Documento"
-#: colab/settings.py:151
+#: colab/settings.py:155
 msgid "Presentation"
 msgstr "Apresentação"
-#: colab/settings.py:152
+#: colab/settings.py:156
 msgid "Text"
 msgstr "Texto"
-#: colab/settings.py:153
+#: colab/settings.py:157
 msgid "Code"
 msgstr "Código"
-#: colab/settings.py:155
+#: colab/settings.py:159
 msgid "Compressed"
 msgstr "Compactado"
-#: colab/settings.py:156
+#: colab/settings.py:160
 msgid "Image"
 msgstr "Imagem"
-#: colab/settings.py:158
+#: colab/settings.py:162
 msgid "Spreadsheet"
 msgstr "Planilha"
@@ -548,7 +522,7 @@ msgstr &quot;Não encontrado. Continue procurando! :)&quot;
 msgid "Ooopz... something went wrong!"
 msgstr "Ooopa... algo saiu errado!"
-#: colab/templates/base.html:74
+#: colab/templates/base.html:79
 msgid "The login has failed. Please, try again."
 msgstr "O login falhou. Por favor, tente novamente."
@@ -569,7 +543,6 @@ msgid &quot;Groups&quot;
 msgstr "Grupos"
 #: colab/templates/header.html:57
-#| msgid "My Profile"
 msgid "My Profile"
 msgstr "Meu Perfil"
@@ -618,132 +591,154 @@ msgid &quot;RSS - Latest Threads&quot;
 msgstr "RSS - Últimas Discussões"
 #, fuzzy
-#~| msgid "Gitlab Projects"
-#~ msgid "Public Projects"
-#~ msgstr "Projetos no Gitlab"
+# ~| msgid "Gitlab Projects"
+msgid "Public Projects"
+msgstr "Projetos no Gitlab"
 #, fuzzy
-#~| msgid "Gitlab Project"
-#~ msgid "New Project"
-#~ msgstr "Projeto no Gitlab"
+# ~| msgid "My Profile"
+msgid "Profile"
+msgstr "Meu Perfil"
+
+#, fuzzy
+# ~| msgid "Gitlab Project"
+msgid "New Project"
+msgstr "Projeto no Gitlab"
 #, fuzzy
-#~| msgid "Gitlab Projects"
-#~ msgid "Projects"
-#~ msgstr "Projetos no Gitlab"
+# ~| msgid "Gitlab Projects"
+msgid "Projects"
+msgstr "Projetos no Gitlab"
 #, fuzzy
-#~| msgid "Gitlab Issues"
-#~ msgid "Issues"
-#~ msgstr "Tíquetes no Gitlab"
+# ~| msgid "Gitlab Issues"
+msgid "Issues"
+msgstr "Tíquetes no Gitlab"
+
+#, fuzzy
+# ~| msgid "Gitlab Merge Requests"
+msgid "Merge Requests"
+msgstr "Envio de Contribuições no Gitlab"
+
+msgid "Social"
+msgstr "Social"
 #, fuzzy
-#~| msgid "Gitlab Merge Requests"
-#~ msgid "Merge Requests"
-#~ msgstr "Envio de Contribuições no Gitlab"
+# ~| msgid "Username"
+msgid "Users"
+msgstr "Usuário"
+
+msgid "Communities"
+msgstr "Comunidades"
+
+msgid "Control Panel"
+msgstr "Painel de Controle"
+
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields "
+"may be case-sensitive."
+msgstr ""
+"Por favor entre com um %(username)s e senha. Note que ambos os campos "
+"diferenciam letras maiúsculas de minúsculas"
-#~ msgid ""
-#~ "Please enter a correct %(username)s and password. Note that both fields "
-#~ "may be case-sensitive."
-#~ msgstr ""
-#~ "Por favor entre com um %(username)s e senha. Note que ambos os campos "
-#~ "diferenciam letras maiúsculas de minúsculas"
+msgid "This account is inactive."
+msgstr "Esta conta está inativa."
-#~ msgid "This account is inactive."
-#~ msgstr "Esta conta está inativa."
+msgid "Email"
+msgstr "Email"
-#~ msgid "Email"
-#~ msgstr "Email"
+msgid "New password"
+msgstr "Nova senha"
-#~ msgid "New password"
-#~ msgstr "Nova senha"
+msgid "New password confirmation"
+msgstr "Confirmar nova senha"
-#~ msgid "New password confirmation"
-#~ msgstr "Confirmar nova senha"
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Sua senha atual está incorreta. Por favor tente novamente."
-#~ msgid "Your old password was entered incorrectly. Please enter it again."
-#~ msgstr "Sua senha atual está incorreta. Por favor tente novamente."
+msgid "Old password"
+msgstr "Senha atual"
-#~ msgid "Old password"
-#~ msgstr "Senha atual"
+msgid "Password (again)"
+msgstr "Senha (novamente)"
-#~ msgid "Password (again)"
-#~ msgstr "Senha (novamente)"
+msgid "Enter a valid username."
+msgstr "Insira um nome de usuário válido."
-#~ msgid "Enter a valid username."
-#~ msgstr "Insira um nome de usuário válido."
+msgid "Gitlab Group"
+msgstr "Grupo no Gitlab"
-#~ msgid "Gitlab Group"
-#~ msgstr "Grupo no Gitlab"
+msgid "Gitlab Groups"
+msgstr "Grupos no Gitlab"
-#~ msgid "Gitlab Groups"
-#~ msgstr "Grupos no Gitlab"
+msgid "Gitlab Merge Request"
+msgstr "Envio de Contribuição no Gitlab"
-#~ msgid "Gitlab Merge Request"
-#~ msgstr "Envio de Contribuição no Gitlab"
+msgid "Gitlab Issue"
+msgstr "Tíquete no Gitlab"
-#~ msgid "Gitlab Issue"
-#~ msgstr "Tíquete no Gitlab"
+msgid "Gitlab Comments"
+msgstr "Comentários no Gitlab"
-#~ msgid "Gitlab Comments"
-#~ msgstr "Comentários no Gitlab"
+msgid "Community"
+msgstr "Comunidade"
-#~ msgid "Community"
-#~ msgstr "Comunidade"
+msgid "Article"
+msgstr "Artigo"
-#~ msgid "Article"
-#~ msgstr "Artigo"
+msgid "Articles"
+msgstr "Artigos"
-#~ msgid "Articles"
-#~ msgstr "Artigos"
+msgid "Author"
+msgstr "Autor"
-#~ msgid "Author"
-#~ msgstr "Autor"
+msgid "Modified by"
+msgstr "Modificado por"
-#~ msgid "Modified by"
-#~ msgstr "Modificado por"
+msgid "Status"
+msgstr "Status"
-#~ msgid "Status"
-#~ msgstr "Status"
+msgid "Mailinglist"
+msgstr "Lista de discussão"
-#~ msgid "Mailinglist"
-#~ msgstr "Lista de discussão"
+msgid "Milestone"
+msgstr "Marco"
-#~ msgid "Milestone"
-#~ msgstr "Marco"
+msgid "Priority"
+msgstr "Prioridade"
-#~ msgid "Priority"
-#~ msgstr "Prioridade"
+msgid "Component"
+msgstr "Componente"
-#~ msgid "Component"
-#~ msgstr "Componente"
+msgid "Severity"
+msgstr "Severidade"
-#~ msgid "Severity"
-#~ msgstr "Severidade"
+msgid "Reporter"
+msgstr "Relator"
-#~ msgid "Reporter"
-#~ msgstr "Relator"
+msgid "Keywords"
+msgstr "Palavras chave"
-#~ msgid "Keywords"
-#~ msgstr "Palavras chave"
+msgid "Collaborators"
+msgstr "Colaboradores"
-#~ msgid "Collaborators"
-#~ msgstr "Colaboradores"
+msgid "Repository"
+msgstr "Repositório"
-#~ msgid "Repository"
-#~ msgstr "Repositório"
+msgid "Used by"
+msgstr "Usado por"
-#~ msgid "Used by"
-#~ msgstr "Usado por"
+msgid "File type"
+msgstr "Tipo do arquivo"
-#~ msgid "File type"
-#~ msgstr "Tipo do arquivo"
+msgid "Size"
+msgstr "Tamanho"
-#~ msgid "Size"
-#~ msgstr "Tamanho"
+msgid "Paste"
+msgstr "Cole aqui"
-#~ msgid "Discussion"
-#~ msgstr "Discussão"
+msgid "Discussion"
+msgstr "Discussão"
-#~ msgid "Paste"
-#~ msgstr "Cole aqui"
+msgid "at"
+msgstr "às"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-01 13:15+0000\n"
+"POT-Creation-Date: 2015-12-11 14:07+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"
@@ -17,137 +17,158 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: super_archives/management/commands/import_emails.py:213
+#: colab/super_archives/filters.py:8
+#: colab/super_archives/templates/search/thread_search_preview.html:30
+msgid "Discussion"
+msgstr ""
+
+#: colab/super_archives/filters.py:11
+msgid "Author"
+msgstr ""
+
+#: colab/super_archives/filters.py:14
+msgid "Mailinglist"
+msgstr ""
+
+#: colab/super_archives/management/commands/import_emails.py:213
 msgid "[Colab] Warning - Email sent with a blank subject."
 msgstr ""
-#: super_archives/models.py:77
-#: super_archives/templates/message-preview.html:62
-#: super_archives/templates/message-thread.html:4
+#: colab/super_archives/models.py:77
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
+#: colab/super_archives/templates/message-thread.html:4
 msgid "Anonymous"
 msgstr ""
-#: super_archives/models.py:133
+#: colab/super_archives/models.py:149
 msgid "Mailing List"
 msgstr ""
-#: super_archives/models.py:134
+#: colab/super_archives/models.py:150
 msgid "The Mailing List where is the thread"
 msgstr ""
-#: super_archives/models.py:137
+#: colab/super_archives/models.py:153
 msgid "Latest message"
 msgstr ""
-#: super_archives/models.py:138
+#: colab/super_archives/models.py:154
 msgid "Latest message posted"
 msgstr ""
-#: super_archives/models.py:139
+#: colab/super_archives/models.py:155
 msgid "Score"
 msgstr ""
-#: super_archives/models.py:140
+#: colab/super_archives/models.py:156
 msgid "Thread score"
 msgstr ""
-#: super_archives/models.py:153
+#: colab/super_archives/models.py:169
 msgid "Thread"
 msgstr ""
-#: super_archives/models.py:154
+#: colab/super_archives/models.py:170
 msgid "Threads"
 msgstr ""
-#: super_archives/models.py:267
+#: colab/super_archives/models.py:283
 msgid "Subject"
 msgstr ""
-#: super_archives/models.py:268
+#: colab/super_archives/models.py:284
 msgid "Please enter a message subject"
 msgstr ""
-#: super_archives/models.py:271
+#: colab/super_archives/models.py:287
 msgid "Message body"
 msgstr ""
-#: super_archives/models.py:272
+#: colab/super_archives/models.py:288
 msgid "Please enter a message body"
 msgstr ""
-#: super_archives/models.py:282
+#: colab/super_archives/models.py:298
 msgid "Message"
 msgstr ""
-#: super_archives/models.py:283
+#: colab/super_archives/models.py:299
 msgid "Messages"
 msgstr ""
-#: super_archives/templates/message-preview.html:42
-#: super_archives/templates/message-preview.html:62
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:42
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
 msgid "by"
 msgstr ""
-#: super_archives/templates/message-preview.html:65
-#: super_archives/templates/message-thread.html:161
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:65
+#: colab/super_archives/templates/message-thread.html:161
 msgid "ago"
 msgstr ""
-#: super_archives/templates/message-thread.html:35
+#: colab/super_archives/templates/message-thread.html:35
 msgid "You must login before voting."
 msgstr ""
-#: super_archives/templates/message-thread.html:132
+#: colab/super_archives/templates/message-thread.html:132
 msgid "Order by"
 msgstr ""
-#: super_archives/templates/message-thread.html:136
+#: colab/super_archives/templates/message-thread.html:136
 msgid "Votes"
 msgstr ""
-#: super_archives/templates/message-thread.html:140
+#: colab/super_archives/templates/message-thread.html:140
 msgid "Date"
 msgstr ""
-#: super_archives/templates/message-thread.html:145
+#: colab/super_archives/templates/message-thread.html:145
 msgid "Related:"
 msgstr ""
-#: super_archives/templates/message-thread.html:156
+#: colab/super_archives/templates/message-thread.html:156
 msgid "Statistics:"
 msgstr ""
-#: super_archives/templates/message-thread.html:160
+#: colab/super_archives/templates/message-thread.html:160
 msgid "started at"
 msgstr ""
-#: super_archives/templates/message-thread.html:166
+#: colab/super_archives/templates/message-thread.html:166
 msgid "viewed"
 msgstr ""
-#: super_archives/templates/message-thread.html:167
-#: super_archives/templates/message-thread.html:172
-#: super_archives/templates/message-thread.html:177
+#: colab/super_archives/templates/message-thread.html:167
+#: colab/super_archives/templates/message-thread.html:172
+#: colab/super_archives/templates/message-thread.html:177
 msgid "times"
 msgstr ""
-#: super_archives/templates/message-thread.html:171
+#: colab/super_archives/templates/message-thread.html:171
 msgid "answered"
 msgstr ""
-#: super_archives/templates/message-thread.html:176
+#: colab/super_archives/templates/message-thread.html:176
 msgid "voted"
 msgstr ""
-#: super_archives/templates/message-thread.html:182
+#: colab/super_archives/templates/message-thread.html:182
 msgid "Tags:"
 msgstr ""
-#: super_archives/templates/superarchives/emails/email_blank_subject.txt:2
+#: colab/super_archives/templates/search/thread_search_preview.html:5
+msgid "at"
+msgstr ""
+
+#: colab/super_archives/templates/search/thread_search_preview.html:30
+msgid "Registred in"
+msgstr ""
+
+#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:2
 msgid "Hello"
 msgstr ""
-#: super_archives/templates/superarchives/emails/email_blank_subject.txt:3
+#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:3
 #, python-format
 msgid ""
 "\n"
@@ -161,109 +182,109 @@ msgid &quot;&quot;
 "Thank you.\n"
 msgstr ""
-#: super_archives/templates/superarchives/emails/email_verification.txt:2
+#: colab/super_archives/templates/superarchives/emails/email_verification.txt:2
 #, python-format
 msgid ""
 "Hey, we want to verify that you are indeed \"%(fullname)s (%(username)s)\".  "
 "If that's the case, please follow the link below:"
 msgstr ""
-#: super_archives/templates/superarchives/emails/email_verification.txt:6
+#: colab/super_archives/templates/superarchives/emails/email_verification.txt:6
 #, python-format
 msgid ""
 "If you're not %(username)s or didn't request verification you can ignore "
 "this email."
 msgstr ""
-#: super_archives/templates/superarchives/includes/message.html:17
-#: super_archives/templates/superarchives/includes/message.html:18
+#: colab/super_archives/templates/superarchives/includes/message.html:17
+#: colab/super_archives/templates/superarchives/includes/message.html:18
 msgid "Link to this message"
 msgstr ""
-#: super_archives/templates/superarchives/includes/message.html:46
+#: colab/super_archives/templates/superarchives/includes/message.html:46
 msgid "Reply"
 msgstr ""
-#: super_archives/templates/superarchives/includes/message.html:63
+#: colab/super_archives/templates/superarchives/includes/message.html:63
 msgid "Send a message"
 msgstr ""
-#: super_archives/templates/superarchives/includes/message.html:66
+#: colab/super_archives/templates/superarchives/includes/message.html:66
 msgid ""
 "After sending a message it will take few minutes before it shows up in here. "
 "Why don't you grab a coffee?"
 msgstr ""
-#: super_archives/templates/superarchives/includes/message.html:69
+#: colab/super_archives/templates/superarchives/includes/message.html:69
 msgid "Send"
 msgstr ""
-#: super_archives/templates/superarchives/thread-dashboard.html:4
-#: super_archives/templates/superarchives/thread-dashboard.html:7
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:4
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:7
 msgid "Groups"
 msgstr ""
-#: super_archives/templates/superarchives/thread-dashboard.html:14
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:13
 #, python-format
 msgid "%(number_of_users)s members"
 msgstr ""
-#: super_archives/templates/superarchives/thread-dashboard.html:20
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:19
 msgid "latest"
 msgstr ""
-#: super_archives/templates/superarchives/thread-dashboard.html:28
-#: super_archives/templates/superarchives/thread-dashboard.html:42
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:27
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:41
 msgid "more..."
 msgstr ""
-#: super_archives/templates/superarchives/thread-dashboard.html:34
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:33
 msgid "most relevant"
 msgstr ""
-#: super_archives/utils/email.py:14
+#: colab/super_archives/utils/email.py:14
 msgid "Please verify your email "
 msgstr ""
-#: super_archives/views.py:112
+#: colab/super_archives/views.py:113
 msgid "Error trying to connect to Mailman API"
 msgstr ""
-#: super_archives/views.py:115
+#: colab/super_archives/views.py:116
 msgid "Timeout trying to connect to Mailman API"
 msgstr ""
-#: super_archives/views.py:119
+#: colab/super_archives/views.py:120
 msgid ""
 "Your message was sent to this topic. It may take some minutes before it's "
 "delivered by email to the group. Why don't you breath some fresh air in the "
 "meanwhile?"
 msgstr ""
-#: super_archives/views.py:128
+#: colab/super_archives/views.py:129
 msgid "You cannot send an empty email"
 msgstr ""
-#: super_archives/views.py:130
+#: colab/super_archives/views.py:131
 msgid "Mailing list does not exist"
 msgstr ""
-#: super_archives/views.py:133
+#: colab/super_archives/views.py:134
 msgid "Unknown error trying to connect to Mailman API"
 msgstr ""
-#: super_archives/views.py:188
+#: colab/super_archives/views.py:170
 msgid ""
 "The email address you are trying to verify either has already been verified "
 "or does not exist."
 msgstr ""
-#: super_archives/views.py:199
+#: colab/super_archives/views.py:181
 msgid ""
 "The email address you are trying to verify is already an active email "
 "address."
 msgstr ""
-#: super_archives/views.py:213
+#: colab/super_archives/views.py:195
 msgid "Email address verified!"
 msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: colab\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-01 13:15+0000\n"
+"POT-Creation-Date: 2015-12-11 14:10+0000\n"
 "PO-Revision-Date: 2014-11-21 17:38+0000\n"
 "Last-Translator: Sergio Oliveira <seocam@seocam.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -19,137 +19,162 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: super_archives/management/commands/import_emails.py:213
+#: colab/super_archives/filters.py:8
+#: colab/super_archives/templates/search/thread_search_preview.html:30
+msgid "Discussion"
+msgstr ""
+
+#: colab/super_archives/filters.py:11
+msgid "Author"
+msgstr ""
+
+#: colab/super_archives/filters.py:14
+#, fuzzy
+#| msgid "Mailing List"
+msgid "Mailinglist"
+msgstr "Lista de discussão"
+
+#: colab/super_archives/management/commands/import_emails.py:213
 msgid "[Colab] Warning - Email sent with a blank subject."
 msgstr "[Colab] Atenção - Email enviado sem assunto."
-#: super_archives/models.py:77
-#: super_archives/templates/message-preview.html:62
-#: super_archives/templates/message-thread.html:4
+#: colab/super_archives/models.py:77
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
+#: colab/super_archives/templates/message-thread.html:4
 msgid "Anonymous"
 msgstr "Anônimo"
-#: super_archives/models.py:133
+#: colab/super_archives/models.py:149
 msgid "Mailing List"
 msgstr "Lista de discussão"
-#: super_archives/models.py:134
+#: colab/super_archives/models.py:150
 msgid "The Mailing List where is the thread"
 msgstr "Lista de emails da discussão"
-#: super_archives/models.py:137
+#: colab/super_archives/models.py:153
 msgid "Latest message"
 msgstr "Última mensagem"
-#: super_archives/models.py:138
+#: colab/super_archives/models.py:154
 msgid "Latest message posted"
 msgstr "Última mensagem enviada"
-#: super_archives/models.py:139
+#: colab/super_archives/models.py:155
 msgid "Score"
 msgstr "Pontuação"
-#: super_archives/models.py:140
+#: colab/super_archives/models.py:156
 msgid "Thread score"
 msgstr "Pontuação da discussão"
-#: super_archives/models.py:153
+#: colab/super_archives/models.py:169
 msgid "Thread"
 msgstr "Discussão"
-#: super_archives/models.py:154
+#: colab/super_archives/models.py:170
 msgid "Threads"
 msgstr "Discussões"
-#: super_archives/models.py:267
+#: colab/super_archives/models.py:283
 msgid "Subject"
 msgstr "Assuntos"
-#: super_archives/models.py:268
+#: colab/super_archives/models.py:284
 msgid "Please enter a message subject"
 msgstr "Por favor digite um assunto de email"
-#: super_archives/models.py:271
+#: colab/super_archives/models.py:287
 msgid "Message body"
 msgstr "Corpo do email"
-#: super_archives/models.py:272
+#: colab/super_archives/models.py:288
 msgid "Please enter a message body"
 msgstr "Por favor digite o corpo do email"
-#: super_archives/models.py:282
+#: colab/super_archives/models.py:298
 msgid "Message"
 msgstr "Mensagem"
-#: super_archives/models.py:283
+#: colab/super_archives/models.py:299
 msgid "Messages"
 msgstr "Mensagens"
-#: super_archives/templates/message-preview.html:42
-#: super_archives/templates/message-preview.html:62
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:42
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
 msgid "by"
 msgstr "por"
-#: super_archives/templates/message-preview.html:65
-#: super_archives/templates/message-thread.html:161
+#: colab/super_archives/templates/dashboard/thread_search_preview.html:65
+#: colab/super_archives/templates/message-thread.html:161
 msgid "ago"
 msgstr "atrás"
-#: super_archives/templates/message-thread.html:35
+#: colab/super_archives/templates/message-thread.html:35
 msgid "You must login before voting."
 msgstr "Você deve logar antes de votar."
-#: super_archives/templates/message-thread.html:132
+#: colab/super_archives/templates/message-thread.html:132
 msgid "Order by"
 msgstr "Ordenar por"
-#: super_archives/templates/message-thread.html:136
+#: colab/super_archives/templates/message-thread.html:136
 msgid "Votes"
 msgstr "Votos"
-#: super_archives/templates/message-thread.html:140
+#: colab/super_archives/templates/message-thread.html:140
 msgid "Date"
 msgstr "Data"
-#: super_archives/templates/message-thread.html:145
+#: colab/super_archives/templates/message-thread.html:145
 msgid "Related:"
 msgstr "Relacionado:"
-#: super_archives/templates/message-thread.html:156
+#: colab/super_archives/templates/message-thread.html:156
 msgid "Statistics:"
 msgstr "Estatísticas:"
-#: super_archives/templates/message-thread.html:160
+#: colab/super_archives/templates/message-thread.html:160
 msgid "started at"
 msgstr "iniciada em"
-#: super_archives/templates/message-thread.html:166
+#: colab/super_archives/templates/message-thread.html:166
 msgid "viewed"
 msgstr "vizualizada"
-#: super_archives/templates/message-thread.html:167
-#: super_archives/templates/message-thread.html:172
-#: super_archives/templates/message-thread.html:177
+#: colab/super_archives/templates/message-thread.html:167
+#: colab/super_archives/templates/message-thread.html:172
+#: colab/super_archives/templates/message-thread.html:177
 msgid "times"
 msgstr "vezes"
-#: super_archives/templates/message-thread.html:171
+#: colab/super_archives/templates/message-thread.html:171
 msgid "answered"
 msgstr "respondida"
-#: super_archives/templates/message-thread.html:176
+#: colab/super_archives/templates/message-thread.html:176
 msgid "voted"
 msgstr "votada"
-#: super_archives/templates/message-thread.html:182
+#: colab/super_archives/templates/message-thread.html:182
 msgid "Tags:"
 msgstr "Tags:"
-#: super_archives/templates/superarchives/emails/email_blank_subject.txt:2
+#: colab/super_archives/templates/search/thread_search_preview.html:5
+#, fuzzy
+#| msgid "Date"
+msgid "at"
+msgstr "Data"
+
+#: colab/super_archives/templates/search/thread_search_preview.html:30
+msgid "Registred in"
+msgstr ""
+
+#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:2
 msgid "Hello"
 msgstr "Olá"
-#: super_archives/templates/superarchives/emails/email_blank_subject.txt:3
+#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:3
 #, python-format
 msgid ""
 "\n"
@@ -172,7 +197,7 @@ msgstr &quot;&quot;
 "\n"
 "Obrigado.\n"
-#: super_archives/templates/superarchives/emails/email_verification.txt:2
+#: colab/super_archives/templates/superarchives/emails/email_verification.txt:2
 #, python-format
 msgid ""
 "Hey, we want to verify that you are indeed \"%(fullname)s (%(username)s)\".  "
@@ -181,7 +206,7 @@ msgstr &quot;&quot;
 "Ei, nós queremos verificar que você é realmente \"%(fullname)s "
 "(%(username)s)\". Se este for o caso, por favor clique no link abaixo:"
-#: super_archives/templates/superarchives/emails/email_verification.txt:6
+#: colab/super_archives/templates/superarchives/emails/email_verification.txt:6
 #, python-format
 msgid ""
 "If you're not %(username)s or didn't request verification you can ignore "
@@ -190,20 +215,20 @@ msgstr &quot;&quot;
 "Se você não é %(username)s ou não solicitou verificação apenas ignore este "
 "email."
-#: super_archives/templates/superarchives/includes/message.html:17
-#: super_archives/templates/superarchives/includes/message.html:18
+#: colab/super_archives/templates/superarchives/includes/message.html:17
+#: colab/super_archives/templates/superarchives/includes/message.html:18
 msgid "Link to this message"
 msgstr "Link para esta mensagem"
-#: super_archives/templates/superarchives/includes/message.html:46
+#: colab/super_archives/templates/superarchives/includes/message.html:46
 msgid "Reply"
 msgstr "Responder"
-#: super_archives/templates/superarchives/includes/message.html:63
+#: colab/super_archives/templates/superarchives/includes/message.html:63
 msgid "Send a message"
 msgstr "Enviar mensagem"
-#: super_archives/templates/superarchives/includes/message.html:66
+#: colab/super_archives/templates/superarchives/includes/message.html:66
 msgid ""
 "After sending a message it will take few minutes before it shows up in here. "
 "Why don't you grab a coffee?"
@@ -211,46 +236,46 @@ msgstr &quot;&quot;
 "Após enviar uma mensagem pode levar alguns minutos até que ela seja exibida "
 "aqui. Por que você não busca um café enquanto isso?"
-#: super_archives/templates/superarchives/includes/message.html:69
+#: colab/super_archives/templates/superarchives/includes/message.html:69
 msgid "Send"
 msgstr "Enviar"
-#: super_archives/templates/superarchives/thread-dashboard.html:4
-#: super_archives/templates/superarchives/thread-dashboard.html:7
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:4
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:7
 msgid "Groups"
 msgstr "Grupos"
-#: super_archives/templates/superarchives/thread-dashboard.html:14
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:13
 #, python-format
 msgid "%(number_of_users)s members"
 msgstr "%(number_of_users)s membros"
-#: super_archives/templates/superarchives/thread-dashboard.html:20
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:19
 msgid "latest"
 msgstr "última"
-#: super_archives/templates/superarchives/thread-dashboard.html:28
-#: super_archives/templates/superarchives/thread-dashboard.html:42
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:27
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:41
 msgid "more..."
 msgstr "mais..."
-#: super_archives/templates/superarchives/thread-dashboard.html:34
+#: colab/super_archives/templates/superarchives/thread-dashboard.html:33
 msgid "most relevant"
 msgstr "Mais relevante"
-#: super_archives/utils/email.py:14
+#: colab/super_archives/utils/email.py:14
 msgid "Please verify your email "
 msgstr "Por favor verifique seu email"
-#: super_archives/views.py:112
+#: colab/super_archives/views.py:113
 msgid "Error trying to connect to Mailman API"
 msgstr "Erro tentando conectar à API do Mailman"
-#: super_archives/views.py:115
+#: colab/super_archives/views.py:116
 msgid "Timeout trying to connect to Mailman API"
 msgstr "Tempo excedido tentando conectar à API do Mailman"
-#: super_archives/views.py:119
+#: colab/super_archives/views.py:120
 msgid ""
 "Your message was sent to this topic. It may take some minutes before it's "
 "delivered by email to the group. Why don't you breath some fresh air in the "
@@ -260,19 +285,19 @@ msgstr &quot;&quot;
 "minutos até que ela seja enviada por email para o grupo. Por que você não "
 "respira um ar fresco enquanto isso?"
-#: super_archives/views.py:128
+#: colab/super_archives/views.py:129
 msgid "You cannot send an empty email"
 msgstr "Você não pode enviar um email vazio"
-#: super_archives/views.py:130
+#: colab/super_archives/views.py:131
 msgid "Mailing list does not exist"
 msgstr "Lista de email inexistente"
-#: super_archives/views.py:133
+#: colab/super_archives/views.py:134
 msgid "Unknown error trying to connect to Mailman API"
 msgstr "Erro desconhecido tentando conectar à API do Mailman"
-#: super_archives/views.py:188
+#: colab/super_archives/views.py:170
 msgid ""
 "The email address you are trying to verify either has already been verified "
 "or does not exist."
@@ -280,12 +305,12 @@ msgstr &quot;&quot;
 "O email que você está tentando verificar não existe ou já foi verificado "
 "anteriormente. "
-#: super_archives/views.py:199
+#: colab/super_archives/views.py:181
 msgid ""
 "The email address you are trying to verify is already an active email "
 "address."
 msgstr "O email que você está tentando verificar já é um email ativo."
-#: super_archives/views.py:213
+#: colab/super_archives/views.py:195
 msgid "Email address verified!"
 msgstr "Endereço de email verificado!"
-{% load i18n tz highlight date_format %}
+{% load i18n tz highlight %}
 <div class="row">
   <div class="col-md-12">
-    <small>{% datetime_format result.modified %} -
+    <small>{{ result.modified|date:"d F Y" }} {% trans "at" %} {{result.modified|date:"h:m" }} -
         {% if query %}
             <a href="{{result.modified_by_url}}">{% highlight result.modified_by with query max_length "1000" %}</a>
1	-{% load i18n tz highlight gravatar date_format %}	1	+{% load i18n tz highlight gravatar %}
2		2
3	<div class="row">	3	<div class="row">
4	<div class="col-md-2 center">	4	<div class="col-md-2 center">
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	{% endif %}	16	{% endif %}
17		17
18	</strong>	18	</strong>
19	- <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>	19	+ <small><strong>{% trans "Since" %}: {{ result.date_joined\|date:"d F Y" }}</strong></small><br>
20	<small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>	20	<small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
21	</div>	21	</div>
22	</div>	22	</div>
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-from django import template
2	-from django.utils.translation import ugettext as _
3	-register = template.Library()
4	-
5	-
6	-@register.simple_tag(takes_context=True)
7	-def date_format(context, date):
8	- formatted_date = _('%(m)s %(d)s %(y)s' % {'m': date.strftime('%B'),
9	- 'd': date.day,
10	- 'y': date.year})
11	- return formatted_date
12	-
13	-
14	-@register.simple_tag(takes_context=True)
15	-def datetime_format(context, date):
16	- formatted_date = date_format(context, date)
17	- formatted_time = _('%(hour)s:%(min)s' % {'hour': date.hour,
18	- 'min': date.strftime('%I')})
19	- formatted_datetime = _('%s at %s' % (formatted_date, formatted_time))
20	- return formatted_datetime
1	-{% load i18n tz highlight date_format %}	1	+{% load i18n tz highlight %}
2		2
3	<div class="row">	3	<div class="row">
4	<div class="col-md-12">	4	<div class="col-md-12">
5	- <small>{% datetime_format result.modified %} -	5	+ <small>{{ result.modified\|date:"d F Y" }} {% trans "at" %} {{result.modified\|date:"h:m" }} -
6		6
7	{% if query %}	7	{% if query %}
8	<a href="{{result.modified_by_url}}">{% highlight result.modified_by with query max_length "1000" %}</a>	8	<a href="{{result.modified_by_url}}">{% highlight result.modified_by with query max_length "1000" %}</a>