diff --git a/colab/locale/en/LC_MESSAGES/django.mo b/colab/locale/en/LC_MESSAGES/django.mo
index 8b061e3..5c2f8c4 100644
Binary files a/colab/locale/en/LC_MESSAGES/django.mo and b/colab/locale/en/LC_MESSAGES/django.mo differ
diff --git a/colab/locale/en/LC_MESSAGES/django.po b/colab/locale/en/LC_MESSAGES/django.po
index d55d2fe..1811198 100644
--- a/colab/locale/en/LC_MESSAGES/django.po
+++ b/colab/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 17:05+0000\n"
+"POT-Creation-Date: 2015-05-25 19:01+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,60 +17,118 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: accounts/admin.py:40
+#: accounts/admin.py:18
 msgid "Personal info"
 msgstr ""
 
-#: accounts/admin.py:43
+#: accounts/admin.py:24
 msgid "Permissions"
 msgstr ""
 
-#: accounts/admin.py:45
+#: accounts/admin.py:28
 msgid "Important dates"
 msgstr ""
 
-#: accounts/forms.py:25
+#: accounts/forms.py:37
 msgid "Social account does not exist"
 msgstr ""
 
-#: accounts/forms.py:61 accounts/templates/accounts/user_detail.html:38
+#: accounts/forms.py:65 accounts/forms.py:71 accounts/forms.py:77
+msgid "This field cannot be blank."
+msgstr ""
+
+#: accounts/forms.py:118 accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr ""
 
-#: accounts/forms.py:62
+#: accounts/forms.py:119
 msgid "Write something about you in 200 characters or less."
 msgstr ""
 
-#: accounts/forms.py:81
+#: accounts/forms.py:147
 msgid "Mailing lists"
 msgstr ""
 
-#: accounts/forms.py:88
+#: accounts/forms.py:154 accounts/forms.py:207 accounts/forms.py:261
+#: accounts/forms.py:298 accounts/forms.py:488
 msgid "Password"
 msgstr ""
 
-#: accounts/forms.py:90
+#: accounts/forms.py:156 accounts/forms.py:209
 msgid "Password confirmation"
 msgstr ""
 
-#: accounts/forms.py:92
-msgid "Enter the same password as above, for verification."
+#: accounts/forms.py:177
+msgid "Password mismatch"
 msgstr ""
 
-#: accounts/forms.py:110
-msgid "Password mismatch"
+#: accounts/forms.py:195
+msgid "A user with that username already exists."
+msgstr ""
+
+#: accounts/forms.py:196 accounts/forms.py:422 accounts/forms.py:486
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: accounts/forms.py:198 accounts/forms.py:255 search/forms.py:37
+msgid "Username"
+msgstr ""
+
+#: accounts/forms.py:256
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: accounts/forms.py:259
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: accounts/forms.py:262
+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 "
+"form</a>."
 msgstr ""
 
-#: accounts/management/commands/delete_invalid.py:42
+#: accounts/forms.py:301
 #, python-format
-msgid "%(count)s users deleted."
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: accounts/forms.py:303
+msgid "This account is inactive."
+msgstr ""
+
+#: accounts/forms.py:366
+msgid "Email"
+msgstr ""
+
+#: accounts/forms.py:424
+msgid "New password"
+msgstr ""
+
+#: accounts/forms.py:426
+msgid "New password confirmation"
+msgstr ""
+
+#: accounts/forms.py:457
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: accounts/forms.py:460
+msgid "Old password"
+msgstr ""
+
+#: accounts/forms.py:490
+msgid "Password (again)"
 msgstr ""
 
-#: accounts/models.py:65
+#: accounts/models.py:85
 msgid "Required. 30 characters or fewer. Letters, digits and ./+/-/_ only."
 msgstr ""
 
-#: accounts/models.py:70
+#: accounts/models.py:90
 msgid "Enter a valid username."
 msgstr ""
 
@@ -79,8 +137,12 @@ msgid "Change XMPP Client and SVN Password"
 msgstr ""
 
 #: accounts/templates/accounts/change_password.html:17
-#: accounts/templates/accounts/user_update_form.html:188
-#: accounts/templates/accounts/user_update_form.html:195
+#: accounts/templates/accounts/user_update_form.html:186
+#: accounts/templates/accounts/user_update_form.html:190
+#: accounts/templates/accounts/user_update_form.html:202
+#: accounts/templates/accounts/user_update_form.html:209
+#: accounts/templates/registration/password_change_form_custom.html:26
+#: accounts/templates/registration/password_reset_confirm_custom.html:28
 msgid "Change Password"
 msgstr ""
 
@@ -88,8 +150,11 @@ msgstr ""
 msgid "To login please click in the link below:"
 msgstr ""
 
-#: accounts/templates/accounts/login.html:8 templates/base.html:182
-#: templates/base.html.py:187
+#: accounts/templates/accounts/login.html:8
+#: accounts/templates/registration/login.html:34
+#: accounts/templates/registration/login.html:54 templates/header.html:37
+#: templates/header.html.py:42 templates/header.html:46
+#: templates/header.html.py:51
 msgid "Login"
 msgstr ""
 
@@ -106,7 +171,11 @@ msgid "Sign up"
 msgstr ""
 
 #: accounts/templates/accounts/user_create_form.html:10
-msgid "Please correct the errors below and try again"
+#: accounts/templates/registration/login.html:14
+#: accounts/templates/registration/password_change_form_custom.html:12
+#: accounts/templates/registration/password_reset_confirm_custom.html:14
+#: accounts/templates/registration/password_reset_form_custom.html:9
+msgid "Please correct the errors below and try again."
 msgstr ""
 
 #: accounts/templates/accounts/user_create_form.html:17
@@ -122,7 +191,7 @@ msgid "Subscribe to groups"
 msgstr ""
 
 #: accounts/templates/accounts/user_create_form.html:60
-#: templates/base.html:181 templates/base.html.py:186
+#: templates/header.html:41 templates/header.html.py:50
 msgid "Register"
 msgstr ""
 
@@ -143,63 +212,63 @@ msgstr ""
 msgid "group membership"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:65
+#: accounts/templates/accounts/user_detail.html:66
 msgid "Twitter account"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:68
+#: accounts/templates/accounts/user_detail.html:69
 msgid "Facebook account"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:73
+#: accounts/templates/accounts/user_detail.html:74
 msgid "Google talk account"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:77
+#: accounts/templates/accounts/user_detail.html:78
 msgid "Github account"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:81
+#: accounts/templates/accounts/user_detail.html:82
 msgid "Personal webpage"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:87
+#: accounts/templates/accounts/user_detail.html:89
 msgid "Groups: "
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:100
+#: accounts/templates/accounts/user_detail.html:102
 msgid "Collaborations by Type"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:116
+#: accounts/templates/accounts/user_detail.html:118
 msgid "Participation by Group"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:132 badger/models.py:69
+#: accounts/templates/accounts/user_detail.html:134 badger/models.py:69
 msgid "Badges"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:151
+#: accounts/templates/accounts/user_detail.html:153
 msgid "Latest posted"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:156
+#: accounts/templates/accounts/user_detail.html:158
 msgid "There are no posts by this user so far."
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:160
+#: accounts/templates/accounts/user_detail.html:162
 msgid "View more posts..."
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:166
+#: accounts/templates/accounts/user_detail.html:168
 msgid "Latest contributions"
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:171
+#: accounts/templates/accounts/user_detail.html:173
 msgid "No contributions of this user so far."
 msgstr ""
 
-#: accounts/templates/accounts/user_detail.html:175
+#: accounts/templates/accounts/user_detail.html:177
 msgid "View more contributions..."
 msgstr ""
 
@@ -219,7 +288,7 @@ msgstr ""
 msgid "Change your avatar at Gravatar.com"
 msgstr ""
 
-#: accounts/templates/accounts/user_update_form.html:142 search/utils.py:8
+#: accounts/templates/accounts/user_update_form.html:142 search/utils.py:51
 msgid "Emails"
 msgstr ""
 
@@ -260,7 +329,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: accounts/templates/accounts/user_update_form.html:193
+#: accounts/templates/accounts/user_update_form.html:207
 msgid ""
 "This feature is available only for those who need to change the password for "
 "some reason as having an old user with the same username, forgot your "
@@ -269,33 +338,68 @@ msgid ""
 "what you are doing."
 msgstr ""
 
-#: accounts/templates/accounts/user_update_form.html:203
+#: accounts/templates/accounts/user_update_form.html:217
 msgid "Update"
 msgstr ""
 
-#: accounts/views.py:148
-msgid "Your profile has been created!"
+#: accounts/templates/registration/login.html:10
+#: accounts/templates/registration/password_change_form_custom.html:10
+#: accounts/templates/registration/password_reset_confirm_custom.html:12
+msgid "Please correct the error below and try again."
+msgstr ""
+
+#: accounts/templates/registration/login.html:56
+msgid "Forgot Password?"
+msgstr ""
+
+#: accounts/templates/registration/password_change_form_custom.html:54
+#: accounts/templates/registration/password_reset_confirm_custom.html:51
+msgid "Change my password"
+msgstr ""
+
+#: accounts/templates/registration/password_reset_confirm_custom.html:3
+msgid "Setting New password"
 msgstr ""
 
-#: accounts/views.py:149
+#: accounts/templates/registration/password_reset_form_custom.html:23
 msgid ""
-"You must login to validated your profile. Profiles not validated are deleted "
-"in 24h."
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: accounts/templates/registration/password_reset_form_custom.html:26
+msgid "Email address:"
+msgstr ""
+
+#: accounts/templates/registration/password_reset_form_custom.html:37
+msgid "Reset password"
 msgstr ""
 
-#: accounts/views.py:233
+#: accounts/views.py:157
+msgid "Your profile has been created!"
+msgstr ""
+
+#: accounts/views.py:241
 msgid "Could not change your password. Please, try again later."
 msgstr ""
 
-#: accounts/views.py:242
+#: accounts/views.py:250
 msgid "You've changed your password successfully!"
 msgstr ""
 
-#: badger/forms.py:19 badger/models.py:39 settings.py:160
+#: accounts/views.py:256
+msgid "Your password was changed."
+msgstr ""
+
+#: accounts/views.py:272
+msgid "Your password has been set. You may go ahead and log in now."
+msgstr ""
+
+#: badger/forms.py:17 badger/models.py:39 settings.py:162
 msgid "Image"
 msgstr ""
 
-#: badger/forms.py:30
+#: badger/forms.py:28
 msgid "You must add an Image"
 msgstr ""
 
@@ -344,7 +448,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: badger/models.py:40 search/forms.py:18
+#: badger/models.py:40 search/forms.py:17
 msgid "Type"
 msgstr ""
 
@@ -372,10 +476,121 @@ msgstr ""
 msgid "Badge"
 msgstr ""
 
-#: home/context_processors.py:15
+#: home/context_processors.py:20
 msgid "Fork me!"
 msgstr ""
 
+#: proxy/gitlab/apps.py:12 proxy/jenkins/apps.py:12 proxy/trac/apps.py:12
+#: settings.py:159
+msgid "Code"
+msgstr ""
+
+#: proxy/gitlab/apps.py:14
+msgid "Public Projects"
+msgstr ""
+
+#: proxy/gitlab/apps.py:17 proxy/noosfero/apps.py:18
+msgid "Profile"
+msgstr ""
+
+#: proxy/gitlab/apps.py:18
+msgid "New Project"
+msgstr ""
+
+#: proxy/gitlab/apps.py:19
+msgid "Projects"
+msgstr ""
+
+#: proxy/gitlab/apps.py:20 templates/header.html:21
+msgid "Groups"
+msgstr ""
+
+#: proxy/gitlab/apps.py:21
+msgid "Issues"
+msgstr ""
+
+#: proxy/gitlab/apps.py:22
+msgid "Merge Requests"
+msgstr ""
+
+#: proxy/gitlab/models.py:23
+msgid "Gitlab Project"
+msgstr ""
+
+#: proxy/gitlab/models.py:24
+msgid "Gitlab Projects"
+msgstr ""
+
+#: proxy/gitlab/models.py:59
+msgid "Gitlab Merge Request"
+msgstr ""
+
+#: proxy/gitlab/models.py:60
+msgid "Gitlab Merge Requests"
+msgstr ""
+
+#: proxy/gitlab/models.py:87
+msgid "Gitlab Issue"
+msgstr ""
+
+#: proxy/gitlab/models.py:88
+msgid "Gitlab Issues"
+msgstr ""
+
+#: proxy/gitlab/models.py:142 proxy/gitlab/models.py:143
+msgid "Gitlab Comments"
+msgstr ""
+
+#: proxy/jenkins/apps.py:14
+msgid "Continuos Integration"
+msgstr ""
+
+#: proxy/noosfero/apps.py:12
+msgid "Social"
+msgstr ""
+
+#: proxy/noosfero/apps.py:14
+msgid "Users"
+msgstr ""
+
+#: proxy/noosfero/apps.py:15
+msgid "Communities"
+msgstr ""
+
+#: proxy/noosfero/apps.py:19
+msgid "Control panel"
+msgstr ""
+
+#: proxy/trac/apps.py:14
+msgid "Timeline"
+msgstr ""
+
+#: proxy/trac/apps.py:15
+#: search/templates/search/includes/search_filters.html:118
+#: templates/open-data.html:130
+msgid "Wiki"
+msgstr ""
+
+#: proxy/trac/apps.py:16
+msgid "View Tickets"
+msgstr ""
+
+#: proxy/trac/apps.py:17
+msgid "Roadmap"
+msgstr ""
+
+#: proxy/trac/apps.py:18
+msgid "Browse Source"
+msgstr ""
+
+#: proxy/trac/apps.py:21
+msgid "New Ticket"
+msgstr ""
+
+#: proxy/trac/apps.py:22
+msgid "New Wiki Page"
+msgstr ""
+
 #: rss/feeds.py:13
 msgid "Latest Discussions"
 msgstr ""
@@ -388,102 +603,98 @@ msgstr ""
 msgid "Latest collaborations"
 msgstr ""
 
-#: search/forms.py:16 search/templates/search/search.html:46
-#: templates/base.html:171
+#: search/forms.py:15 search/templates/search/search.html:46
+#: templates/header.html:27
 msgid "Search"
 msgstr ""
 
-#: search/forms.py:19 search/views.py:22
+#: search/forms.py:18 search/views.py:22
 msgid "Author"
 msgstr ""
 
-#: search/forms.py:20
+#: search/forms.py:19
 msgid "Modified by"
 msgstr ""
 
-#: search/forms.py:22
+#: search/forms.py:21
 msgid "Status"
 msgstr ""
 
-#: search/forms.py:26 search/views.py:25
+#: search/forms.py:25 search/views.py:25
 msgid "Mailinglist"
 msgstr ""
 
-#: search/forms.py:30
+#: search/forms.py:29
 msgid "Milestone"
 msgstr ""
 
-#: search/forms.py:31
+#: search/forms.py:30
 msgid "Priority"
 msgstr ""
 
-#: search/forms.py:32
+#: search/forms.py:31
 msgid "Component"
 msgstr ""
 
-#: search/forms.py:33
+#: search/forms.py:32
 msgid "Severity"
 msgstr ""
 
-#: search/forms.py:34
+#: search/forms.py:33
 msgid "Reporter"
 msgstr ""
 
-#: search/forms.py:35
+#: search/forms.py:34
 msgid "Keywords"
 msgstr ""
 
-#: search/forms.py:36
+#: search/forms.py:35
 msgid "Collaborators"
 msgstr ""
 
-#: search/forms.py:37 templates/base.html:103
+#: search/forms.py:36
 msgid "Repository"
 msgstr ""
 
 #: search/forms.py:38
-msgid "Username"
-msgstr ""
-
-#: search/forms.py:39
 msgid "Name"
 msgstr ""
 
-#: search/forms.py:40
+#: search/forms.py:39
 msgid "Institution"
 msgstr ""
 
-#: search/forms.py:41
+#: search/forms.py:40
 msgid "Role"
 msgstr ""
 
-#: search/forms.py:42 search/templates/search/includes/search_filters.html:154
+#: search/forms.py:41 search/templates/search/includes/search_filters.html:154
 #: search/templates/search/includes/search_filters.html:156
 #: search/templates/search/includes/search_filters.html:188
 #: search/templates/search/includes/search_filters.html:189
 msgid "Since"
 msgstr ""
 
-#: search/forms.py:43 search/templates/search/includes/search_filters.html:163
+#: search/forms.py:42 search/templates/search/includes/search_filters.html:163
 #: search/templates/search/includes/search_filters.html:165
 #: search/templates/search/includes/search_filters.html:192
 #: search/templates/search/includes/search_filters.html:193
 msgid "Until"
 msgstr ""
 
-#: search/forms.py:44
+#: search/forms.py:43
 msgid "Filename"
 msgstr ""
 
-#: search/forms.py:45
+#: search/forms.py:44
 msgid "Used by"
 msgstr ""
 
-#: search/forms.py:46
+#: search/forms.py:45
 msgid "File type"
 msgstr ""
 
-#: search/forms.py:47
+#: search/forms.py:46
 msgid "Size"
 msgstr ""
 
@@ -508,11 +719,6 @@ msgstr ""
 msgid "Types"
 msgstr ""
 
-#: search/templates/search/includes/search_filters.html:118 search/utils.py:7
-#: templates/open-data.html:130
-msgid "Wiki"
-msgstr ""
-
 #: search/templates/search/includes/search_filters.html:126
 msgid "Changeset"
 msgstr ""
@@ -554,83 +760,71 @@ msgstr ""
 msgid "You are searching for"
 msgstr ""
 
-#: search/utils.py:9 settings.py:157
-msgid "Code"
-msgstr ""
-
-#: search/utils.py:10
-msgid "Tickets"
-msgstr ""
-
-#: search/utils.py:11
-msgid "Attachments"
-msgstr ""
-
-#: settings.py:115
+#: settings.py:117
 msgid "English"
 msgstr ""
 
-#: settings.py:116
+#: settings.py:118
 msgid "Portuguese"
 msgstr ""
 
-#: settings.py:117
+#: settings.py:119
 msgid "Spanish"
 msgstr ""
 
-#: settings.py:140
+#: settings.py:142
 msgid "Recent activity"
 msgstr ""
 
-#: settings.py:144
+#: settings.py:146
 msgid "Relevance"
 msgstr ""
 
-#: settings.py:153
+#: settings.py:155
 msgid "Document"
 msgstr ""
 
-#: settings.py:155
+#: settings.py:157
 msgid "Presentation"
 msgstr ""
 
-#: settings.py:156
+#: settings.py:158
 msgid "Text"
 msgstr ""
 
-#: settings.py:159
+#: settings.py:161
 msgid "Compressed"
 msgstr ""
 
-#: settings.py:162
+#: settings.py:164
 msgid "Spreadsheet"
 msgstr ""
 
-#: settings.py:254
+#: settings.py:262
 msgid "Planet Colab"
 msgstr ""
 
-#: settings.py:255
+#: settings.py:263
 msgid "Colab blog aggregator"
 msgstr ""
 
-#: settings.py:288
+#: settings.py:297
 msgid "One Time Snippet"
 msgstr ""
 
-#: settings.py:289
+#: settings.py:298
 msgid "In one hour"
 msgstr ""
 
-#: settings.py:290
+#: settings.py:299
 msgid "In one week"
 msgstr ""
 
-#: settings.py:291
+#: settings.py:300
 msgid "In one month"
 msgstr ""
 
-#: settings.py:292
+#: settings.py:301
 msgid "Never"
 msgstr ""
 
@@ -642,112 +836,176 @@ msgstr ""
 msgid "Ooopz... something went wrong!"
 msgstr ""
 
-#: templates/base.html:87
-msgid "Timeline"
+#: templates/base.html:82
+msgid "The login has failed. Please, try again."
 msgstr ""
 
-#: templates/base.html:92 templates/base.html.py:110
-msgid "Groups"
+#: templates/dpaste/snippet_details.html:37
+msgid "Compare"
 msgstr ""
 
-#: templates/base.html:97
-msgid "Blogs"
+#: templates/dpaste/snippet_details.html:47
+#, python-format
+msgid "Expires in: %(date)s"
 msgstr ""
 
-#: templates/base.html:105
-msgid "Public Projects"
+#: templates/dpaste/snippet_details.html:49
+msgid "Snippet never expires"
 msgstr ""
 
-#: templates/base.html:107 templates/base.html.py:136
-msgid "Profile"
+#: templates/dpaste/snippet_details.html:51
+msgid "One-time snippet"
 msgstr ""
 
-#: templates/base.html:108
-msgid "New Project"
+#: templates/dpaste/snippet_details.html:56
+msgid "Really delete this snippet?"
 msgstr ""
 
-#: templates/base.html:109
-msgid "Projects"
+#: templates/dpaste/snippet_details.html:58
+msgid "Delete Now"
 msgstr ""
 
-#: templates/base.html:111
-msgid "Issues"
+#: templates/dpaste/snippet_details.html:63
+#: templates/dpaste/snippet_details.html:65
+msgid "Compare Snippets"
 msgstr ""
 
-#: templates/base.html:112
-msgid "Merge Requests"
+#: templates/dpaste/snippet_details.html:69
+#: templates/dpaste/snippet_details.html:71
+msgid "View Raw"
 msgstr ""
 
-#: templates/base.html:120
-msgid "Social"
+#: templates/dpaste/snippet_details.html:75
+msgid "Gist"
 msgstr ""
 
-#: templates/base.html:125
-msgid "Users"
+#: templates/dpaste/snippet_details.html:88
+msgid "This is a one-time snippet."
 msgstr ""
 
-#: templates/base.html:130
-msgid "Communities"
+#: templates/dpaste/snippet_details.html:90
+msgid "It will automatically get deleted after {{ remaining }} further views."
 msgstr ""
 
-#: templates/base.html:141
-msgid "Control panel"
+#: templates/dpaste/snippet_details.html:92
+msgid "It will automatically get deleted after the next view."
 msgstr ""
 
-#: templates/base.html:150
-msgid "Contribute"
+#: templates/dpaste/snippet_details.html:94
+msgid "It cannot be viewed again."
 msgstr ""
 
-#: templates/base.html:154
-msgid "New Wiki Page"
+#: templates/dpaste/snippet_details.html:109
+msgid "Reply to this snippet"
 msgstr ""
 
-#: templates/base.html:156
-msgid "View Tickets"
+#: templates/dpaste/snippet_diff.html:5
+#, python-format
+msgid ""
+"\n"
+"    Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href="
+"\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
+"    "
 msgstr ""
 
-#: templates/base.html:158
-msgid "New Ticket"
+#: templates/dpaste/snippet_form.html:28
+msgid "Paste it"
 msgstr ""
 
-#: templates/base.html:160
-msgid "Roadmap"
+#: templates/footer.html:8
+msgid "Back to top"
 msgstr ""
 
-#: templates/base.html:163
-msgid "Browse Source"
+#: templates/footer.html:15
+msgid "Subjects"
 msgstr ""
 
-#: templates/base.html:165
-msgid "Continuous Integration"
+#: templates/footer.html:16
+msgid "SPB"
 msgstr ""
 
-#: templates/base.html:201
-msgid "My Profile"
+#: templates/footer.html:17
+msgid "SISP-SPB"
 msgstr ""
 
-#: templates/base.html:202
-msgid "Logout"
+#: templates/footer.html:18
+msgid "AvaliaSPB"
 msgstr ""
 
-#: templates/base.html:214 templates/base.html.py:217
-msgid "Search here..."
+#: templates/footer.html:20
+msgid "5cQualiBr"
 msgstr ""
 
-#: templates/base.html:231
-msgid "The login has failed. Please, try again."
+#: templates/footer.html:23
+msgid "Services"
+msgstr ""
+
+#: templates/footer.html:25
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#: templates/footer.html:28
+msgid "Contact"
 msgstr ""
 
-#: templates/base.html:256
-msgid "Last email imported at"
+#: templates/footer.html:31
+msgid " [Denomination's] services"
 msgstr ""
 
-#: templates/base.html:263
-msgid "The contents of this site is published under license"
+#: templates/footer.html:34
+msgid "Open data"
 msgstr ""
 
-#: templates/base.html:266
-msgid "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
+#: templates/footer.html:37
+msgid "Press area"
+msgstr ""
+
+#: templates/footer.html:41
+msgid "Social networks"
+msgstr ""
+
+#: templates/footer.html:57
+msgid "What is it?"
+msgstr ""
+
+#: templates/footer.html:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/footer.html:61
+msgid "Navigation"
+msgstr ""
+
+#: templates/footer.html:62
+msgid "Accessibility"
+msgstr ""
+
+#: templates/footer.html:63
+msgid "Site map"
+msgstr ""
+
+#: templates/footer.html:73
+msgid "Information access"
+msgstr ""
+
+#: templates/footer.html:76
+msgid "Republic Presidency General Secretary"
+msgstr ""
+
+#: templates/footer.html:76
+msgid "Brazil - Federal Government"
+msgstr ""
+
+#: templates/header.html:65
+msgid "My Profile"
+msgstr ""
+
+#: templates/header.html:66 templates/header.html.py:70
+msgid "Logout"
+msgstr ""
+
+#: templates/header.html:82 templates/header.html.py:85
+msgid "Search here..."
 msgstr ""
 
 #: templates/home.html:17
diff --git a/colab/locale/pt_BR/LC_MESSAGES/django.mo b/colab/locale/pt_BR/LC_MESSAGES/django.mo
index 7bf52d2..99df02e 100644
Binary files a/colab/locale/pt_BR/LC_MESSAGES/django.mo and b/colab/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/colab/locale/pt_BR/LC_MESSAGES/django.po b/colab/locale/pt_BR/LC_MESSAGES/django.po
index 2dfc1f8..3082682 100644
--- a/colab/locale/pt_BR/LC_MESSAGES/django.po
+++ b/colab/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: colab\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-21 13:55+0000\n"
+"POT-Creation-Date: 2015-05-25 19:01+0000\n"
 "PO-Revision-Date: 2014-11-21 17:31+0000\n"
 "Last-Translator: Sergio Oliveira <seocam@seocam.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -19,273 +19,333 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: colab/accounts/admin.py:40
+#: accounts/admin.py:18
 msgid "Personal info"
 msgstr "Informações Pessoais"
 
-#: colab/accounts/admin.py:43
+#: accounts/admin.py:24
 msgid "Permissions"
 msgstr "Permissões"
 
-#: colab/accounts/admin.py:45
+#: accounts/admin.py:28
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: colab/accounts/forms.py:25
+#: accounts/forms.py:37
 msgid "Social account does not exist"
 msgstr "Conta social não existe"
 
-#: colab/accounts/forms.py:61
+#: accounts/forms.py:65 accounts/forms.py:71 accounts/forms.py:77
 msgid "This field cannot be blank."
 msgstr ""
 
-#: colab/accounts/forms.py:67 colab/accounts/forms.py:128
-msgid "Password"
-msgstr "Senha"
-
-#: colab/accounts/forms.py:68
-msgid "Confirm Password "
-msgstr "Confirmar senha"
-
-#: colab/accounts/forms.py:79
-msgid "The two password fields didn't match."
-msgstr ""
-
-#: colab/accounts/forms.py:96
-#: colab/accounts/templates/accounts/user_detail.html:38
+#: accounts/forms.py:118 accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr "Bio"
 
-#: colab/accounts/forms.py:97
+#: accounts/forms.py:119
 msgid "Write something about you in 200 characters or less."
 msgstr "Escreva algo sobre você em 200 caracteres ou menos."
 
-#: colab/accounts/forms.py:121
+#: accounts/forms.py:147
 msgid "Mailing lists"
 msgstr "Listas de e-mail"
 
-#: colab/accounts/forms.py:130
+#: accounts/forms.py:154 accounts/forms.py:207 accounts/forms.py:261
+#: accounts/forms.py:298 accounts/forms.py:488
+msgid "Password"
+msgstr "Senha"
+
+#: accounts/forms.py:156 accounts/forms.py:209
 msgid "Password confirmation"
 msgstr "Confirmação de senha"
 
-#: colab/accounts/forms.py:132
-msgid "Enter the same password as above, for verification."
-msgstr "Digite a mesma senha que acima, para verificação."
-
-#: colab/accounts/forms.py:150
+#: accounts/forms.py:177
 msgid "Password mismatch"
 msgstr "Senhas diferentes"
 
-#: colab/accounts/models.py:66
+#: accounts/forms.py:195
+msgid "A user with that username already exists."
+msgstr ""
+
+#: accounts/forms.py:196 accounts/forms.py:422 accounts/forms.py:486
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: accounts/forms.py:198 accounts/forms.py:255 search/forms.py:37
+msgid "Username"
+msgstr "Usuário"
+
+#: accounts/forms.py:256
+#, fuzzy
+#| msgid "Required. 30 characters or fewer. Letters, digits and ./+/-/_ only."
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+"Obrigatório. 30 caracteres ou menos. Letras, números e ./+/-/_ somente."
+
+#: accounts/forms.py:259
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: accounts/forms.py:262
+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 "
+"form</a>."
+msgstr ""
+
+#: accounts/forms.py:301
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: accounts/forms.py:303
+msgid "This account is inactive."
+msgstr ""
+
+#: accounts/forms.py:366
+#, fuzzy
+#| msgid "Emails"
+msgid "Email"
+msgstr "E-mails"
+
+#: accounts/forms.py:424
+#, fuzzy
+#| msgid "Reset password"
+msgid "New password"
+msgstr "Redefinir senha"
+
+#: accounts/forms.py:426
+#, fuzzy
+#| msgid "Password confirmation"
+msgid "New password confirmation"
+msgstr "Confirmação de senha"
+
+#: accounts/forms.py:457
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: accounts/forms.py:460
+#, fuzzy
+#| msgid "Password"
+msgid "Old password"
+msgstr "Senha"
+
+#: accounts/forms.py:490
+#, fuzzy
+#| msgid "Password"
+msgid "Password (again)"
+msgstr "Senha"
+
+#: accounts/models.py:85
 msgid "Required. 30 characters or fewer. Letters, digits and ./+/-/_ only."
 msgstr ""
 "Obrigatório. 30 caracteres ou menos. Letras, números e ./+/-/_ somente."
 
-#: colab/accounts/models.py:71
+#: accounts/models.py:90
 msgid "Enter a valid username."
 msgstr "Insira um nome de usuário válido."
 
-#: colab/accounts/templates/accounts/change_password.html:8
+#: accounts/templates/accounts/change_password.html:8
 msgid "Change XMPP Client and SVN Password"
 msgstr "Trocar senha do Repositório e do Mensageiro"
 
-#: colab/accounts/templates/accounts/change_password.html:17
-#: colab/accounts/templates/accounts/user_update_form.html:186
-#: colab/accounts/templates/accounts/user_update_form.html:190
-#: colab/accounts/templates/accounts/user_update_form.html:202
-#: colab/accounts/templates/accounts/user_update_form.html:209
-#: colab/accounts/templates/registration/password_change_form_custom.html:27
-#: colab/accounts/templates/registration/password_reset_confirm_custom.html:29
+#: accounts/templates/accounts/change_password.html:17
+#: accounts/templates/accounts/user_update_form.html:186
+#: accounts/templates/accounts/user_update_form.html:190
+#: accounts/templates/accounts/user_update_form.html:202
+#: accounts/templates/accounts/user_update_form.html:209
+#: accounts/templates/registration/password_change_form_custom.html:26
+#: accounts/templates/registration/password_reset_confirm_custom.html:28
 msgid "Change Password"
 msgstr "Trocar senha"
 
-#: colab/accounts/templates/accounts/login.html:7
+#: accounts/templates/accounts/login.html:7
 msgid "To login please click in the link below:"
 msgstr "Para acessar por favor clique no link abaixo:"
 
-#: colab/accounts/templates/accounts/login.html:8
-#: colab/accounts/templates/registration/login.html:34
-#: colab/accounts/templates/registration/login.html:54
-#: colab/templates/base.html:185 colab/templates/base.html.py:190
-#: colab/templates/base.html:194 colab/templates/base.html.py:199
+#: accounts/templates/accounts/login.html:8
+#: accounts/templates/registration/login.html:34
+#: accounts/templates/registration/login.html:54 templates/header.html:37
+#: templates/header.html.py:42 templates/header.html:46
+#: templates/header.html.py:51
 msgid "Login"
 msgstr "Entrar"
 
-#: colab/accounts/templates/accounts/manage_subscriptions.html:6
+#: accounts/templates/accounts/manage_subscriptions.html:6
 msgid "Group Subscriptions"
 msgstr "Inscrições em grupos"
 
-#: colab/accounts/templates/accounts/manage_subscriptions.html:36
+#: accounts/templates/accounts/manage_subscriptions.html:36
 msgid "Update subscriptions"
 msgstr "Atualizar inscrições"
 
-#: colab/accounts/templates/accounts/user_create_form.html:5
+#: accounts/templates/accounts/user_create_form.html:5
 msgid "Sign up"
 msgstr "Cadastrar"
 
-#: colab/accounts/templates/accounts/user_create_form.html:10
-#: colab/accounts/templates/registration/login.html:14
-#: colab/accounts/templates/registration/password_change_form_custom.html:13
-#: colab/accounts/templates/registration/password_reset_confirm_custom.html:15
-#: colab/accounts/templates/registration/password_reset_form_custom.html:9
+#: accounts/templates/accounts/user_create_form.html:10
+#: accounts/templates/registration/login.html:14
+#: accounts/templates/registration/password_change_form_custom.html:12
+#: accounts/templates/registration/password_reset_confirm_custom.html:14
+#: accounts/templates/registration/password_reset_form_custom.html:9
 msgid "Please correct the errors below and try again."
 msgstr "Por favor, corrija os erros abaixo e tente novamente."
 
-#: colab/accounts/templates/accounts/user_create_form.html:17
+#: accounts/templates/accounts/user_create_form.html:17
 msgid "Required fields"
 msgstr "Campos obrigatórios"
 
-#: colab/accounts/templates/accounts/user_create_form.html:29
+#: accounts/templates/accounts/user_create_form.html:29
 msgid "Personal Information"
 msgstr "Informações pessoais"
 
-#: colab/accounts/templates/accounts/user_create_form.html:46
+#: accounts/templates/accounts/user_create_form.html:46
 msgid "Subscribe to groups"
 msgstr "Inscreva-se nos grupos"
 
-#: colab/accounts/templates/accounts/user_create_form.html:60
-#: colab/templates/base.html:189 colab/templates/base.html.py:198
+#: accounts/templates/accounts/user_create_form.html:60
+#: templates/header.html:41 templates/header.html.py:50
 msgid "Register"
 msgstr "Cadastre-se"
 
-#: colab/accounts/templates/accounts/user_detail.html:8
-#: colab/badger/models.py:21
+#: accounts/templates/accounts/user_detail.html:8 badger/models.py:21
 msgid "Messages"
 msgstr "Mensagens"
 
-#: colab/accounts/templates/accounts/user_detail.html:9
-#: colab/badger/models.py:22 colab/templates/home.html:7
+#: accounts/templates/accounts/user_detail.html:9 badger/models.py:22
+#: templates/home.html:7
 msgid "Contributions"
 msgstr "Contribuições"
 
-#: colab/accounts/templates/accounts/user_detail.html:29
+#: accounts/templates/accounts/user_detail.html:29
 msgid "edit profile"
 msgstr "editar perfil"
 
-#: colab/accounts/templates/accounts/user_detail.html:30
+#: accounts/templates/accounts/user_detail.html:30
 msgid "group membership"
 msgstr "Inscrições nos grupos"
 
-#: colab/accounts/templates/accounts/user_detail.html:65
+#: accounts/templates/accounts/user_detail.html:66
 msgid "Twitter account"
 msgstr "Conta Twitter"
 
-#: colab/accounts/templates/accounts/user_detail.html:68
+#: accounts/templates/accounts/user_detail.html:69
 msgid "Facebook account"
 msgstr "Conta Facebook"
 
-#: colab/accounts/templates/accounts/user_detail.html:73
+#: accounts/templates/accounts/user_detail.html:74
 msgid "Google talk account"
 msgstr "Conta Google"
 
-#: colab/accounts/templates/accounts/user_detail.html:77
+#: accounts/templates/accounts/user_detail.html:78
 msgid "Github account"
 msgstr "Conta Github"
 
-#: colab/accounts/templates/accounts/user_detail.html:81
+#: accounts/templates/accounts/user_detail.html:82
 msgid "Personal webpage"
 msgstr "Página web pessoal"
 
-#: colab/accounts/templates/accounts/user_detail.html:87
+#: accounts/templates/accounts/user_detail.html:89
 msgid "Groups: "
 msgstr "Grupos: "
 
-#: colab/accounts/templates/accounts/user_detail.html:100
+#: accounts/templates/accounts/user_detail.html:102
 msgid "Collaborations by Type"
 msgstr "Colaborações por tipo"
 
-#: colab/accounts/templates/accounts/user_detail.html:116
+#: accounts/templates/accounts/user_detail.html:118
 msgid "Participation by Group"
 msgstr "Participação por grupo"
 
-#: colab/accounts/templates/accounts/user_detail.html:132
-#: colab/badger/models.py:69
+#: accounts/templates/accounts/user_detail.html:134 badger/models.py:69
 msgid "Badges"
 msgstr "Medalhas"
 
-#: colab/accounts/templates/accounts/user_detail.html:151
+#: accounts/templates/accounts/user_detail.html:153
 msgid "Latest posted"
 msgstr "Últimas postagens"
 
-#: colab/accounts/templates/accounts/user_detail.html:156
+#: accounts/templates/accounts/user_detail.html:158
 msgid "There are no posts by this user so far."
 msgstr "Não há posts deste usuário até agora."
 
-#: colab/accounts/templates/accounts/user_detail.html:160
+#: accounts/templates/accounts/user_detail.html:162
 msgid "View more posts..."
 msgstr "Ver mais postagens..."
 
-#: colab/accounts/templates/accounts/user_detail.html:166
+#: accounts/templates/accounts/user_detail.html:168
 msgid "Latest contributions"
 msgstr "Últimas colaborações"
 
-#: colab/accounts/templates/accounts/user_detail.html:171
+#: accounts/templates/accounts/user_detail.html:173
 msgid "No contributions of this user so far."
 msgstr "Não há posts deste usuário até agora."
 
-#: colab/accounts/templates/accounts/user_detail.html:175
+#: accounts/templates/accounts/user_detail.html:177
 msgid "View more contributions..."
 msgstr "Ver mais colaborações..."
 
-#: colab/accounts/templates/accounts/user_update_form.html:65
+#: 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:66
+#: 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:110
+#: accounts/templates/accounts/user_update_form.html:110
 msgid "profile information"
 msgstr "informações do perfil"
 
-#: colab/accounts/templates/accounts/user_update_form.html:115
+#: accounts/templates/accounts/user_update_form.html:115
 msgid "Change your avatar at Gravatar.com"
 msgstr "Troque seu avatar em Gravatar.com"
 
-#: colab/accounts/templates/accounts/user_update_form.html:142
-#: colab/search/utils.py:8
+#: accounts/templates/accounts/user_update_form.html:142 search/utils.py:51
 msgid "Emails"
 msgstr "E-mails"
 
-#: colab/accounts/templates/accounts/user_update_form.html:151
+#: accounts/templates/accounts/user_update_form.html:151
 msgid "Primary"
 msgstr "Primário"
 
-#: colab/accounts/templates/accounts/user_update_form.html:154
+#: accounts/templates/accounts/user_update_form.html:154
 msgid "Setting..."
 msgstr "Definindo..."
 
-#: colab/accounts/templates/accounts/user_update_form.html:154
+#: accounts/templates/accounts/user_update_form.html:154
 msgid "Set as Primary"
 msgstr "Definir como Primário"
 
-#: colab/accounts/templates/accounts/user_update_form.html:155
+#: accounts/templates/accounts/user_update_form.html:155
 msgid "Deleting..."
 msgstr "Deletando..."
 
-#: colab/accounts/templates/accounts/user_update_form.html:155
-#: colab/accounts/templates/accounts/user_update_form.html:167
+#: accounts/templates/accounts/user_update_form.html:155
+#: accounts/templates/accounts/user_update_form.html:167
 msgid "Delete"
 msgstr "Apagar"
 
-#: colab/accounts/templates/accounts/user_update_form.html:166
+#: accounts/templates/accounts/user_update_form.html:166
 msgid "Sending verification..."
 msgstr "Enviando verificação..."
 
-#: colab/accounts/templates/accounts/user_update_form.html:166
+#: accounts/templates/accounts/user_update_form.html:166
 msgid "Verify"
 msgstr "Verificar"
 
-#: colab/accounts/templates/accounts/user_update_form.html:174
+#: accounts/templates/accounts/user_update_form.html:174
 msgid "Add another email address:"
 msgstr "Adicionar outro endereço de e-mail"
 
-#: colab/accounts/templates/accounts/user_update_form.html:177
+#: accounts/templates/accounts/user_update_form.html:177
 msgid "Add"
 msgstr "Adicionar"
 
-#: colab/accounts/templates/accounts/user_update_form.html:207
+#: accounts/templates/accounts/user_update_form.html:207
 msgid ""
 "This feature is available only for those who need to change the password for "
 "some reason as having an old user with the same username, forgot your "
@@ -299,602 +359,598 @@ msgstr ""
 "Normalmente, você não terá que trocar essa senha. Somente troque essa senha "
 "se tiver certeza do que está fazendo."
 
-#: colab/accounts/templates/accounts/user_update_form.html:217
+#: accounts/templates/accounts/user_update_form.html:217
 msgid "Update"
 msgstr "Atualizar"
 
-#: colab/accounts/templates/registration/login.html:10
-#: colab/accounts/templates/registration/password_change_form_custom.html:11
-#: colab/accounts/templates/registration/password_reset_confirm_custom.html:12
+#: accounts/templates/registration/login.html:10
+#: accounts/templates/registration/password_change_form_custom.html:10
+#: accounts/templates/registration/password_reset_confirm_custom.html:12
 msgid "Please correct the error below and try again."
 msgstr "Por favor, corrija o erro abaixo e tente novamente."
 
-#: colab/accounts/templates/registration/login.html:56
+#: accounts/templates/registration/login.html:56
 msgid "Forgot Password?"
 msgstr "Esqueceu sua senha?"
 
-#: colab/accounts/templates/registration/password_change_form_custom.html:55
-#: colab/accounts/templates/registration/password_reset_confirm_custom.html:52
+#: accounts/templates/registration/password_change_form_custom.html:54
+#: accounts/templates/registration/password_reset_confirm_custom.html:51
 #, fuzzy
 #| msgid "Change Password"
 msgid "Change my password"
 msgstr "Trocar senha"
 
-#: colab/accounts/templates/registration/password_reset_confirm_custom.html:3
+#: accounts/templates/registration/password_reset_confirm_custom.html:3
 #, fuzzy
 #| msgid "Change Password"
 msgid "Setting New password"
 msgstr "Trocar senha"
 
-#: colab/accounts/templates/registration/password_reset_form_custom.html:23
-msgid "Forgotten your password? Enter your email address below, and we'll email "
+#: accounts/templates/registration/password_reset_form_custom.html:23
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
-msgstr "Esqueceu sua senha? Entre com seu endereço de email abaixo e nós iremos lhe enviar instruções para configurar uma nova senha"
+msgstr ""
+"Esqueceu sua senha? Entre com seu endereço de email abaixo e nós iremos lhe "
+"enviar instruções para configurar uma nova senha"
 
-#: colab/accounts/templates/registration/password_reset_form_custom.html:26
+#: accounts/templates/registration/password_reset_form_custom.html:26
 #, fuzzy
 #| msgid "An email address"
 msgid "Email address:"
 msgstr "Um endereço de e-mail"
 
-#: colab/accounts/templates/registration/password_reset_form_custom.html:37
+#: accounts/templates/registration/password_reset_form_custom.html:37
 msgid "Reset password"
 msgstr "Redefinir senha"
 
-#: colab/accounts/views.py:180
+#: accounts/views.py:157
 msgid "Your profile has been created!"
 msgstr "Seu perfil foi criado!"
 
-#: colab/accounts/views.py:264
+#: accounts/views.py:241
 msgid "Could not change your password. Please, try again later."
-msgstr "Não conseguimos alterar sua senha. Por favor, tente novamente mais tarde."
+msgstr ""
+"Não conseguimos alterar sua senha. Por favor, tente novamente mais tarde."
 
-#: colab/accounts/views.py:273
+#: accounts/views.py:250
 msgid "You've changed your password successfully!"
 msgstr "Senha alterada com sucesso!"
 
-#: colab/accounts/views.py:279
+#: accounts/views.py:256
 msgid "Your password was changed."
 msgstr "Sua senha foi alterada"
 
-#: colab/accounts/views.py:286
-msgid "We've emailed you instructions for setting your password. You should be receiving them shortly."
-msgstr "Nos enviamos o email com as intruções para mudança de senha. Em breve você deve recebê-lo."
-
-#: colab/accounts/views.py:292
+#: accounts/views.py:272
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr "Sua senha foi redefinida. Você pode prosseguir e autenticar agora."
 
-#: colab/badger/forms.py:19 colab/badger/models.py:39 colab/settings.py:160
+#: badger/forms.py:17 badger/models.py:39 settings.py:162
 msgid "Image"
 msgstr "Imagem"
 
-#: colab/badger/forms.py:30
+#: badger/forms.py:28
 msgid "You must add an Image"
 msgstr "Você deve adicionar uma imagem"
 
-#: colab/badger/models.py:11
+#: badger/models.py:11
 msgid "Greater than or equal"
 msgstr "Maior que ou igual"
 
-#: colab/badger/models.py:12
+#: badger/models.py:12
 msgid "less than or equal"
 msgstr "menor que ou igual"
 
-#: colab/badger/models.py:13
+#: badger/models.py:13
 msgid "Equal"
 msgstr "Igual"
 
-#: colab/badger/models.py:14
+#: badger/models.py:14
 msgid "Biggest"
 msgstr "Maior"
 
-#: colab/badger/models.py:17
+#: badger/models.py:17
 msgid "Automatically"
 msgstr "Automaticamente"
 
-#: colab/badger/models.py:18
+#: badger/models.py:18
 msgid "Manual"
 msgstr "Manual"
 
-#: colab/badger/models.py:23
+#: badger/models.py:23
 msgid "Wikis"
 msgstr "Wikis"
 
-#: colab/badger/models.py:24
+#: badger/models.py:24
 msgid "Revisions"
 msgstr "Conjunto de mudanças"
 
-#: colab/badger/models.py:25
-#: colab/search/templates/search/includes/search_filters.html:122
+#: badger/models.py:25
+#: search/templates/search/includes/search_filters.html:122
 msgid "Ticket"
 msgstr "Tíquetes"
 
-#: colab/badger/models.py:35
+#: badger/models.py:35
 msgid "Title"
 msgstr "Título"
 
-#: colab/badger/models.py:37
+#: badger/models.py:37
 msgid "Description"
 msgstr "Descrição"
 
-#: colab/badger/models.py:40 colab/search/forms.py:18
+#: badger/models.py:40 search/forms.py:17
 msgid "Type"
 msgstr "Tipo"
 
-#: colab/badger/models.py:42
+#: badger/models.py:42
 msgid "User attribute"
 msgstr "Atributo do usuário"
 
-#: colab/badger/models.py:48
+#: badger/models.py:48
 msgid "Comparison"
 msgstr "Comparação"
 
-#: colab/badger/models.py:55
+#: badger/models.py:55
 msgid "Value"
 msgstr "Valor"
 
-#: colab/badger/models.py:61
+#: badger/models.py:61
 msgid "Awardees"
 msgstr "Premiados"
 
-#: colab/badger/models.py:65
+#: badger/models.py:65
 msgid "Order"
 msgstr "Ordem"
 
-#: colab/badger/models.py:68
+#: badger/models.py:68
 msgid "Badge"
 msgstr "Medalha"
 
-#: colab/home/context_processors.py:20
+#: home/context_processors.py:20
 msgid "Fork me!"
 msgstr "Fork me!"
 
-#: colab/rss/feeds.py:13
+#: proxy/gitlab/apps.py:12 proxy/jenkins/apps.py:12 proxy/trac/apps.py:12
+#: settings.py:159
+msgid "Code"
+msgstr "Código"
+
+#: proxy/gitlab/apps.py:14
+msgid "Public Projects"
+msgstr "Projetos Públicos"
+
+#: proxy/gitlab/apps.py:17 proxy/noosfero/apps.py:18
+msgid "Profile"
+msgstr "Perfil"
+
+#: proxy/gitlab/apps.py:18
+msgid "New Project"
+msgstr "Novo Projeto"
+
+#: proxy/gitlab/apps.py:19
+msgid "Projects"
+msgstr "Projetos"
+
+#: proxy/gitlab/apps.py:20 templates/header.html:21
+msgid "Groups"
+msgstr "Grupos"
+
+#: proxy/gitlab/apps.py:21
+msgid "Issues"
+msgstr "Tiquetes"
+
+#: proxy/gitlab/apps.py:22
+msgid "Merge Requests"
+msgstr "Merge Requests"
+
+#: proxy/gitlab/models.py:23
+#, fuzzy
+#| msgid "New Project"
+msgid "Gitlab Project"
+msgstr "Novo Projeto"
+
+#: proxy/gitlab/models.py:24
+#, fuzzy
+#| msgid "Projects"
+msgid "Gitlab Projects"
+msgstr "Projetos"
+
+#: proxy/gitlab/models.py:59
+#, fuzzy
+#| msgid "Merge Requests"
+msgid "Gitlab Merge Request"
+msgstr "Merge Requests"
+
+#: proxy/gitlab/models.py:60
+#, fuzzy
+#| msgid "Merge Requests"
+msgid "Gitlab Merge Requests"
+msgstr "Merge Requests"
+
+#: proxy/gitlab/models.py:87
+msgid "Gitlab Issue"
+msgstr ""
+
+#: proxy/gitlab/models.py:88
+#, fuzzy
+#| msgid "Issues"
+msgid "Gitlab Issues"
+msgstr "Tiquetes"
+
+#: proxy/gitlab/models.py:142 proxy/gitlab/models.py:143
+msgid "Gitlab Comments"
+msgstr ""
+
+#: proxy/jenkins/apps.py:14
+#, fuzzy
+#| msgid "Continuous Integration"
+msgid "Continuos Integration"
+msgstr "Integração Contínua"
+
+#: proxy/noosfero/apps.py:12
+msgid "Social"
+msgstr "Social"
+
+#: proxy/noosfero/apps.py:14
+msgid "Users"
+msgstr "Usuários"
+
+#: proxy/noosfero/apps.py:15
+msgid "Communities"
+msgstr "Comunidades"
+
+#: proxy/noosfero/apps.py:19
+msgid "Control panel"
+msgstr "Painel de Controle"
+
+#: proxy/trac/apps.py:14
+msgid "Timeline"
+msgstr "Linha do Tempo"
+
+#: proxy/trac/apps.py:15
+#: search/templates/search/includes/search_filters.html:118
+#: templates/open-data.html:130
+msgid "Wiki"
+msgstr "Wiki"
+
+#: proxy/trac/apps.py:16
+msgid "View Tickets"
+msgstr "Ver Tiquetes"
+
+#: proxy/trac/apps.py:17
+msgid "Roadmap"
+msgstr "Planejamento"
+
+#: proxy/trac/apps.py:18
+msgid "Browse Source"
+msgstr "Códigos Fontes"
+
+#: proxy/trac/apps.py:21
+msgid "New Ticket"
+msgstr "Novo Tíquete"
+
+#: proxy/trac/apps.py:22
+msgid "New Wiki Page"
+msgstr "Nova Página Wiki"
+
+#: rss/feeds.py:13
 msgid "Latest Discussions"
 msgstr "Últimas discussões"
 
-#: colab/rss/feeds.py:32
+#: rss/feeds.py:32
 msgid "Discussions Most Relevance"
 msgstr "Discussões Mais Relevantes"
 
-#: colab/rss/feeds.py:51
+#: rss/feeds.py:51
 msgid "Latest collaborations"
 msgstr "Últimas colaborações"
 
-#: colab/search/forms.py:16 colab/search/templates/search/search.html:46
-#: colab/templates/base.html:175
+#: search/forms.py:15 search/templates/search/search.html:46
+#: templates/header.html:27
 msgid "Search"
 msgstr "Busca"
 
-#: colab/search/forms.py:19 colab/search/views.py:22
+#: search/forms.py:18 search/views.py:22
 msgid "Author"
 msgstr "Autor"
 
-#: colab/search/forms.py:20
+#: search/forms.py:19
 msgid "Modified by"
 msgstr "Modificado por"
 
-#: colab/search/forms.py:22
+#: search/forms.py:21
 msgid "Status"
 msgstr "Status"
 
-#: colab/search/forms.py:26 colab/search/views.py:25
+#: search/forms.py:25 search/views.py:25
 msgid "Mailinglist"
 msgstr "Grupo"
 
-#: colab/search/forms.py:30
+#: search/forms.py:29
 msgid "Milestone"
 msgstr "Etapa"
 
-#: colab/search/forms.py:31
+#: search/forms.py:30
 msgid "Priority"
 msgstr "Prioridade"
 
-#: colab/search/forms.py:32
+#: search/forms.py:31
 msgid "Component"
 msgstr "Componente"
 
-#: colab/search/forms.py:33
+#: search/forms.py:32
 msgid "Severity"
 msgstr "Seriedade"
 
-#: colab/search/forms.py:34
+#: search/forms.py:33
 msgid "Reporter"
 msgstr "Relator"
 
-#: colab/search/forms.py:35
+#: search/forms.py:34
 msgid "Keywords"
 msgstr "Palavras chaves"
 
-#: colab/search/forms.py:36
+#: search/forms.py:35
 msgid "Collaborators"
 msgstr "Colaboradores"
 
-#: colab/search/forms.py:37 colab/templates/base.html:107
+#: search/forms.py:36
 msgid "Repository"
 msgstr "Repositório"
 
-#: colab/search/forms.py:38
-msgid "Username"
-msgstr "Usuário"
-
-#: colab/search/forms.py:39
+#: search/forms.py:38
 msgid "Name"
 msgstr "Nome"
 
-#: colab/search/forms.py:40
+#: search/forms.py:39
 msgid "Institution"
 msgstr "Instituição"
 
-#: colab/search/forms.py:41
+#: search/forms.py:40
 msgid "Role"
 msgstr "Cargo"
 
-#: colab/search/forms.py:42
-#: colab/search/templates/search/includes/search_filters.html:154
-#: colab/search/templates/search/includes/search_filters.html:156
-#: colab/search/templates/search/includes/search_filters.html:188
-#: colab/search/templates/search/includes/search_filters.html:189
+#: search/forms.py:41 search/templates/search/includes/search_filters.html:154
+#: search/templates/search/includes/search_filters.html:156
+#: search/templates/search/includes/search_filters.html:188
+#: search/templates/search/includes/search_filters.html:189
 msgid "Since"
 msgstr "Desde"
 
-#: colab/search/forms.py:43
-#: colab/search/templates/search/includes/search_filters.html:163
-#: colab/search/templates/search/includes/search_filters.html:165
-#: colab/search/templates/search/includes/search_filters.html:192
-#: colab/search/templates/search/includes/search_filters.html:193
+#: search/forms.py:42 search/templates/search/includes/search_filters.html:163
+#: search/templates/search/includes/search_filters.html:165
+#: search/templates/search/includes/search_filters.html:192
+#: search/templates/search/includes/search_filters.html:193
 msgid "Until"
 msgstr "Até"
 
-#: colab/search/forms.py:44
+#: search/forms.py:43
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: colab/search/forms.py:45
+#: search/forms.py:44
 msgid "Used by"
 msgstr "Usado por"
 
-#: colab/search/forms.py:46
+#: search/forms.py:45
 msgid "File type"
 msgstr "Tipo do arquivo"
 
-#: colab/search/forms.py:47
+#: search/forms.py:46
 msgid "Size"
 msgstr "Tamanho"
 
-#: colab/search/templates/search/includes/search_filters.html:5
-#: colab/search/templates/search/includes/search_filters.html:33
-#: colab/search/templates/search/includes/search_filters.html:51
-#: colab/search/templates/search/includes/search_filters.html:69
+#: search/templates/search/includes/search_filters.html:5
+#: search/templates/search/includes/search_filters.html:33
+#: search/templates/search/includes/search_filters.html:51
+#: search/templates/search/includes/search_filters.html:69
 msgid "Remove filter"
 msgstr "Remover filtro"
 
-#: colab/search/templates/search/includes/search_filters.html:88
-#: colab/search/templates/search/includes/search_filters.html:174
-#: colab/search/templates/search/includes/search_filters.html:198
+#: search/templates/search/includes/search_filters.html:88
+#: search/templates/search/includes/search_filters.html:174
+#: search/templates/search/includes/search_filters.html:198
 msgid "Filter"
 msgstr "Filtro"
 
-#: colab/search/templates/search/includes/search_filters.html:94
+#: search/templates/search/includes/search_filters.html:94
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: colab/search/templates/search/includes/search_filters.html:111
+#: search/templates/search/includes/search_filters.html:111
 msgid "Types"
 msgstr "Tipos"
 
-#: colab/search/templates/search/includes/search_filters.html:118
-#: colab/search/utils.py:7 colab/templates/open-data.html:130
-msgid "Wiki"
-msgstr "Wiki"
-
-#: colab/search/templates/search/includes/search_filters.html:126
+#: search/templates/search/includes/search_filters.html:126
 msgid "Changeset"
 msgstr "Conjunto de Mudanças"
 
-#: colab/search/templates/search/includes/search_filters.html:130
+#: search/templates/search/includes/search_filters.html:130
 msgid "User"
 msgstr "Usuário"
 
-#: colab/search/templates/search/includes/search_filters.html:134
+#: search/templates/search/includes/search_filters.html:134
 msgid "Attachment"
 msgstr "Anexo"
 
-#: colab/search/templates/search/includes/search_filters.html:139
-#: colab/search/views.py:20
+#: search/templates/search/includes/search_filters.html:139 search/views.py:20
 msgid "Discussion"
 msgstr "Discussões"
 
-#: colab/search/templates/search/search.html:5
+#: search/templates/search/search.html:5
 msgid "search"
 msgstr "busca"
 
-#: colab/search/templates/search/search.html:51
+#: search/templates/search/search.html:51
 msgid "documents found"
 msgstr "documentos encontrados"
 
-#: colab/search/templates/search/search.html:62
+#: search/templates/search/search.html:62
 msgid "Search here"
 msgstr "Pesquise aqui"
 
-#: colab/search/templates/search/search.html:74
-#: colab/search/templates/search/search.html:84
+#: search/templates/search/search.html:74
+#: search/templates/search/search.html:84
 msgid "Filters"
 msgstr "Filtros"
 
-#: colab/search/templates/search/search.html:105
+#: search/templates/search/search.html:105
 msgid "No results for your search."
 msgstr "Não há resultados para sua busca."
 
-#: colab/search/templates/search/search.html:107
+#: search/templates/search/search.html:107
 msgid "You are searching for"
 msgstr "Você está procurando por"
 
-#: colab/search/utils.py:9 colab/settings.py:157
-msgid "Code"
-msgstr "Código"
-
-#: colab/search/utils.py:10
-msgid "Tickets"
-msgstr "Tíquetes"
-
-#: colab/search/utils.py:11
-msgid "Attachments"
-msgstr "Anexos"
-
-#: colab/settings.py:115
+#: settings.py:117
 msgid "English"
 msgstr "Inglês"
 
-#: colab/settings.py:116
+#: settings.py:118
 msgid "Portuguese"
 msgstr "Português"
 
-#: colab/settings.py:117
+#: settings.py:119
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: colab/settings.py:140
+#: settings.py:142
 msgid "Recent activity"
 msgstr "Atividade recente"
 
-#: colab/settings.py:144
+#: settings.py:146
 msgid "Relevance"
 msgstr "Relevância"
 
-#: colab/settings.py:153
+#: settings.py:155
 msgid "Document"
 msgstr "Documento"
 
-#: colab/settings.py:155
+#: settings.py:157
 msgid "Presentation"
 msgstr "Apresentação"
 
-#: colab/settings.py:156
+#: settings.py:158
 msgid "Text"
 msgstr "Texto"
 
-#: colab/settings.py:159
+#: settings.py:161
 msgid "Compressed"
 msgstr "Compactado"
 
-#: colab/settings.py:162
+#: settings.py:164
 msgid "Spreadsheet"
 msgstr "Planilha"
 
-#: colab/settings.py:260
+#: settings.py:262
 msgid "Planet Colab"
 msgstr "Planet Colab"
 
-#: colab/settings.py:261
+#: settings.py:263
 msgid "Colab blog aggregator"
 msgstr "Agregador de blog Colab"
 
-#: colab/settings.py:295
+#: settings.py:297
 msgid "One Time Snippet"
 msgstr "Uma única visualização"
 
-#: colab/settings.py:296
+#: settings.py:298
 msgid "In one hour"
 msgstr "Em uma hora"
 
-#: colab/settings.py:297
+#: settings.py:299
 msgid "In one week"
 msgstr "Em uma semana"
 
-#: colab/settings.py:298
+#: settings.py:300
 msgid "In one month"
 msgstr "Em um mês"
 
-#: colab/settings.py:299
+#: settings.py:301
 msgid "Never"
 msgstr "Nunca"
 
-#: colab/templates/404.html:5
+#: templates/404.html:5
 msgid "Not found. Keep searching! :)"
 msgstr "Não encontrado. Continue procurando! :)"
 
-#: colab/templates/500.html:2
+#: templates/500.html:2
 msgid "Ooopz... something went wrong!"
 msgstr "Opa... algo saiu errado!"
 
-#: colab/templates/base.html:91
-msgid "Timeline"
-msgstr "Linha do Tempo"
-
-#: colab/templates/base.html:96 colab/templates/base.html.py:114
-msgid "Groups"
-msgstr "Grupos"
-
-#: colab/templates/base.html:101
-msgid "Blogs"
-msgstr "Blogs"
-
-#: colab/templates/base.html:109
-msgid "Public Projects"
-msgstr "Projetos Públicos"
-
-#: colab/templates/base.html:111 colab/templates/base.html.py:140
-msgid "Profile"
-msgstr "Perfil"
-
-#: colab/templates/base.html:112
-msgid "New Project"
-msgstr "Novo Projeto"
-
-#: colab/templates/base.html:113
-msgid "Projects"
-msgstr "Projetos"
-
-#: colab/templates/base.html:115
-msgid "Issues"
-msgstr "Tiquetes"
-
-#: colab/templates/base.html:116
-msgid "Merge Requests"
-msgstr "Merge Requests"
-
-#: colab/templates/base.html:124
-msgid "Social"
-msgstr "Social"
-
-#: colab/templates/base.html:129
-msgid "Users"
-msgstr "Usuários"
-
-#: colab/templates/base.html:134
-msgid "Communities"
-msgstr "Comunidades"
-
-#: colab/templates/base.html:145
-msgid "Control panel"
-msgstr "Painel de Controle"
-
-#: colab/templates/base.html:154
-msgid "Contribute"
-msgstr "Contribua"
-
-#: colab/templates/base.html:158
-msgid "New Wiki Page"
-msgstr "Nova Página Wiki"
-
-#: colab/templates/base.html:160
-msgid "View Tickets"
-msgstr "Ver Tiquetes"
-
-#: colab/templates/base.html:162
-msgid "New Ticket"
-msgstr "Novo Tíquete"
-
-#: colab/templates/base.html:164
-msgid "Roadmap"
-msgstr "Planejamento"
-
-#: colab/templates/base.html:167
-msgid "Browse Source"
-msgstr "Códigos Fontes"
-
-#: colab/templates/base.html:169
-msgid "Continuous Integration"
-msgstr "Integração Contínua"
-
-#: colab/templates/base.html:213
-msgid "My Profile"
-msgstr "Meu Perfil"
-
-#: colab/templates/base.html:214 colab/templates/base.html.py:218
-msgid "Logout"
-msgstr "Sair"
-
-#: colab/templates/base.html:230 colab/templates/base.html.py:233
-msgid "Search here..."
-msgstr "Pesquise aqui..."
-
-#: colab/templates/base.html:247
+#: templates/base.html:82
 msgid "The login has failed. Please, try again."
 msgstr "O login falhou. Por favor, tente novamente."
 
-#: colab/templates/base.html:272
-msgid "Last email imported at"
-msgstr "Último e-mail importado em"
-
-#: colab/templates/base.html:279
-msgid "The contents of this site is published under license"
-msgstr "O conteúdo deste site está publicado sob a licença"
-
-#: colab/templates/base.html:282
-msgid "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
-msgstr "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
-
-#: colab/templates/dpaste/snippet_details.html:37
+#: templates/dpaste/snippet_details.html:37
 #, fuzzy
 #| msgid "Comparison"
 msgid "Compare"
 msgstr "Comparação"
 
-#: colab/templates/dpaste/snippet_details.html:47
+#: templates/dpaste/snippet_details.html:47
 #, python-format
 msgid "Expires in: %(date)s"
 msgstr "Expira em: %(date)s"
 
-#: colab/templates/dpaste/snippet_details.html:49
+#: templates/dpaste/snippet_details.html:49
 msgid "Snippet never expires"
 msgstr "Snippet nunca expira"
 
-#: colab/templates/dpaste/snippet_details.html:51
+#: templates/dpaste/snippet_details.html:51
 #, fuzzy
 #| msgid "One Time Snippet"
 msgid "One-time snippet"
 msgstr "Uma única visualização"
 
-#: colab/templates/dpaste/snippet_details.html:56
+#: templates/dpaste/snippet_details.html:56
 msgid "Really delete this snippet?"
 msgstr "Deseja realmente deletar esse snippet?"
 
-#: colab/templates/dpaste/snippet_details.html:58
+#: templates/dpaste/snippet_details.html:58
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete Now"
 msgstr "Apagar"
 
-#: colab/templates/dpaste/snippet_details.html:63
-#: colab/templates/dpaste/snippet_details.html:65
+#: templates/dpaste/snippet_details.html:63
+#: templates/dpaste/snippet_details.html:65
 #, fuzzy
 #| msgid "One Time Snippet"
 msgid "Compare Snippets"
 msgstr "Uma única visualização"
 
-#: colab/templates/dpaste/snippet_details.html:69
-#: colab/templates/dpaste/snippet_details.html:71
+#: templates/dpaste/snippet_details.html:69
+#: templates/dpaste/snippet_details.html:71
 msgid "View Raw"
 msgstr "Ver código"
 
-#: colab/templates/dpaste/snippet_details.html:75
+#: templates/dpaste/snippet_details.html:75
 msgid "Gist"
 msgstr "Gist"
 
-#: colab/templates/dpaste/snippet_details.html:88
+#: templates/dpaste/snippet_details.html:88
 msgid "This is a one-time snippet."
 msgstr "Esste é um snippet que será usado apenas uma vez."
 
-#: colab/templates/dpaste/snippet_details.html:90
+#: templates/dpaste/snippet_details.html:90
 msgid "It will automatically get deleted after {{ remaining }} further views."
-msgstr "Isso será automaticamente deletado depois de {{ remaining }} visualizações."
+msgstr ""
+"Isso será automaticamente deletado depois de {{ remaining }} visualizações."
 
-#: colab/templates/dpaste/snippet_details.html:92
+#: templates/dpaste/snippet_details.html:92
 msgid "It will automatically get deleted after the next view."
 msgstr "Isso será automaticamente deletado após a próxima visualização."
 
-#: colab/templates/dpaste/snippet_details.html:94
+#: templates/dpaste/snippet_details.html:94
 msgid "It cannot be viewed again."
 msgstr "Isso não pode ser visto novamente."
 
-#: colab/templates/dpaste/snippet_details.html:109
+#: templates/dpaste/snippet_details.html:109
 msgid "Reply to this snippet"
 msgstr "Responda esse snippet"
 
-#: colab/templates/dpaste/snippet_diff.html:5
+#: templates/dpaste/snippet_diff.html:5
 #, python-format
 msgid ""
 "\n"
@@ -903,55 +959,151 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-    "    Diferença entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> e <a href="
-    "\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
-    "    "
+"    Diferença entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> e <a href="
+"\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
+"    "
 
-#: colab/templates/dpaste/snippet_form.html:28
+#: templates/dpaste/snippet_form.html:28
 msgid "Paste it"
 msgstr "Cole aqui"
 
-#: colab/templates/home.html:17
+#: templates/footer.html:8
+msgid "Back to top"
+msgstr "Voltar ao topo"
+
+#: templates/footer.html:15
+msgid "Subjects"
+msgstr "Assuntos"
+
+#: templates/footer.html:16
+msgid "SPB"
+msgstr ""
+
+#: templates/footer.html:17
+msgid "SISP-SPB"
+msgstr ""
+
+#: templates/footer.html:18
+msgid "AvaliaSPB"
+msgstr ""
+
+#: templates/footer.html:20
+msgid "5cQualiBr"
+msgstr ""
+
+#: templates/footer.html:23
+msgid "Services"
+msgstr "Serviços"
+
+#: templates/footer.html:25
+msgid "Frequently Asked Questions"
+msgstr "Perguntas Frequentes"
+
+#: templates/footer.html:28
+msgid "Contact"
+msgstr "Contato"
+
+#: templates/footer.html:31
+msgid " [Denomination's] services"
+msgstr "Serviços da [Denominação]"
+
+#: templates/footer.html:34
+msgid "Open data"
+msgstr "Dados abertos"
+
+#: templates/footer.html:37
+msgid "Press area"
+msgstr "Área de imprensa"
+
+#: templates/footer.html:41
+msgid "Social networks"
+msgstr "Redes sociais"
+
+#: templates/footer.html:57
+msgid "What is it?"
+msgstr "O que é?"
+
+#: templates/footer.html:58
+msgid "Subscribe"
+msgstr "Assine"
+
+#: templates/footer.html:61
+msgid "Navigation"
+msgstr "Navegação"
+
+#: templates/footer.html:62
+msgid "Accessibility"
+msgstr "Acessibilidade"
+
+#: templates/footer.html:63
+msgid "Site map"
+msgstr "Mapa do site"
+
+#: templates/footer.html:73
+msgid "Information access"
+msgstr "Acesso a Informação"
+
+#: templates/footer.html:76
+msgid "Republic Presidency General Secretary"
+msgstr "Secretaria-geral da Presidência da República"
+
+#: templates/footer.html:76
+msgid "Brazil - Federal Government"
+msgstr "Brasil - Governo Federal"
+
+#: templates/header.html:65
+msgid "My Profile"
+msgstr "Meu Perfil"
+
+#: templates/header.html:66 templates/header.html.py:70
+msgid "Logout"
+msgstr "Sair"
+
+#: templates/header.html:82 templates/header.html.py:85
+msgid "Search here..."
+msgstr "Pesquise aqui..."
+
+#: templates/home.html:17
 msgid "Latest Collaborations"
 msgstr "Últimas Colaborações"
 
-#: colab/templates/home.html:21
+#: templates/home.html:21
 msgid "RSS - Latest collaborations"
 msgstr "RSS - Últimas Colaborações"
 
-#: colab/templates/home.html:30
+#: templates/home.html:30
 msgid "View more collaborations..."
 msgstr "Ver mais colaborações..."
 
-#: colab/templates/home.html:37
+#: templates/home.html:37
 msgid "Collaboration Graph"
 msgstr "Gráfico de Colaborações"
 
-#: colab/templates/home.html:48
+#: templates/home.html:48
 msgid "Most Relevant Threads"
 msgstr "Discussões Mais Relevantes"
 
-#: colab/templates/home.html:52
+#: templates/home.html:52
 msgid "RSS - Most Relevant Threads"
 msgstr "RSS - Discussões Mais Relevantes"
 
-#: colab/templates/home.html:60 colab/templates/home.html.py:79
+#: templates/home.html:60 templates/home.html.py:79
 msgid "View more discussions..."
 msgstr "Ver mais discussões..."
 
-#: colab/templates/home.html:67
+#: templates/home.html:67
 msgid "Latest Threads"
 msgstr "Últimas Discussões"
 
-#: colab/templates/home.html:71
+#: templates/home.html:71
 msgid "RSS - Latest Threads"
 msgstr "RSS - Últimas Discussões"
 
-#: colab/templates/open-data.html:6
+#: templates/open-data.html:6
 msgid "OpenData - Communities"
 msgstr "OpenData - Comunidades"
 
-#: colab/templates/open-data.html:7
+#: templates/open-data.html:7
 msgid ""
 "If you are interested in any other data that is not provided by this API, "
 "please contact us via the ticketing system (you must be registered in order "
@@ -961,28 +1113,28 @@ msgstr ""
 "esta API, por favor nos contacte através do nosso sistema de tíquetes (você "
 "deve estar logado para conseguir criar um tíquete). "
 
-#: colab/templates/open-data.html:9
+#: templates/open-data.html:9
 msgid "Retrieving data via API"
 msgstr "Recuperando informação através da API"
 
-#: colab/templates/open-data.html:10
+#: templates/open-data.html:10
 msgid "Colab API works through HTTP/REST, always returning JSON objects."
 msgstr ""
 "A API do Colab funciona com a utilização de HTTP/REST e sempre retorna "
 "objetos JSON."
 
-#: colab/templates/open-data.html:12
+#: templates/open-data.html:12
 msgid "The base API URL is"
 msgstr "A URL base da API é"
 
-#: colab/templates/open-data.html:19
+#: templates/open-data.html:19
 msgid ""
 "Each model listed below has a resource_uri field available, which is the "
 "object's data URI."
 msgstr ""
 "Cada modelo listado abaixo tem um resource_uri que representa a URI do objeto"
 
-#: colab/templates/open-data.html:20
+#: templates/open-data.html:20
 msgid ""
 "The following list contains the available models to retrieve data and its "
 "fields available for filtering"
@@ -990,48 +1142,48 @@ msgstr ""
 "A lista abaixo contém a lista de modelo disponíveis para pesquisa e os "
 "campos disponíveis para filtro"
 
-#: colab/templates/open-data.html:24 colab/templates/open-data.html.py:39
-#: colab/templates/open-data.html:50 colab/templates/open-data.html.py:62
-#: colab/templates/open-data.html:74 colab/templates/open-data.html.py:95
+#: templates/open-data.html:24 templates/open-data.html.py:39
+#: templates/open-data.html:50 templates/open-data.html.py:62
+#: templates/open-data.html:74 templates/open-data.html.py:95
 msgid "Fields"
 msgstr "Campos"
 
-#: colab/templates/open-data.html:25
+#: templates/open-data.html:25
 msgid ""
 "The email field is not shown for user's privacy, but you can use it to filter"
 msgstr ""
 "O campo email não é exibido por uma questão de privacidade do usuário, por "
 "outro lado ele poderá ser utilizado em filtros"
 
-#: colab/templates/open-data.html:27
+#: templates/open-data.html:27
 msgid "The user's username"
 msgstr "O username do usuário"
 
-#: colab/templates/open-data.html:28
+#: templates/open-data.html:28
 msgid "The user's email address"
 msgstr "O endereço e-mail do usuário"
 
-#: colab/templates/open-data.html:29
+#: templates/open-data.html:29
 msgid "What is the user's institution"
 msgstr "Instituição do usuário"
 
-#: colab/templates/open-data.html:30
+#: templates/open-data.html:30
 msgid "What is the user's role"
 msgstr "Posição do usuário"
 
-#: colab/templates/open-data.html:31
+#: templates/open-data.html:31
 msgid "The user's first name"
 msgstr "Primeiro nome do usuário"
 
-#: colab/templates/open-data.html:32
+#: templates/open-data.html:32
 msgid "The user's last name"
 msgstr "Último nome do usuário"
 
-#: colab/templates/open-data.html:33
+#: templates/open-data.html:33
 msgid "A mini bio of the user"
 msgstr "O mini bio do usuário"
 
-#: colab/templates/open-data.html:40
+#: templates/open-data.html:40
 msgid ""
 "The address field is not shown for user's privacy, but you can use it to "
 "filter"
@@ -1039,171 +1191,171 @@ msgstr ""
 "O campo email não é exibido por uma questão de privacidade do usuário, por "
 "outro lado ele poderá ser utilizado em filtros"
 
-#: colab/templates/open-data.html:42
+#: templates/open-data.html:42
 msgid "It has a relationshop with the user described above"
 msgstr "Tem um relacionamento com usuário como descrito acima"
 
-#: colab/templates/open-data.html:43
+#: templates/open-data.html:43
 msgid "An email address"
 msgstr "Um endereço de e-mail"
 
-#: colab/templates/open-data.html:44
+#: templates/open-data.html:44
 msgid "The user's real name"
 msgstr "O nome real do usuário"
 
-#: colab/templates/open-data.html:52
+#: templates/open-data.html:52
 msgid "It has a relationship with the emailaddress described above"
 msgstr "Tem um relacionamento com emailaddress como descrito acima"
 
-#: colab/templates/open-data.html:53
+#: templates/open-data.html:53
 msgid "The message's body"
 msgstr "O corpo da mensagem"
 
-#: colab/templates/open-data.html:54
+#: templates/open-data.html:54
 msgid "The message's subject"
 msgstr "O título da mensagem"
 
-#: colab/templates/open-data.html:55
+#: templates/open-data.html:55
 msgid "The message's id"
 msgstr "O ID da mensagem"
 
-#: colab/templates/open-data.html:56
+#: templates/open-data.html:56
 msgid "The message's received time"
 msgstr "A hora que a mensagem foi recebida"
 
-#: colab/templates/open-data.html:64
+#: templates/open-data.html:64
 msgid "The revision's author username"
 msgstr "O username do autor da revisão"
 
-#: colab/templates/open-data.html:65
+#: templates/open-data.html:65
 msgid "When the revision's were created"
 msgstr "Quando a revisão foi criada"
 
-#: colab/templates/open-data.html:66
+#: templates/open-data.html:66
 msgid "The revision's key"
 msgstr "A chave da revisão"
 
-#: colab/templates/open-data.html:67
+#: templates/open-data.html:67
 msgid "The revision's message"
 msgstr "A mensagem da revisão"
 
-#: colab/templates/open-data.html:68
+#: templates/open-data.html:68
 msgid "The revision's repository name"
 msgstr "O nome do repositório da revisão"
 
-#: colab/templates/open-data.html:76
+#: templates/open-data.html:76
 msgid "The ticket's author username"
 msgstr "O nome do autor do tíquete"
 
-#: colab/templates/open-data.html:77
+#: templates/open-data.html:77
 msgid "The ticket's component"
 msgstr "O componente do tíquete"
 
-#: colab/templates/open-data.html:78
+#: templates/open-data.html:78
 msgid "When the ticket's were created"
 msgstr "Quando o tíquete foi criado"
 
-#: colab/templates/open-data.html:79
+#: templates/open-data.html:79
 msgid "The ticket's description"
 msgstr "A descrição do tíquete"
 
-#: colab/templates/open-data.html:80
+#: templates/open-data.html:80
 msgid "The ticket's id"
 msgstr "O ID do tíquete"
 
-#: colab/templates/open-data.html:81
+#: templates/open-data.html:81
 msgid "The ticket's keywords"
 msgstr "As keywords do tíquete"
 
-#: colab/templates/open-data.html:82
+#: templates/open-data.html:82
 msgid "The ticket's milestone"
 msgstr "O milestone do tíquete"
 
-#: colab/templates/open-data.html:83 colab/templates/open-data.html.py:99
+#: templates/open-data.html:83 templates/open-data.html.py:99
 msgid "The time of the last modification"
 msgstr "A hora da última modificação"
 
-#: colab/templates/open-data.html:84
+#: templates/open-data.html:84
 msgid "The username of the last user who modified the ticket"
 msgstr "O username do último usuário que modificou o tíquete"
 
-#: colab/templates/open-data.html:85
+#: templates/open-data.html:85
 msgid "The ticket's priority"
 msgstr "A prioridade do tíquete"
 
-#: colab/templates/open-data.html:86
+#: templates/open-data.html:86
 msgid "The ticket's severity"
 msgstr "A gravidade do tíquete"
 
-#: colab/templates/open-data.html:87
+#: templates/open-data.html:87
 msgid "The ticket's status"
 msgstr "O status do tíquete"
 
-#: colab/templates/open-data.html:88
+#: templates/open-data.html:88
 msgid "The ticket's summary"
 msgstr "O resumo do tíquete"
 
-#: colab/templates/open-data.html:89
+#: templates/open-data.html:89
 msgid "The ticket's version"
 msgstr "A versão do tíquete"
 
-#: colab/templates/open-data.html:97
+#: templates/open-data.html:97
 msgid "The wiki's author username"
 msgstr "O username do autor da wiki"
 
-#: colab/templates/open-data.html:98
+#: templates/open-data.html:98
 msgid "When the wiki's were created"
 msgstr "Quando a wiki foi criada"
 
-#: colab/templates/open-data.html:100
+#: templates/open-data.html:100
 msgid "The username of the last user who modified the wiki"
 msgstr "O username do último usuário a modificar a wiki"
 
-#: colab/templates/open-data.html:101
+#: templates/open-data.html:101
 msgid "The wiki's name"
 msgstr "O nome da wiki"
 
-#: colab/templates/open-data.html:102
+#: templates/open-data.html:102
 msgid "the wiki's content"
 msgstr "O conteúdo da wiki"
 
-#: colab/templates/open-data.html:109
+#: templates/open-data.html:109
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#: colab/templates/open-data.html:112
+#: templates/open-data.html:112
 msgid "Results per page"
 msgstr "Resultados por página"
 
-#: colab/templates/open-data.html:113
+#: templates/open-data.html:113
 msgid "Number of results to be displayed per page."
 msgstr "Número de resultados a serem exibidos por página."
 
-#: colab/templates/open-data.html:114
+#: templates/open-data.html:114
 msgid "Default: 20"
 msgstr "Padrão: 20"
 
-#: colab/templates/open-data.html:118
+#: templates/open-data.html:118
 msgid "Starts of n element"
 msgstr "Inicia pelo n-ésimo elemento"
 
-#: colab/templates/open-data.html:119
+#: templates/open-data.html:119
 msgid "Where n is the index of the first result to appear in the page."
 msgstr "Onde n é o índice do primeiro resultado a ser exibido na página."
 
-#: colab/templates/open-data.html:120
+#: templates/open-data.html:120
 msgid "Default: 0"
 msgstr "Padrão: 0"
 
-#: colab/templates/open-data.html:122
+#: templates/open-data.html:122
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: colab/templates/open-data.html:124
+#: templates/open-data.html:124
 msgid "The field name"
 msgstr "O nome do campo"
 
-#: colab/templates/open-data.html:125
+#: templates/open-data.html:125
 msgid ""
 "If you are looking for a specific wiki, and you know the wiki's name, you "
 "can filter it as below"
@@ -1211,11 +1363,11 @@ msgstr ""
 "Se você está buscando especificamente por uma wiki e você sabe o nome da "
 "wiki, você pode utilizar o filtro abaixo"
 
-#: colab/templates/open-data.html:126
+#: templates/open-data.html:126
 msgid "WikiName"
 msgstr "WikiName"
 
-#: colab/templates/open-data.html:127
+#: templates/open-data.html:127
 msgid ""
 "Where &quot;name&quot; is the fieldname and &quot;WikiName&quot; is the "
 "value you want to filter."
@@ -1223,11 +1375,11 @@ msgstr ""
 "Onde  &quot;name&quot; é o fieldname e &quot;WikiName&quot; é o value que "
 "você quer filtrar."
 
-#: colab/templates/open-data.html:128
+#: templates/open-data.html:128
 msgid "Usage"
 msgstr "Uso"
 
-#: colab/templates/open-data.html:129
+#: templates/open-data.html:129
 msgid ""
 "You can also filter using Django lookup fields with the double underscores, "
 "just as below"
@@ -1235,15 +1387,15 @@ msgstr ""
 "Você também pode filtrar usando lookup fields do Django com underscores "
 "duplos, como demonstrado abaixo"
 
-#: colab/templates/open-data.html:131 colab/templates/open-data.html.py:132
+#: templates/open-data.html:131 templates/open-data.html.py:132
 msgid "test"
 msgstr "test"
 
-#: colab/templates/open-data.html:133
+#: templates/open-data.html:133
 msgid "Usage with relationships"
 msgstr "Uso com relacionamentos"
 
-#: colab/templates/open-data.html:134
+#: templates/open-data.html:134
 msgid ""
 "You can use related fields to filter too. So, you can filter by any field of "
 "emailaddress using the 'from_address' field of message, which has a relation "
@@ -1255,7 +1407,7 @@ msgstr ""
 "mensagem, que tem relação com emailaddress. Para tal você precisará utilizar "
 "os underscores duplos e o nome do campo desejado. Veja o exemplo abaixo"
 
-#: colab/templates/open-data.html:136
+#: templates/open-data.html:136
 msgid ""
 "So, real_name is a field of emailaddress, and you had access to this field "
 "by a message field called from_address and using double underscore to say "
@@ -1265,7 +1417,7 @@ msgstr ""
 "campo do do objeto message, from_address, e underscores duplos para "
 "referenciar que este campo pertence ao modelo relacionado"
 
-#: colab/templates/open-data.html:137
+#: templates/open-data.html:137
 msgid ""
 "Note: email filters must be exact. Which means that __contains, "
 "__startswith, __endswith and others won't work"
@@ -1273,7 +1425,7 @@ msgstr ""
 "Nota: os filtros de email devem ser exatos. Isso significa que __contains, "
 "__startswith, __endswith e outros métodos de busca parcial não funcionarão"
 
-#: colab/templates/open-data.html:138
+#: templates/open-data.html:138
 msgid ""
 "Another example of usage with relations. Used to retrieve all messages of a "
 "given user, using the username or the email field"
@@ -1281,6 +1433,40 @@ msgstr ""
 "Outro exemplo de uso com relacionamento. Usado para recuperar todos as "
 "mensagem de um dado usuário usando o campo username ou email"
 
+#~ msgid "Confirm Password "
+#~ msgstr "Confirmar senha"
+
+#~ msgid "Enter the same password as above, for verification."
+#~ msgstr "Digite a mesma senha que acima, para verificação."
+
+#~ msgid ""
+#~ "We've emailed you instructions for setting your password. You should be "
+#~ "receiving them shortly."
+#~ msgstr ""
+#~ "Nos enviamos o email com as intruções para mudança de senha. Em breve "
+#~ "você deve recebê-lo."
+
+#~ msgid "Tickets"
+#~ msgstr "Tíquetes"
+
+#~ msgid "Attachments"
+#~ msgstr "Anexos"
+
+#~ msgid "Blogs"
+#~ msgstr "Blogs"
+
+#~ msgid "Contribute"
+#~ msgstr "Contribua"
+
+#~ msgid "Last email imported at"
+#~ msgstr "Último e-mail importado em"
+
+#~ msgid "The contents of this site is published under license"
+#~ msgstr "O conteúdo deste site está publicado sob a licença"
+
+#~ msgid "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
+#~ msgstr "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
+
 #~ msgid "Please correct the errors below and try again"
 #~ msgstr "Por favor, corrija os erros abaixo e tente novamente"
 
diff --git a/colab/static/css/footer.css b/colab/static/css/footer.css
index 2e13cf0..4b54469 100644
--- a/colab/static/css/footer.css
+++ b/colab/static/css/footer.css
@@ -1,67 +1,68 @@
-/*Footer*/
-
-
-.footer-content{
-  background: rgb(213,213,213);
-  padding: 20px 0;
-  font-family: 'Open Sans';
-}
-
-.footer-links a{
-  color:#2c66ce;
-  font-size: 13px;
-  line-height: 1.7em;
-}
-
-.footer-links a:hover{
-  background: none;
-  text-decoration: underline;
-}
-
-.footer-links{
-  color:#2c66ce;
-  border-left:1px dotted #2c66ce;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-.footer-links dt{
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 1.3em;
-  margin-bottom: 8px;
-}
-
-.footer-links dd{
-  padding-bottom: 3px
-}
-
-.footer-gov{
-  background: #0042b2;
-}
-
-.footer-gov > .container{
-  padding: 2em 0;
-}
-
-.footer-gov .institucionais a{
-  display:table-cell;
-  vertical-align: middle;
-}
-
-.footer-gov a:hover{
-  text-decoration: none;
-}
-
-.footer-gov span{
-  display: none;
-}
-
-.footer-gov .logo-sgpr img, .logo-acesso img{
-  padding-right: 15%;
-}
-
-.go-top a{
-  color: #717782;
-  line-height: 1.4em;
-}
+/*Footer*/
+
+
+.footer-content{
+  background: rgb(213,213,213);
+  padding: 20px 0;
+  font-family: 'Open Sans';
+}
+
+.footer-links a{
+  color:#2c66ce;
+  font-size: 13px;
+  line-height: 1.7em;
+}
+
+.footer-links a:hover{
+  background: none;
+  text-decoration: underline;
+}
+
+.footer-links{
+  color:#2c66ce;
+  border-left:1px dotted #2c66ce;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+.footer-links dt{
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 1.3em;
+  margin-bottom: 8px;
+  font-family: "Open Sans"
+}
+
+.footer-links dd{
+  padding-bottom: 3px
+}
+
+.footer-gov{
+  background: #0042b2;
+}
+
+.footer-gov > .container{
+  padding: 2em 0;
+}
+
+.footer-gov .institucionais a{
+  display:table-cell;
+  vertical-align: middle;
+}
+
+.footer-gov a:hover{
+  text-decoration: none;
+}
+
+.footer-gov span{
+  display: none;
+}
+
+.footer-gov .logo-sgpr img, .logo-acesso img{
+  padding-right: 15%;
+}
+
+.go-top a{
+  color: #717782;
+  line-height: 1.4em;
+}
diff --git a/colab/templates/footer.html b/colab/templates/footer.html
index 3e5d53a..9030e75 100644
--- a/colab/templates/footer.html
+++ b/colab/templates/footer.html
@@ -1,106 +1,80 @@
 {% load i18n browserid conversejs gravatar proxy %}
 {% load static from staticfiles %}
 
-<div class="row footer-gov">
-
+<footer>
+<div class="row">
+  <div class="container">
+    <div class="pull-right go-top">
+      <a href="#header"><i class="icon-chevron-up"></i>{% trans "Back to top" %}</a>
+    </div>
+  </div>
   <div class="col-lg-12 footer-content">
     <div class="container">
       <div class="row">
-        <div class="col-md-2 col-md-offset-1 footer-links">
-          <h2>Assuntos</h2>
-          <ul class="nav">
-            <li><a href="http://www.softwarepublico.gov.br/O_que_e_o_SPB" title="SPB">SPB</a></li>
-            <li><a href="http://pagina.softwarepublico.gov.br/sisp" title="SISP-SPB">SISP-SPB </a></li>
-            <li><a href="http://www.softwarepublico.gov.br/5cqualibr/avaliaspb/wiki/Sobre" title="AvaliaSPB">AvaliaSPB</a></li>
-            <li><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="4CMBr">4CMBr</a></li>
-            <li><a href="http://www.softwarepublico.gov.br/5cqualibr/xowiki/" title="5cQualiBr" href="#">5cQualiBr</a></li>
-          </ul>
-        </div>
-        <div class="col-md-2 footer-links">
-          <h2>Serviços</h2>
-          <ul class="nav">
-            <li class="portalservicos-item">
-                <a title="Perguntas frequentes" href="#">Perguntas frequentes</a>
-            </li>
-            <li class="portalservicos-item">
-                <a title="Contato" href="#">Contato</a>
-            </li>
-            <li class="portalservicos-item">
-                <a title="Serviços da [Denominação]" href="#">Serviços da [Denominação]</a>
-            </li>
-            <li class="portalservicos-item">
-                <a title="Dados abertos" href="#">Dados abertos</a>
-            </li>
-            <li class="portalservicos-item">
-                <a title="Área de imprensa" href="#">Área de imprensa</a>
-            </li>
-          </ul>
-        </div>
-        <div class="col-md-2 footer-links">
-          <h2>Redes Sociais</h2>
-          <ul class="nav">
-            <li class="portalredes-item"><a title="Twitter" href="https://twitter.com/twitter">
+        <dl class="col-md-2 col-md-offset-1 footer-links">
+          <dt>{% trans "Subjects" %}</dt>
+          <dd><a href="http://www.softwarepublico.gov.br/O_que_e_o_SPB" title="SPB">{% trans "SPB" %}</a></dd>
+          <dd><a href="http://pagina.softwarepublico.gov.br/sisp" title="SISP-SPB">{% trans "SISP-SPB" %}</a></dd>
+          <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/avaliaspb/wiki/Sobre" title="AvaliaSPB">{% trans "AvaliaSPB" %}</a></dd>
+          <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="4CMBr">4CMBr</a></dd>
+          <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/xowiki/" title="5cQualiBr" href="#">{% trans "5cQualiBr" %}</a></dd>
+        </dl>
+        <dl class="col-md-2 footer-links">
+          <dt>{% trans "Services" %}</dt>
+            <dd class="portalservicos-item">
+                <a title="Perguntas frequentes" href="#">{% trans "Frequently Asked Questions" %}</a>
+            </dd>
+            <dd class="portalservicos-item">
+                <a title="Contato" href="#">{% trans "Contact" %}</a>
+            </dd>
+            <dd class="portalservicos-item">
+                <a title="Serviços da [Denominação]" href="#">{% trans " [Denomination's] services" %}</a>
+            </dd>
+            <dd class="portalservicos-item">
+                <a title="Dados abertos" href="#">{% trans "Open data" %}</a>
+            </dd>
+            <dd class="portalservicos-item">
+                <a title="Área de imprensa" href="#">{% trans "Press area" %}</a>
+            </dd>
+        </dl>
+        <dl class="col-md-2 footer-links">
+          <dt>{% trans "Social networks" %}</dt>
+            <dd class="portalredes-item"><a title="Twitter" href="https://twitter.com/twitter">
                 Twitter</a>
-              </li>
-              <li class="portalredes-item"><a title="YouTube" href="http://youtube.com/youtube">
+              </dd>
+              <dd class="portalredes-item"><a title="YouTube" href="http://youtube.com/youtube">
                 Youtube</a>
-              </li>
-              <li class="portalredes-item"><a title="Facebook" href="http://facebook.com/facebook">
+              </dd>
+              <dd class="portalredes-item"><a title="Facebook" href="http://facebook.com/facebook">
                 Facebook</a>
-              </li>
-              <li class="portalredes-item"><a title="Flickr" href="http://flickr.com/flickr">
+              </dd>
+              <dd class="portalredes-item"><a title="Flickr" href="http://flickr.com/flickr">
                 Flickr</a>
-              </li>
-          </ul>
-        </div>
-        <div class="col-md-2 footer-links">
-          <h2>RSS</h2>
-          <ul class="nav">
-            <li><a href="#" title="O que é?">O que é?</a></li>
-            <li><a href="#" title="Assine">Assine</a></li>
-          </ul>
-        </div>
-        <div class="col-md-2 footer-links">
-          <h2>Navegação</h2>
-          <ul class="nav">
-            <li><a href="#">Acessibilidade</a></li>
-            <li><a href="#">Mapa do site</a></li>
-            <li><a href="#">Versión en Español</a></li>
-            <li><a href="#">English version</a></li>
-          </ul>
-        </div>
+              </dd>
+        </dl>
+        <dl class="col-md-2 footer-links">
+          <dt>RSS</dt>
+            <dd><a href="#" title="O que é?">{% trans "What is it?" %}</a></dd>
+            <dd><a href="#" title="Assine">{% trans "Subscribe" %}</a></dd>
+        </dl>
+        <dl class="col-md-2 footer-links">
+          <dt>{% trans "Navigation" %}</dt>
+            <dd><a href="#">{% trans "Accessibility" %}</a></dd>
+            <dd><a href="#">{% trans "Site map" %}</a></dd>
+            <dd><a href="#">Versión en Español</a></dd>
+            <dd><a href="#">English version</a></dd>
+        </dl>
       </div>
     </div>
   </div>
-
-  <div class="row footer-logos">
+  <div class="row footer-gov">
     <div class="container">
-      <div class="col-md-8">
-        <a class="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><span>Acesso a Informação</span></a>
+      <div class="col-md-7">
+        <a class="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><img class="img-responsive pull-left" src="{% static 'img/acesso-a-informacao.png' %}" ><span>{% trans "Information access" %}</span></a>
       </div>
-      <div class="col-md-4 institucionais">
-        <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><span>Secretaria-geral da Presidência da República</span></a>
-        <a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><span>Brasil - Governo Federal</span></a>
+      <div class="col-md-5 institucionais">
+        <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>{% trans "Republic Presidency General Secretary" %}<a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/brasil.png' %}" ><span>{% trans "Brazil - Federal Government" %}</span></a>
       </div>
     </div>
   </div>
-
-  <div class="footer row col-lg-12">
-    {% if user.is_staff %}
-    <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p>
-    {% endif %}
-    <p class="col-lg-12 text-center">
-      <a href="{% url 'opendata' %}"><img src="{% static 'img/opendata3.png' %}"/></a>
-      <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{% static 'img/cc_by_sa.png' %}"/></a>
-    </p>
-    <p class="col-lg-12 text-center">
-      {% trans "The contents of this site is published under license" %}:
-      <br>
-      <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">
-        {% trans "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual" %}.
-      </a>
-    </p>
-  </div>
-
-
-</div>
+</footer>
--
libgit2 0.21.2