Refining footer's style and structure

Melissa Wen
2 parents db4bbd7c 71c3552b
Showing 5 changed files with 1039 additions and 567 deletions Show diff stats
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/static/css/footer.css
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 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:12+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,250 +17,327 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: accounts/admin.py:40
+#: colab/accounts/admin.py:18
 msgid "Personal info"
 msgstr ""
-#: accounts/admin.py:43
+#: colab/accounts/admin.py:24
 msgid "Permissions"
 msgstr ""
-#: accounts/admin.py:45
+#: colab/accounts/admin.py:28
 msgid "Important dates"
 msgstr ""
-#: accounts/forms.py:25
+#: colab/accounts/forms.py:37
 msgid "Social account does not exist"
 msgstr ""
-#: accounts/forms.py:61 accounts/templates/accounts/user_detail.html:38
+#: colab/accounts/forms.py:65 colab/accounts/forms.py:71
+#: colab/accounts/forms.py:77
+msgid "This field cannot be blank."
+msgstr ""
+
+#: colab/accounts/forms.py:118
+#: colab/accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr ""
-#: accounts/forms.py:62
+#: colab/accounts/forms.py:119
 msgid "Write something about you in 200 characters or less."
 msgstr ""
-#: accounts/forms.py:81
+#: colab/accounts/forms.py:147
 msgid "Mailing lists"
 msgstr ""
-#: accounts/forms.py:88
+#: colab/accounts/forms.py:154 colab/accounts/forms.py:207
+#: colab/accounts/forms.py:261 colab/accounts/forms.py:298
+#: colab/accounts/forms.py:488
 msgid "Password"
 msgstr ""
-#: accounts/forms.py:90
+#: colab/accounts/forms.py:156 colab/accounts/forms.py:209
 msgid "Password confirmation"
 msgstr ""
-#: accounts/forms.py:92
-msgid "Enter the same password as above, for verification."
+#: colab/accounts/forms.py:177
+msgid "Password mismatch"
+msgstr ""
+
+#: colab/accounts/forms.py:195
+msgid "A user with that username already exists."
 msgstr ""
-#: accounts/forms.py:110
-msgid "Password mismatch"
+#: colab/accounts/forms.py:196 colab/accounts/forms.py:422
+#: colab/accounts/forms.py:486
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: colab/accounts/forms.py:198 colab/accounts/forms.py:255
+#: colab/search/forms.py:37
+msgid "Username"
+msgstr ""
+
+#: colab/accounts/forms.py:256
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: colab/accounts/forms.py:259
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: colab/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
+#: colab/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 ""
+
+#: colab/accounts/forms.py:303
+msgid "This account is inactive."
+msgstr ""
+
+#: colab/accounts/forms.py:366
+msgid "Email"
+msgstr ""
+
+#: colab/accounts/forms.py:424
+msgid "New password"
+msgstr ""
+
+#: colab/accounts/forms.py:426
+msgid "New password confirmation"
+msgstr ""
+
+#: colab/accounts/forms.py:457
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: colab/accounts/forms.py:460
+msgid "Old password"
+msgstr ""
+
+#: colab/accounts/forms.py:490
+msgid "Password (again)"
 msgstr ""
-#: accounts/models.py:65
+#: colab/accounts/models.py:85
 msgid "Required. 30 characters or fewer. Letters, digits and ./+/-/_ only."
 msgstr ""
-#: accounts/models.py:70
+#: colab/accounts/models.py:90
 msgid "Enter a valid username."
 msgstr ""
-#: accounts/templates/accounts/change_password.html:8
+#: colab/accounts/templates/accounts/change_password.html:8
 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
+#: 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:26
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:28
 msgid "Change Password"
 msgstr ""
-#: accounts/templates/accounts/login.html:7
+#: colab/accounts/templates/accounts/login.html:7
 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
+#: colab/accounts/templates/accounts/login.html:8
+#: colab/accounts/templates/registration/login.html:34
+#: colab/accounts/templates/registration/login.html:54
+#: colab/templates/header.html:37 colab/templates/header.html.py:42
+#: colab/templates/header.html:46 colab/templates/header.html.py:51
 msgid "Login"
 msgstr ""
-#: accounts/templates/accounts/manage_subscriptions.html:6
+#: colab/accounts/templates/accounts/manage_subscriptions.html:6
 msgid "Group Subscriptions"
 msgstr ""
-#: accounts/templates/accounts/manage_subscriptions.html:36
+#: colab/accounts/templates/accounts/manage_subscriptions.html:36
 msgid "Update subscriptions"
 msgstr ""
-#: accounts/templates/accounts/user_create_form.html:5
+#: colab/accounts/templates/accounts/user_create_form.html:5
 msgid "Sign up"
 msgstr ""
-#: accounts/templates/accounts/user_create_form.html:10
-msgid "Please correct the errors below and try again"
+#: 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:12
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:14
+#: colab/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
+#: colab/accounts/templates/accounts/user_create_form.html:17
 msgid "Required fields"
 msgstr ""
-#: accounts/templates/accounts/user_create_form.html:29
+#: colab/accounts/templates/accounts/user_create_form.html:29
 msgid "Personal Information"
 msgstr ""
-#: accounts/templates/accounts/user_create_form.html:46
+#: colab/accounts/templates/accounts/user_create_form.html:46
 msgid "Subscribe to groups"
 msgstr ""
-#: accounts/templates/accounts/user_create_form.html:60
-#: templates/base.html:181 templates/base.html.py:186
+#: colab/accounts/templates/accounts/user_create_form.html:60
+#: colab/templates/header.html:41 colab/templates/header.html.py:50
 msgid "Register"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:8 badger/models.py:21
+#: colab/accounts/templates/accounts/user_detail.html:8
+#: colab/badger/models.py:21
 msgid "Messages"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:9 badger/models.py:22
-#: templates/home.html:7
+#: colab/accounts/templates/accounts/user_detail.html:9
+#: colab/badger/models.py:22 colab/templates/home.html:7
 msgid "Contributions"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:29
+#: colab/accounts/templates/accounts/user_detail.html:29
 msgid "edit profile"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:30
+#: colab/accounts/templates/accounts/user_detail.html:30
 msgid "group membership"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:65
+#: colab/accounts/templates/accounts/user_detail.html:66
 msgid "Twitter account"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:68
+#: colab/accounts/templates/accounts/user_detail.html:69
 msgid "Facebook account"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:73
+#: colab/accounts/templates/accounts/user_detail.html:74
 msgid "Google talk account"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:77
+#: colab/accounts/templates/accounts/user_detail.html:78
 msgid "Github account"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:81
+#: colab/accounts/templates/accounts/user_detail.html:82
 msgid "Personal webpage"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:87
+#: colab/accounts/templates/accounts/user_detail.html:89
 msgid "Groups: "
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:100
+#: colab/accounts/templates/accounts/user_detail.html:102
 msgid "Collaborations by Type"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:116
+#: colab/accounts/templates/accounts/user_detail.html:118
 msgid "Participation by Group"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:132 badger/models.py:69
+#: colab/accounts/templates/accounts/user_detail.html:134
+#: colab/badger/models.py:69
 msgid "Badges"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:151
+#: colab/accounts/templates/accounts/user_detail.html:153
 msgid "Latest posted"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:156
+#: colab/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
+#: colab/accounts/templates/accounts/user_detail.html:162
 msgid "View more posts..."
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:166
+#: colab/accounts/templates/accounts/user_detail.html:168
 msgid "Latest contributions"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:171
+#: colab/accounts/templates/accounts/user_detail.html:173
 msgid "No contributions of this user so far."
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:175
+#: colab/accounts/templates/accounts/user_detail.html:177
 msgid "View more contributions..."
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:65
+#: colab/accounts/templates/accounts/user_update_form.html:65
 msgid "We sent a verification email to "
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:66
+#: colab/accounts/templates/accounts/user_update_form.html:66
 msgid "Please follow the instructions in it."
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:110
+#: colab/accounts/templates/accounts/user_update_form.html:110
 msgid "profile information"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:115
+#: colab/accounts/templates/accounts/user_update_form.html:115
 msgid "Change your avatar at Gravatar.com"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:142 search/utils.py:8
+#: colab/accounts/templates/accounts/user_update_form.html:142
+#: colab/search/utils.py:51
 msgid "Emails"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:151
+#: colab/accounts/templates/accounts/user_update_form.html:151
 msgid "Primary"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:154
+#: colab/accounts/templates/accounts/user_update_form.html:154
 msgid "Setting..."
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:154
+#: colab/accounts/templates/accounts/user_update_form.html:154
 msgid "Set as Primary"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:155
+#: colab/accounts/templates/accounts/user_update_form.html:155
 msgid "Deleting..."
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:155
-#: accounts/templates/accounts/user_update_form.html:167
+#: colab/accounts/templates/accounts/user_update_form.html:155
+#: colab/accounts/templates/accounts/user_update_form.html:167
 msgid "Delete"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:166
+#: colab/accounts/templates/accounts/user_update_form.html:166
 msgid "Sending verification..."
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:166
+#: colab/accounts/templates/accounts/user_update_form.html:166
 msgid "Verify"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:174
+#: colab/accounts/templates/accounts/user_update_form.html:174
 msgid "Add another email address:"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:177
+#: colab/accounts/templates/accounts/user_update_form.html:177
 msgid "Add"
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:193
+#: colab/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,802 +346,997 @@ msgid &quot;&quot;
 "what you are doing."
 msgstr ""
-#: accounts/templates/accounts/user_update_form.html:203
+#: colab/accounts/templates/accounts/user_update_form.html:217
 msgid "Update"
 msgstr ""
-#: accounts/views.py:148
-msgid "Your profile has been created!"
+#: colab/accounts/templates/registration/login.html:10
+#: colab/accounts/templates/registration/password_change_form_custom.html:10
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:12
+msgid "Please correct the error below and try again."
+msgstr ""
+
+#: colab/accounts/templates/registration/login.html:56
+msgid "Forgot Password?"
+msgstr ""
+
+#: colab/accounts/templates/registration/password_change_form_custom.html:54
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:51
+msgid "Change my password"
 msgstr ""
-#: accounts/views.py:149
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:3
+msgid "Setting New password"
+msgstr ""
+
+#: colab/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 ""
+
+#: colab/accounts/templates/registration/password_reset_form_custom.html:26
+msgid "Email address:"
+msgstr ""
+
+#: colab/accounts/templates/registration/password_reset_form_custom.html:37
+msgid "Reset password"
 msgstr ""
-#: accounts/views.py:233
+#: colab/accounts/views.py:157
+msgid "Your profile has been created!"
+msgstr ""
+
+#: colab/accounts/views.py:241
 msgid "Could not change your password. Please, try again later."
 msgstr ""
-#: accounts/views.py:242
+#: colab/accounts/views.py:250
 msgid "You've changed your password successfully!"
 msgstr ""
-#: badger/forms.py:19 badger/models.py:39 settings.py:160
+#: colab/accounts/views.py:256
+msgid "Your password was changed."
+msgstr ""
+
+#: colab/accounts/views.py:272
+msgid "Your password has been set. You may go ahead and log in now."
+msgstr ""
+
+#: colab/badger/forms.py:17 colab/badger/models.py:39 colab/settings.py:162
 msgid "Image"
 msgstr ""
-#: badger/forms.py:30
+#: colab/badger/forms.py:28
 msgid "You must add an Image"
 msgstr ""
-#: badger/models.py:11
+#: colab/badger/models.py:11
 msgid "Greater than or equal"
 msgstr ""
-#: badger/models.py:12
+#: colab/badger/models.py:12
 msgid "less than or equal"
 msgstr ""
-#: badger/models.py:13
+#: colab/badger/models.py:13
 msgid "Equal"
 msgstr ""
-#: badger/models.py:14
+#: colab/badger/models.py:14
 msgid "Biggest"
 msgstr ""
-#: badger/models.py:17
+#: colab/badger/models.py:17
 msgid "Automatically"
 msgstr ""
-#: badger/models.py:18
+#: colab/badger/models.py:18
 msgid "Manual"
 msgstr ""
-#: badger/models.py:23
+#: colab/badger/models.py:23
 msgid "Wikis"
 msgstr ""
-#: badger/models.py:24
+#: colab/badger/models.py:24
 msgid "Revisions"
 msgstr ""
-#: badger/models.py:25
-#: search/templates/search/includes/search_filters.html:122
+#: colab/badger/models.py:25
+#: colab/search/templates/search/includes/search_filters.html:122
 msgid "Ticket"
 msgstr ""
-#: badger/models.py:35
+#: colab/badger/models.py:35
 msgid "Title"
 msgstr ""
-#: badger/models.py:37
+#: colab/badger/models.py:37
 msgid "Description"
 msgstr ""
-#: badger/models.py:40 search/forms.py:18
+#: colab/badger/models.py:40 colab/search/forms.py:17
 msgid "Type"
 msgstr ""
-#: badger/models.py:42
+#: colab/badger/models.py:42
 msgid "User attribute"
 msgstr ""
-#: badger/models.py:48
+#: colab/badger/models.py:48
 msgid "Comparison"
 msgstr ""
-#: badger/models.py:55
+#: colab/badger/models.py:55
 msgid "Value"
 msgstr ""
-#: badger/models.py:61
+#: colab/badger/models.py:61
 msgid "Awardees"
 msgstr ""
-#: badger/models.py:65
+#: colab/badger/models.py:65
 msgid "Order"
 msgstr ""
-#: badger/models.py:68
+#: colab/badger/models.py:68
 msgid "Badge"
 msgstr ""
-#: home/context_processors.py:15
+#: colab/home/context_processors.py:20
 msgid "Fork me!"
 msgstr ""
-#: rss/feeds.py:13
+#: colab/proxy/gitlab/apps.py:12 colab/proxy/jenkins/apps.py:12
+#: colab/proxy/trac/apps.py:12 colab/settings.py:159
+#: tests/plugins.d/gitlab.py:10
+msgid "Code"
+msgstr ""
+
+#: colab/proxy/gitlab/apps.py:14 tests/plugins.d/gitlab.py:12
+msgid "Public Projects"
+msgstr ""
+
+#: colab/proxy/gitlab/apps.py:17 colab/proxy/noosfero/apps.py:18
+#: tests/plugins.d/gitlab.py:15
+msgid "Profile"
+msgstr ""
+
+#: colab/proxy/gitlab/apps.py:18 tests/plugins.d/gitlab.py:16
+msgid "New Project"
+msgstr ""
+
+#: colab/proxy/gitlab/apps.py:19 tests/plugins.d/gitlab.py:17
+msgid "Projects"
+msgstr ""
+
+#: colab/proxy/gitlab/apps.py:20 colab/templates/header.html:21
+#: tests/plugins.d/gitlab.py:18
+msgid "Groups"
+msgstr ""
+
+#: colab/proxy/gitlab/apps.py:21 tests/plugins.d/gitlab.py:19
+msgid "Issues"
+msgstr ""
+
+#: colab/proxy/gitlab/apps.py:22 tests/plugins.d/gitlab.py:20
+msgid "Merge Requests"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:23
+msgid "Gitlab Project"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:24
+msgid "Gitlab Projects"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:59
+msgid "Gitlab Merge Request"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:60
+msgid "Gitlab Merge Requests"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:87
+msgid "Gitlab Issue"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:88
+msgid "Gitlab Issues"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:142 colab/proxy/gitlab/models.py:143
+msgid "Gitlab Comments"
+msgstr ""
+
+#: colab/proxy/jenkins/apps.py:14
+msgid "Continuos Integration"
+msgstr ""
+
+#: colab/proxy/noosfero/apps.py:12
+msgid "Social"
+msgstr ""
+
+#: colab/proxy/noosfero/apps.py:14
+msgid "Users"
+msgstr ""
+
+#: colab/proxy/noosfero/apps.py:15
+msgid "Communities"
+msgstr ""
+
+#: colab/proxy/noosfero/apps.py:19
+msgid "Control panel"
+msgstr ""
+
+#: colab/proxy/trac/apps.py:14
+msgid "Timeline"
+msgstr ""
+
+#: colab/proxy/trac/apps.py:15
+#: colab/search/templates/search/includes/search_filters.html:118
+#: colab/templates/open-data.html:130
+msgid "Wiki"
+msgstr ""
+
+#: colab/proxy/trac/apps.py:16
+msgid "View Tickets"
+msgstr ""
+
+#: colab/proxy/trac/apps.py:17
+msgid "Roadmap"
+msgstr ""
+
+#: colab/proxy/trac/apps.py:18
+msgid "Browse Source"
+msgstr ""
+
+#: colab/proxy/trac/apps.py:21
+msgid "New Ticket"
+msgstr ""
+
+#: colab/proxy/trac/apps.py:22
+msgid "New Wiki Page"
+msgstr ""
+
+#: colab/rss/feeds.py:13
 msgid "Latest Discussions"
 msgstr ""
-#: rss/feeds.py:32
+#: colab/rss/feeds.py:32
 msgid "Discussions Most Relevance"
 msgstr ""
-#: rss/feeds.py:51
+#: colab/rss/feeds.py:51
 msgid "Latest collaborations"
 msgstr ""
-#: search/forms.py:16 search/templates/search/search.html:46
-#: templates/base.html:171
+#: colab/search/forms.py:15 colab/search/templates/search/search.html:46
+#: colab/templates/header.html:27
 msgid "Search"
 msgstr ""
-#: search/forms.py:19 search/views.py:22
+#: colab/search/forms.py:18 colab/search/views.py:22
 msgid "Author"
 msgstr ""
-#: search/forms.py:20
+#: colab/search/forms.py:19
 msgid "Modified by"
 msgstr ""
-#: search/forms.py:22
+#: colab/search/forms.py:21
 msgid "Status"
 msgstr ""
-#: search/forms.py:26 search/views.py:25
+#: colab/search/forms.py:25 colab/search/views.py:25
 msgid "Mailinglist"
 msgstr ""
-#: search/forms.py:30
+#: colab/search/forms.py:29
 msgid "Milestone"
 msgstr ""
-#: search/forms.py:31
+#: colab/search/forms.py:30
 msgid "Priority"
 msgstr ""
-#: search/forms.py:32
+#: colab/search/forms.py:31
 msgid "Component"
 msgstr ""
-#: search/forms.py:33
+#: colab/search/forms.py:32
 msgid "Severity"
 msgstr ""
-#: search/forms.py:34
+#: colab/search/forms.py:33
 msgid "Reporter"
 msgstr ""
-#: search/forms.py:35
+#: colab/search/forms.py:34
 msgid "Keywords"
 msgstr ""
-#: search/forms.py:36
+#: colab/search/forms.py:35
 msgid "Collaborators"
 msgstr ""
-#: search/forms.py:37 templates/base.html:103
+#: colab/search/forms.py:36
 msgid "Repository"
 msgstr ""
-#: search/forms.py:38
-msgid "Username"
-msgstr ""
-
-#: search/forms.py:39
+#: colab/search/forms.py:38
 msgid "Name"
 msgstr ""
-#: search/forms.py:40
+#: colab/search/forms.py:39
 msgid "Institution"
 msgstr ""
-#: search/forms.py:41
+#: colab/search/forms.py:40
 msgid "Role"
 msgstr ""
-#: search/forms.py:42 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
+#: colab/search/forms.py:41
+#: 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
 msgid "Since"
 msgstr ""
-#: search/forms.py:43 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
+#: colab/search/forms.py:42
+#: 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
 msgid "Until"
 msgstr ""
-#: search/forms.py:44
+#: colab/search/forms.py:43
 msgid "Filename"
 msgstr ""
-#: search/forms.py:45
+#: colab/search/forms.py:44
 msgid "Used by"
 msgstr ""
-#: search/forms.py:46
+#: colab/search/forms.py:45
 msgid "File type"
 msgstr ""
-#: search/forms.py:47
+#: colab/search/forms.py:46
 msgid "Size"
 msgstr ""
-#: 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
+#: 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
 msgid "Remove filter"
 msgstr ""
-#: search/templates/search/includes/search_filters.html:88
-#: search/templates/search/includes/search_filters.html:174
-#: search/templates/search/includes/search_filters.html:198
+#: 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
 msgid "Filter"
 msgstr ""
-#: search/templates/search/includes/search_filters.html:94
+#: colab/search/templates/search/includes/search_filters.html:94
 msgid "Sort by"
 msgstr ""
-#: search/templates/search/includes/search_filters.html:111
+#: colab/search/templates/search/includes/search_filters.html:111
 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
+#: colab/search/templates/search/includes/search_filters.html:126
 msgid "Changeset"
 msgstr ""
-#: search/templates/search/includes/search_filters.html:130
+#: colab/search/templates/search/includes/search_filters.html:130
 msgid "User"
 msgstr ""
-#: search/templates/search/includes/search_filters.html:134
+#: colab/search/templates/search/includes/search_filters.html:134
 msgid "Attachment"
 msgstr ""
-#: search/templates/search/includes/search_filters.html:139 search/views.py:20
+#: colab/search/templates/search/includes/search_filters.html:139
+#: colab/search/views.py:20
 msgid "Discussion"
 msgstr ""
-#: search/templates/search/search.html:5
+#: colab/search/templates/search/search.html:5
 msgid "search"
 msgstr ""
-#: search/templates/search/search.html:51
+#: colab/search/templates/search/search.html:51
 msgid "documents found"
 msgstr ""
-#: search/templates/search/search.html:62
+#: colab/search/templates/search/search.html:62
 msgid "Search here"
 msgstr ""
-#: search/templates/search/search.html:74
-#: search/templates/search/search.html:84
+#: colab/search/templates/search/search.html:74
+#: colab/search/templates/search/search.html:84
 msgid "Filters"
 msgstr ""
-#: search/templates/search/search.html:105
+#: colab/search/templates/search/search.html:105
 msgid "No results for your search."
 msgstr ""
-#: search/templates/search/search.html:107
+#: colab/search/templates/search/search.html:107
 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
+#: colab/settings.py:117
 msgid "English"
 msgstr ""
-#: settings.py:116
+#: colab/settings.py:118
 msgid "Portuguese"
 msgstr ""
-#: settings.py:117
+#: colab/settings.py:119
 msgid "Spanish"
 msgstr ""
-#: settings.py:140
+#: colab/settings.py:142
 msgid "Recent activity"
 msgstr ""
-#: settings.py:144
+#: colab/settings.py:146
 msgid "Relevance"
 msgstr ""
-#: settings.py:153
+#: colab/settings.py:155
 msgid "Document"
 msgstr ""
-#: settings.py:155
+#: colab/settings.py:157
 msgid "Presentation"
 msgstr ""
-#: settings.py:156
+#: colab/settings.py:158
 msgid "Text"
 msgstr ""
-#: settings.py:159
+#: colab/settings.py:161
 msgid "Compressed"
 msgstr ""
-#: settings.py:162
+#: colab/settings.py:164
 msgid "Spreadsheet"
 msgstr ""
-#: settings.py:254
+#: colab/settings.py:262
 msgid "Planet Colab"
 msgstr ""
-#: settings.py:255
+#: colab/settings.py:263
 msgid "Colab blog aggregator"
 msgstr ""
-#: settings.py:288
+#: colab/settings.py:297
 msgid "One Time Snippet"
 msgstr ""
-#: settings.py:289
+#: colab/settings.py:298
 msgid "In one hour"
 msgstr ""
-#: settings.py:290
+#: colab/settings.py:299
 msgid "In one week"
 msgstr ""
-#: settings.py:291
+#: colab/settings.py:300
 msgid "In one month"
 msgstr ""
-#: settings.py:292
+#: colab/settings.py:301
 msgid "Never"
 msgstr ""
-#: templates/404.html:5
+#: colab/templates/404.html:5
 msgid "Not found. Keep searching! :)"
 msgstr ""
-#: templates/500.html:2
+#: colab/templates/500.html:2
 msgid "Ooopz... something went wrong!"
 msgstr ""
-#: templates/base.html:87
-msgid "Timeline"
+#: colab/templates/base.html:82
+msgid "The login has failed. Please, try again."
 msgstr ""
-#: templates/base.html:92 templates/base.html.py:110
-msgid "Groups"
+#: colab/templates/dpaste/snippet_details.html:37
+msgid "Compare"
 msgstr ""
-#: templates/base.html:97
-msgid "Blogs"
+#: colab/templates/dpaste/snippet_details.html:47
+#, python-format
+msgid "Expires in: %(date)s"
 msgstr ""
-#: templates/base.html:105
-msgid "Public Projects"
+#: colab/templates/dpaste/snippet_details.html:49
+msgid "Snippet never expires"
 msgstr ""
-#: templates/base.html:107 templates/base.html.py:136
-msgid "Profile"
+#: colab/templates/dpaste/snippet_details.html:51
+msgid "One-time snippet"
 msgstr ""
-#: templates/base.html:108
-msgid "New Project"
+#: colab/templates/dpaste/snippet_details.html:56
+msgid "Really delete this snippet?"
 msgstr ""
-#: templates/base.html:109
-msgid "Projects"
+#: colab/templates/dpaste/snippet_details.html:58
+msgid "Delete Now"
 msgstr ""
-#: templates/base.html:111
-msgid "Issues"
+#: colab/templates/dpaste/snippet_details.html:63
+#: colab/templates/dpaste/snippet_details.html:65
+msgid "Compare Snippets"
 msgstr ""
-#: templates/base.html:112
-msgid "Merge Requests"
+#: colab/templates/dpaste/snippet_details.html:69
+#: colab/templates/dpaste/snippet_details.html:71
+msgid "View Raw"
 msgstr ""
-#: templates/base.html:120
-msgid "Social"
+#: colab/templates/dpaste/snippet_details.html:75
+msgid "Gist"
 msgstr ""
-#: templates/base.html:125
-msgid "Users"
+#: colab/templates/dpaste/snippet_details.html:88
+msgid "This is a one-time snippet."
 msgstr ""
-#: templates/base.html:130
-msgid "Communities"
+#: colab/templates/dpaste/snippet_details.html:90
+msgid "It will automatically get deleted after {{ remaining }} further views."
 msgstr ""
-#: templates/base.html:141
-msgid "Control panel"
+#: colab/templates/dpaste/snippet_details.html:92
+msgid "It will automatically get deleted after the next view."
 msgstr ""
-#: templates/base.html:150
-msgid "Contribute"
+#: colab/templates/dpaste/snippet_details.html:94
+msgid "It cannot be viewed again."
 msgstr ""
-#: templates/base.html:154
-msgid "New Wiki Page"
+#: colab/templates/dpaste/snippet_details.html:109
+msgid "Reply to this snippet"
 msgstr ""
-#: templates/base.html:156
-msgid "View Tickets"
+#: colab/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"
+#: colab/templates/dpaste/snippet_form.html:28
+msgid "Paste it"
 msgstr ""
-#: templates/base.html:160
-msgid "Roadmap"
+#: colab/templates/footer.html:8
+msgid "Back to top"
 msgstr ""
-#: templates/base.html:163
-msgid "Browse Source"
+#: colab/templates/footer.html:15
+msgid "Topics"
 msgstr ""
-#: templates/base.html:165
-msgid "Continuous Integration"
+#: colab/templates/footer.html:16
+msgid "SPB"
 msgstr ""
-#: templates/base.html:201
-msgid "My Profile"
+#: colab/templates/footer.html:17
+msgid "SISP-SPB"
 msgstr ""
-#: templates/base.html:202
-msgid "Logout"
+#: colab/templates/footer.html:18
+msgid "AvaliaSPB"
 msgstr ""
-#: templates/base.html:214 templates/base.html.py:217
-msgid "Search here..."
+#: colab/templates/footer.html:20
+msgid "5cQualiBr"
 msgstr ""
-#: templates/base.html:231
-msgid "The login has failed. Please, try again."
+#: colab/templates/footer.html:23
+msgid "Services"
+msgstr ""
+
+#: colab/templates/footer.html:25
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#: colab/templates/footer.html:28
+msgid "Contact"
+msgstr ""
+
+#: colab/templates/footer.html:31
+msgid " [Denomination's] services"
+msgstr ""
+
+#: colab/templates/footer.html:34
+msgid "Open data"
 msgstr ""
-#: templates/base.html:256
-msgid "Last email imported at"
+#: colab/templates/footer.html:37
+msgid "Press area"
 msgstr ""
-#: templates/base.html:263
-msgid "The contents of this site is published under license"
+#: colab/templates/footer.html:41
+msgid "Social networks"
 msgstr ""
-#: templates/base.html:266
-msgid "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
+#: colab/templates/footer.html:57
+msgid "What is it?"
+msgstr ""
+
+#: colab/templates/footer.html:58
+msgid "Subscribe"
+msgstr ""
+
+#: colab/templates/footer.html:61
+msgid "Navigation"
+msgstr ""
+
+#: colab/templates/footer.html:62
+msgid "Accessibility"
+msgstr ""
+
+#: colab/templates/footer.html:63
+msgid "Site map"
+msgstr ""
+
+#: colab/templates/footer.html:73
+msgid "Information access"
+msgstr ""
+
+#: colab/templates/footer.html:76
+msgid "Republic Presidency General Secretary"
+msgstr ""
+
+#: colab/templates/footer.html:76
+msgid "Brazil - Federal Government"
+msgstr ""
+
+#: colab/templates/header.html:65
+msgid "My Profile"
+msgstr ""
+
+#: colab/templates/header.html:66 colab/templates/header.html.py:70
+msgid "Logout"
+msgstr ""
+
+#: colab/templates/header.html:82 colab/templates/header.html.py:85
+msgid "Search here..."
 msgstr ""
-#: templates/home.html:17
+#: colab/templates/home.html:17
 msgid "Latest Collaborations"
 msgstr ""
-#: templates/home.html:21
+#: colab/templates/home.html:21
 msgid "RSS - Latest collaborations"
 msgstr ""
-#: templates/home.html:30
+#: colab/templates/home.html:30
 msgid "View more collaborations..."
 msgstr ""
-#: templates/home.html:37
+#: colab/templates/home.html:37
 msgid "Collaboration Graph"
 msgstr ""
-#: templates/home.html:48
+#: colab/templates/home.html:48
 msgid "Most Relevant Threads"
 msgstr ""
-#: templates/home.html:52
+#: colab/templates/home.html:52
 msgid "RSS - Most Relevant Threads"
 msgstr ""
-#: templates/home.html:60 templates/home.html.py:79
+#: colab/templates/home.html:60 colab/templates/home.html.py:79
 msgid "View more discussions..."
 msgstr ""
-#: templates/home.html:67
+#: colab/templates/home.html:67
 msgid "Latest Threads"
 msgstr ""
-#: templates/home.html:71
+#: colab/templates/home.html:71
 msgid "RSS - Latest Threads"
 msgstr ""
-#: templates/open-data.html:6
+#: colab/templates/open-data.html:6
 msgid "OpenData - Communities"
 msgstr ""
-#: templates/open-data.html:7
+#: colab/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 "
 "to create a ticket)."
 msgstr ""
-#: templates/open-data.html:9
+#: colab/templates/open-data.html:9
 msgid "Retrieving data via API"
 msgstr ""
-#: templates/open-data.html:10
+#: colab/templates/open-data.html:10
 msgid "Colab API works through HTTP/REST, always returning JSON objects."
 msgstr ""
-#: templates/open-data.html:12
+#: colab/templates/open-data.html:12
 msgid "The base API URL is"
 msgstr ""
-#: templates/open-data.html:19
+#: colab/templates/open-data.html:19
 msgid ""
 "Each model listed below has a resource_uri field available, which is the "
 "object's data URI."
 msgstr ""
-#: templates/open-data.html:20
+#: colab/templates/open-data.html:20
 msgid ""
 "The following list contains the available models to retrieve data and its "
 "fields available for filtering"
 msgstr ""
-#: 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
+#: 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
 msgid "Fields"
 msgstr ""
-#: templates/open-data.html:25
+#: colab/templates/open-data.html:25
 msgid ""
 "The email field is not shown for user's privacy, but you can use it to filter"
 msgstr ""
-#: templates/open-data.html:27
+#: colab/templates/open-data.html:27
 msgid "The user's username"
 msgstr ""
-#: templates/open-data.html:28
+#: colab/templates/open-data.html:28
 msgid "The user's email address"
 msgstr ""
-#: templates/open-data.html:29
+#: colab/templates/open-data.html:29
 msgid "What is the user's institution"
 msgstr ""
-#: templates/open-data.html:30
+#: colab/templates/open-data.html:30
 msgid "What is the user's role"
 msgstr ""
-#: templates/open-data.html:31
+#: colab/templates/open-data.html:31
 msgid "The user's first name"
 msgstr ""
-#: templates/open-data.html:32
+#: colab/templates/open-data.html:32
 msgid "The user's last name"
 msgstr ""
-#: templates/open-data.html:33
+#: colab/templates/open-data.html:33
 msgid "A mini bio of the user"
 msgstr ""
-#: templates/open-data.html:40
+#: colab/templates/open-data.html:40
 msgid ""
 "The address field is not shown for user's privacy, but you can use it to "
 "filter"
 msgstr ""
-#: templates/open-data.html:42
+#: colab/templates/open-data.html:42
 msgid "It has a relationshop with the user described above"
 msgstr ""
-#: templates/open-data.html:43
+#: colab/templates/open-data.html:43
 msgid "An email address"
 msgstr ""
-#: templates/open-data.html:44
+#: colab/templates/open-data.html:44
 msgid "The user's real name"
 msgstr ""
-#: templates/open-data.html:52
+#: colab/templates/open-data.html:52
 msgid "It has a relationship with the emailaddress described above"
 msgstr ""
-#: templates/open-data.html:53
+#: colab/templates/open-data.html:53
 msgid "The message's body"
 msgstr ""
-#: templates/open-data.html:54
+#: colab/templates/open-data.html:54
 msgid "The message's subject"
 msgstr ""
-#: templates/open-data.html:55
+#: colab/templates/open-data.html:55
 msgid "The message's id"
 msgstr ""
-#: templates/open-data.html:56
+#: colab/templates/open-data.html:56
 msgid "The message's received time"
 msgstr ""
-#: templates/open-data.html:64
+#: colab/templates/open-data.html:64
 msgid "The revision's author username"
 msgstr ""
-#: templates/open-data.html:65
+#: colab/templates/open-data.html:65
 msgid "When the revision's were created"
 msgstr ""
-#: templates/open-data.html:66
+#: colab/templates/open-data.html:66
 msgid "The revision's key"
 msgstr ""
-#: templates/open-data.html:67
+#: colab/templates/open-data.html:67
 msgid "The revision's message"
 msgstr ""
-#: templates/open-data.html:68
+#: colab/templates/open-data.html:68
 msgid "The revision's repository name"
 msgstr ""
-#: templates/open-data.html:76
+#: colab/templates/open-data.html:76
 msgid "The ticket's author username"
 msgstr ""
-#: templates/open-data.html:77
+#: colab/templates/open-data.html:77
 msgid "The ticket's component"
 msgstr ""
-#: templates/open-data.html:78
+#: colab/templates/open-data.html:78
 msgid "When the ticket's were created"
 msgstr ""
-#: templates/open-data.html:79
+#: colab/templates/open-data.html:79
 msgid "The ticket's description"
 msgstr ""
-#: templates/open-data.html:80
+#: colab/templates/open-data.html:80
 msgid "The ticket's id"
 msgstr ""
-#: templates/open-data.html:81
+#: colab/templates/open-data.html:81
 msgid "The ticket's keywords"
 msgstr ""
-#: templates/open-data.html:82
+#: colab/templates/open-data.html:82
 msgid "The ticket's milestone"
 msgstr ""
-#: templates/open-data.html:83 templates/open-data.html.py:99
+#: colab/templates/open-data.html:83 colab/templates/open-data.html.py:99
 msgid "The time of the last modification"
 msgstr ""
-#: templates/open-data.html:84
+#: colab/templates/open-data.html:84
 msgid "The username of the last user who modified the ticket"
 msgstr ""
-#: templates/open-data.html:85
+#: colab/templates/open-data.html:85
 msgid "The ticket's priority"
 msgstr ""
-#: templates/open-data.html:86
+#: colab/templates/open-data.html:86
 msgid "The ticket's severity"
 msgstr ""
-#: templates/open-data.html:87
+#: colab/templates/open-data.html:87
 msgid "The ticket's status"
 msgstr ""
-#: templates/open-data.html:88
+#: colab/templates/open-data.html:88
 msgid "The ticket's summary"
 msgstr ""
-#: templates/open-data.html:89
+#: colab/templates/open-data.html:89
 msgid "The ticket's version"
 msgstr ""
-#: templates/open-data.html:97
+#: colab/templates/open-data.html:97
 msgid "The wiki's author username"
 msgstr ""
-#: templates/open-data.html:98
+#: colab/templates/open-data.html:98
 msgid "When the wiki's were created"
 msgstr ""
-#: templates/open-data.html:100
+#: colab/templates/open-data.html:100
 msgid "The username of the last user who modified the wiki"
 msgstr ""
-#: templates/open-data.html:101
+#: colab/templates/open-data.html:101
 msgid "The wiki's name"
 msgstr ""
-#: templates/open-data.html:102
+#: colab/templates/open-data.html:102
 msgid "the wiki's content"
 msgstr ""
-#: templates/open-data.html:109
+#: colab/templates/open-data.html:109
 msgid "Parameters"
 msgstr ""
-#: templates/open-data.html:112
+#: colab/templates/open-data.html:112
 msgid "Results per page"
 msgstr ""
-#: templates/open-data.html:113
+#: colab/templates/open-data.html:113
 msgid "Number of results to be displayed per page."
 msgstr ""
-#: templates/open-data.html:114
+#: colab/templates/open-data.html:114
 msgid "Default: 20"
 msgstr ""
-#: templates/open-data.html:118
+#: colab/templates/open-data.html:118
 msgid "Starts of n element"
 msgstr ""
-#: templates/open-data.html:119
+#: colab/templates/open-data.html:119
 msgid "Where n is the index of the first result to appear in the page."
 msgstr ""
-#: templates/open-data.html:120
+#: colab/templates/open-data.html:120
 msgid "Default: 0"
 msgstr ""
-#: templates/open-data.html:122
+#: colab/templates/open-data.html:122
 msgid "Filtering"
 msgstr ""
-#: templates/open-data.html:124
+#: colab/templates/open-data.html:124
 msgid "The field name"
 msgstr ""
-#: templates/open-data.html:125
+#: colab/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"
 msgstr ""
-#: templates/open-data.html:126
+#: colab/templates/open-data.html:126
 msgid "WikiName"
 msgstr ""
-#: templates/open-data.html:127
+#: colab/templates/open-data.html:127
 msgid ""
 "Where &quot;name&quot; is the fieldname and &quot;WikiName&quot; is the "
 "value you want to filter."
 msgstr ""
-#: templates/open-data.html:128
+#: colab/templates/open-data.html:128
 msgid "Usage"
 msgstr ""
-#: templates/open-data.html:129
+#: colab/templates/open-data.html:129
 msgid ""
 "You can also filter using Django lookup fields with the double underscores, "
 "just as below"
 msgstr ""
-#: templates/open-data.html:131 templates/open-data.html.py:132
+#: colab/templates/open-data.html:131 colab/templates/open-data.html.py:132
 msgid "test"
 msgstr ""
-#: templates/open-data.html:133
+#: colab/templates/open-data.html:133
 msgid "Usage with relationships"
 msgstr ""
-#: templates/open-data.html:134
+#: colab/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 "
@@ -1072,20 +1344,20 @@ msgid &quot;&quot;
 "underscore and the field's name. See the example below"
 msgstr ""
-#: templates/open-data.html:136
+#: colab/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 "
 "you want to use a field of that relationship"
 msgstr ""
-#: templates/open-data.html:137
+#: colab/templates/open-data.html:137
 msgid ""
 "Note: email filters must be exact. Which means that __contains, "
 "__startswith, __endswith and others won't work"
 msgstr ""
-#: templates/open-data.html:138
+#: colab/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"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 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:12+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,69 +19,137 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: colab/accounts/admin.py:40
+#: colab/accounts/admin.py:18
 msgid "Personal info"
 msgstr "Informações Pessoais"
-#: colab/accounts/admin.py:43
+#: colab/accounts/admin.py:24
 msgid "Permissions"
 msgstr "Permissões"
-#: colab/accounts/admin.py:45
+#: colab/accounts/admin.py:28
 msgid "Important dates"
 msgstr "Datas importantes"
-#: colab/accounts/forms.py:25
+#: colab/accounts/forms.py:37
 msgid "Social account does not exist"
 msgstr "Conta social não existe"
-#: colab/accounts/forms.py:61
+#: colab/accounts/forms.py:65 colab/accounts/forms.py:71
+#: colab/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/forms.py:118
 #: colab/accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr "Bio"
-#: colab/accounts/forms.py:97
+#: colab/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
+#: colab/accounts/forms.py:147
 msgid "Mailing lists"
 msgstr "Listas de e-mail"
-#: colab/accounts/forms.py:130
+#: colab/accounts/forms.py:154 colab/accounts/forms.py:207
+#: colab/accounts/forms.py:261 colab/accounts/forms.py:298
+#: colab/accounts/forms.py:488
+msgid "Password"
+msgstr "Senha"
+
+#: colab/accounts/forms.py:156 colab/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
+#: colab/accounts/forms.py:177
 msgid "Password mismatch"
 msgstr "Senhas diferentes"
-#: colab/accounts/models.py:66
+#: colab/accounts/forms.py:195
+msgid "A user with that username already exists."
+msgstr ""
+
+#: colab/accounts/forms.py:196 colab/accounts/forms.py:422
+#: colab/accounts/forms.py:486
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: colab/accounts/forms.py:198 colab/accounts/forms.py:255
+#: colab/search/forms.py:37
+msgid "Username"
+msgstr "Usuário"
+
+#: colab/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."
+
+#: colab/accounts/forms.py:259
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: colab/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 ""
+
+#: colab/accounts/forms.py:301
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: colab/accounts/forms.py:303
+msgid "This account is inactive."
+msgstr ""
+
+#: colab/accounts/forms.py:366
+#, fuzzy
+#| msgid "Emails"
+msgid "Email"
+msgstr "E-mails"
+
+#: colab/accounts/forms.py:424
+#, fuzzy
+#| msgid "Reset password"
+msgid "New password"
+msgstr "Redefinir senha"
+
+#: colab/accounts/forms.py:426
+#, fuzzy
+#| msgid "Password confirmation"
+msgid "New password confirmation"
+msgstr "Confirmação de senha"
+
+#: colab/accounts/forms.py:457
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: colab/accounts/forms.py:460
+#, fuzzy
+#| msgid "Password"
+msgid "Old password"
+msgstr "Senha"
+
+#: colab/accounts/forms.py:490
+#, fuzzy
+#| msgid "Password"
+msgid "Password (again)"
+msgstr "Senha"
+
+#: colab/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
+#: colab/accounts/models.py:90
 msgid "Enter a valid username."
 msgstr "Insira um nome de usuário válido."
@@ -94,8 +162,8 @@ msgstr &quot;Trocar senha do Repositório e do Mensageiro&quot;
 #: 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
+#: 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"
@@ -106,8 +174,8 @@ msgstr &quot;Para acessar por favor clique no link abaixo:&quot;
 #: 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
+#: colab/templates/header.html:37 colab/templates/header.html.py:42
+#: colab/templates/header.html:46 colab/templates/header.html.py:51
 msgid "Login"
 msgstr "Entrar"
@@ -125,8 +193,8 @@ msgstr &quot;Cadastrar&quot;
 #: 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_change_form_custom.html:12
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:14
 #: colab/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."
@@ -144,7 +212,7 @@ msgid &quot;Subscribe to groups&quot;
 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
+#: colab/templates/header.html:41 colab/templates/header.html.py:50
 msgid "Register"
 msgstr "Cadastre-se"
@@ -166,64 +234,64 @@ msgstr &quot;editar perfil&quot;
 msgid "group membership"
 msgstr "Inscrições nos grupos"
-#: colab/accounts/templates/accounts/user_detail.html:65
+#: colab/accounts/templates/accounts/user_detail.html:66
 msgid "Twitter account"
 msgstr "Conta Twitter"
-#: colab/accounts/templates/accounts/user_detail.html:68
+#: colab/accounts/templates/accounts/user_detail.html:69
 msgid "Facebook account"
 msgstr "Conta Facebook"
-#: colab/accounts/templates/accounts/user_detail.html:73
+#: colab/accounts/templates/accounts/user_detail.html:74
 msgid "Google talk account"
 msgstr "Conta Google"
-#: colab/accounts/templates/accounts/user_detail.html:77
+#: colab/accounts/templates/accounts/user_detail.html:78
 msgid "Github account"
 msgstr "Conta Github"
-#: colab/accounts/templates/accounts/user_detail.html:81
+#: colab/accounts/templates/accounts/user_detail.html:82
 msgid "Personal webpage"
 msgstr "Página web pessoal"
-#: colab/accounts/templates/accounts/user_detail.html:87
+#: colab/accounts/templates/accounts/user_detail.html:89
 msgid "Groups: "
 msgstr "Grupos: "
-#: colab/accounts/templates/accounts/user_detail.html:100
+#: colab/accounts/templates/accounts/user_detail.html:102
 msgid "Collaborations by Type"
 msgstr "Colaborações por tipo"
-#: colab/accounts/templates/accounts/user_detail.html:116
+#: colab/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/accounts/templates/accounts/user_detail.html:134
 #: colab/badger/models.py:69
 msgid "Badges"
 msgstr "Medalhas"
-#: colab/accounts/templates/accounts/user_detail.html:151
+#: colab/accounts/templates/accounts/user_detail.html:153
 msgid "Latest posted"
 msgstr "Últimas postagens"
-#: colab/accounts/templates/accounts/user_detail.html:156
+#: colab/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
+#: colab/accounts/templates/accounts/user_detail.html:162
 msgid "View more posts..."
 msgstr "Ver mais postagens..."
-#: colab/accounts/templates/accounts/user_detail.html:166
+#: colab/accounts/templates/accounts/user_detail.html:168
 msgid "Latest contributions"
 msgstr "Últimas colaborações"
-#: colab/accounts/templates/accounts/user_detail.html:171
+#: colab/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
+#: colab/accounts/templates/accounts/user_detail.html:177
 msgid "View more contributions..."
 msgstr "Ver mais colaborações..."
@@ -244,7 +312,7 @@ msgid &quot;Change your avatar at Gravatar.com&quot;
 msgstr "Troque seu avatar em Gravatar.com"
 #: colab/accounts/templates/accounts/user_update_form.html:142
-#: colab/search/utils.py:8
+#: colab/search/utils.py:51
 msgid "Emails"
 msgstr "E-mails"
@@ -304,7 +372,7 @@ msgid &quot;Update&quot;
 msgstr "Atualizar"
 #: colab/accounts/templates/registration/login.html:10
-#: colab/accounts/templates/registration/password_change_form_custom.html:11
+#: colab/accounts/templates/registration/password_change_form_custom.html:10
 #: colab/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."
@@ -313,8 +381,8 @@ msgstr &quot;Por favor, corrija o erro abaixo e tente novamente.&quot;
 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
+#: colab/accounts/templates/registration/password_change_form_custom.html:54
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:51
 #, fuzzy
 #| msgid "Change Password"
 msgid "Change my password"
@@ -327,9 +395,12 @@ msgid &quot;Setting New password&quot;
 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 "
+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
 #, fuzzy
@@ -341,35 +412,32 @@ msgstr &quot;Um endereço de e-mail&quot;
 msgid "Reset password"
 msgstr "Redefinir senha"
-#: colab/accounts/views.py:180
+#: colab/accounts/views.py:157
 msgid "Your profile has been created!"
 msgstr "Seu perfil foi criado!"
-#: colab/accounts/views.py:264
+#: colab/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
+#: colab/accounts/views.py:250
 msgid "You've changed your password successfully!"
 msgstr "Senha alterada com sucesso!"
-#: colab/accounts/views.py:279
+#: colab/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
+#: colab/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
+#: colab/badger/forms.py:17 colab/badger/models.py:39 colab/settings.py:162
 msgid "Image"
 msgstr "Imagem"
-#: colab/badger/forms.py:30
+#: colab/badger/forms.py:28
 msgid "You must add an Image"
 msgstr "Você deve adicionar uma imagem"
@@ -418,7 +486,7 @@ msgstr &quot;Título&quot;
 msgid "Description"
 msgstr "Descrição"
-#: colab/badger/models.py:40 colab/search/forms.py:18
+#: colab/badger/models.py:40 colab/search/forms.py:17
 msgid "Type"
 msgstr "Tipo"
@@ -450,6 +518,132 @@ msgstr &quot;Medalha&quot;
 msgid "Fork me!"
 msgstr "Fork me!"
+#: colab/proxy/gitlab/apps.py:12 colab/proxy/jenkins/apps.py:12
+#: colab/proxy/trac/apps.py:12 colab/settings.py:159
+#: tests/plugins.d/gitlab.py:10
+msgid "Code"
+msgstr "Código"
+
+#: colab/proxy/gitlab/apps.py:14 tests/plugins.d/gitlab.py:12
+msgid "Public Projects"
+msgstr "Projetos Públicos"
+
+#: colab/proxy/gitlab/apps.py:17 colab/proxy/noosfero/apps.py:18
+#: tests/plugins.d/gitlab.py:15
+msgid "Profile"
+msgstr "Perfil"
+
+#: colab/proxy/gitlab/apps.py:18 tests/plugins.d/gitlab.py:16
+msgid "New Project"
+msgstr "Novo Projeto"
+
+#: colab/proxy/gitlab/apps.py:19 tests/plugins.d/gitlab.py:17
+msgid "Projects"
+msgstr "Projetos"
+
+#: colab/proxy/gitlab/apps.py:20 colab/templates/header.html:21
+#: tests/plugins.d/gitlab.py:18
+msgid "Groups"
+msgstr "Grupos"
+
+#: colab/proxy/gitlab/apps.py:21 tests/plugins.d/gitlab.py:19
+msgid "Issues"
+msgstr "Tiquetes"
+
+#: colab/proxy/gitlab/apps.py:22 tests/plugins.d/gitlab.py:20
+msgid "Merge Requests"
+msgstr "Merge Requests"
+
+#: colab/proxy/gitlab/models.py:23
+#, fuzzy
+#| msgid "New Project"
+msgid "Gitlab Project"
+msgstr "Novo Projeto"
+
+#: colab/proxy/gitlab/models.py:24
+#, fuzzy
+#| msgid "Projects"
+msgid "Gitlab Projects"
+msgstr "Projetos"
+
+#: colab/proxy/gitlab/models.py:59
+#, fuzzy
+#| msgid "Merge Requests"
+msgid "Gitlab Merge Request"
+msgstr "Merge Requests"
+
+#: colab/proxy/gitlab/models.py:60
+#, fuzzy
+#| msgid "Merge Requests"
+msgid "Gitlab Merge Requests"
+msgstr "Merge Requests"
+
+#: colab/proxy/gitlab/models.py:87
+msgid "Gitlab Issue"
+msgstr ""
+
+#: colab/proxy/gitlab/models.py:88
+#, fuzzy
+#| msgid "Issues"
+msgid "Gitlab Issues"
+msgstr "Tiquetes"
+
+#: colab/proxy/gitlab/models.py:142 colab/proxy/gitlab/models.py:143
+msgid "Gitlab Comments"
+msgstr ""
+
+#: colab/proxy/jenkins/apps.py:14
+#, fuzzy
+#| msgid "Continuous Integration"
+msgid "Continuos Integration"
+msgstr "Integração Contínua"
+
+#: colab/proxy/noosfero/apps.py:12
+msgid "Social"
+msgstr "Social"
+
+#: colab/proxy/noosfero/apps.py:14
+msgid "Users"
+msgstr "Usuários"
+
+#: colab/proxy/noosfero/apps.py:15
+msgid "Communities"
+msgstr "Comunidades"
+
+#: colab/proxy/noosfero/apps.py:19
+msgid "Control panel"
+msgstr "Painel de Controle"
+
+#: colab/proxy/trac/apps.py:14
+msgid "Timeline"
+msgstr "Linha do Tempo"
+
+#: colab/proxy/trac/apps.py:15
+#: colab/search/templates/search/includes/search_filters.html:118
+#: colab/templates/open-data.html:130
+msgid "Wiki"
+msgstr "Wiki"
+
+#: colab/proxy/trac/apps.py:16
+msgid "View Tickets"
+msgstr "Ver Tiquetes"
+
+#: colab/proxy/trac/apps.py:17
+msgid "Roadmap"
+msgstr "Planejamento"
+
+#: colab/proxy/trac/apps.py:18
+msgid "Browse Source"
+msgstr "Códigos Fontes"
+
+#: colab/proxy/trac/apps.py:21
+msgid "New Ticket"
+msgstr "Novo Tíquete"
+
+#: colab/proxy/trac/apps.py:22
+msgid "New Wiki Page"
+msgstr "Nova Página Wiki"
+
 #: colab/rss/feeds.py:13
 msgid "Latest Discussions"
 msgstr "Últimas discussões"
@@ -462,76 +656,72 @@ msgstr &quot;Discussões Mais Relevantes&quot;
 msgid "Latest collaborations"
 msgstr "Últimas colaborações"
-#: colab/search/forms.py:16 colab/search/templates/search/search.html:46
-#: colab/templates/base.html:175
+#: colab/search/forms.py:15 colab/search/templates/search/search.html:46
+#: colab/templates/header.html:27
 msgid "Search"
 msgstr "Busca"
-#: colab/search/forms.py:19 colab/search/views.py:22
+#: colab/search/forms.py:18 colab/search/views.py:22
 msgid "Author"
 msgstr "Autor"
-#: colab/search/forms.py:20
+#: colab/search/forms.py:19
 msgid "Modified by"
 msgstr "Modificado por"
-#: colab/search/forms.py:22
+#: colab/search/forms.py:21
 msgid "Status"
 msgstr "Status"
-#: colab/search/forms.py:26 colab/search/views.py:25
+#: colab/search/forms.py:25 colab/search/views.py:25
 msgid "Mailinglist"
 msgstr "Grupo"
-#: colab/search/forms.py:30
+#: colab/search/forms.py:29
 msgid "Milestone"
 msgstr "Etapa"
-#: colab/search/forms.py:31
+#: colab/search/forms.py:30
 msgid "Priority"
 msgstr "Prioridade"
-#: colab/search/forms.py:32
+#: colab/search/forms.py:31
 msgid "Component"
 msgstr "Componente"
-#: colab/search/forms.py:33
+#: colab/search/forms.py:32
 msgid "Severity"
 msgstr "Seriedade"
-#: colab/search/forms.py:34
+#: colab/search/forms.py:33
 msgid "Reporter"
 msgstr "Relator"
-#: colab/search/forms.py:35
+#: colab/search/forms.py:34
 msgid "Keywords"
 msgstr "Palavras chaves"
-#: colab/search/forms.py:36
+#: colab/search/forms.py:35
 msgid "Collaborators"
 msgstr "Colaboradores"
-#: colab/search/forms.py:37 colab/templates/base.html:107
+#: colab/search/forms.py:36
 msgid "Repository"
 msgstr "Repositório"
 #: colab/search/forms.py:38
-msgid "Username"
-msgstr "Usuário"
-
-#: colab/search/forms.py:39
 msgid "Name"
 msgstr "Nome"
-#: colab/search/forms.py:40
+#: colab/search/forms.py:39
 msgid "Institution"
 msgstr "Instituição"
-#: colab/search/forms.py:41
+#: colab/search/forms.py:40
 msgid "Role"
 msgstr "Cargo"
-#: colab/search/forms.py:42
+#: colab/search/forms.py:41
 #: 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
@@ -539,7 +729,7 @@ msgstr &quot;Cargo&quot;
 msgid "Since"
 msgstr "Desde"
-#: colab/search/forms.py:43
+#: colab/search/forms.py:42
 #: 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
@@ -547,19 +737,19 @@ msgstr &quot;Desde&quot;
 msgid "Until"
 msgstr "Até"
-#: colab/search/forms.py:44
+#: colab/search/forms.py:43
 msgid "Filename"
 msgstr "Nome do arquivo"
-#: colab/search/forms.py:45
+#: colab/search/forms.py:44
 msgid "Used by"
 msgstr "Usado por"
-#: colab/search/forms.py:46
+#: colab/search/forms.py:45
 msgid "File type"
 msgstr "Tipo do arquivo"
-#: colab/search/forms.py:47
+#: colab/search/forms.py:46
 msgid "Size"
 msgstr "Tamanho"
@@ -584,11 +774,6 @@ msgstr &quot;Ordenar por&quot;
 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
 msgid "Changeset"
 msgstr "Conjunto de Mudanças"
@@ -631,83 +816,71 @@ msgstr &quot;Não há resultados para sua busca.&quot;
 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
+#: colab/settings.py:117
 msgid "English"
 msgstr "Inglês"
-#: colab/settings.py:116
+#: colab/settings.py:118
 msgid "Portuguese"
 msgstr "Português"
-#: colab/settings.py:117
+#: colab/settings.py:119
 msgid "Spanish"
 msgstr "Espanhol"
-#: colab/settings.py:140
+#: colab/settings.py:142
 msgid "Recent activity"
 msgstr "Atividade recente"
-#: colab/settings.py:144
+#: colab/settings.py:146
 msgid "Relevance"
 msgstr "Relevância"
-#: colab/settings.py:153
+#: colab/settings.py:155
 msgid "Document"
 msgstr "Documento"
-#: colab/settings.py:155
+#: colab/settings.py:157
 msgid "Presentation"
 msgstr "Apresentação"
-#: colab/settings.py:156
+#: colab/settings.py:158
 msgid "Text"
 msgstr "Texto"
-#: colab/settings.py:159
+#: colab/settings.py:161
 msgid "Compressed"
 msgstr "Compactado"
-#: colab/settings.py:162
+#: colab/settings.py:164
 msgid "Spreadsheet"
 msgstr "Planilha"
-#: colab/settings.py:260
+#: colab/settings.py:262
 msgid "Planet Colab"
 msgstr "Planet Colab"
-#: colab/settings.py:261
+#: colab/settings.py:263
 msgid "Colab blog aggregator"
 msgstr "Agregador de blog Colab"
-#: colab/settings.py:295
+#: colab/settings.py:297
 msgid "One Time Snippet"
 msgstr "Uma única visualização"
-#: colab/settings.py:296
+#: colab/settings.py:298
 msgid "In one hour"
 msgstr "Em uma hora"
-#: colab/settings.py:297
+#: colab/settings.py:299
 msgid "In one week"
 msgstr "Em uma semana"
-#: colab/settings.py:298
+#: colab/settings.py:300
 msgid "In one month"
 msgstr "Em um mês"
-#: colab/settings.py:299
+#: colab/settings.py:301
 msgid "Never"
 msgstr "Nunca"
@@ -719,114 +892,10 @@ msgstr &quot;Não encontrado. Continue procurando! :)&quot;
 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
+#: colab/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
 #, fuzzy
 #| msgid "Comparison"
@@ -880,7 +949,8 @@ msgstr &quot;Esste é um snippet que será usado apenas uma vez.&quot;
 #: colab/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
 msgid "It will automatically get deleted after the next view."
@@ -903,14 +973,110 @@ msgid &quot;&quot;
 "    "
 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
 msgid "Paste it"
 msgstr "Cole aqui"
+#: colab/templates/footer.html:8
+msgid "Back to top"
+msgstr "Voltar ao topo"
+
+#: colab/templates/footer.html:15
+msgid "Topics"
+msgstr "Assuntos"
+
+#: colab/templates/footer.html:16
+msgid "SPB"
+msgstr ""
+
+#: colab/templates/footer.html:17
+msgid "SISP-SPB"
+msgstr ""
+
+#: colab/templates/footer.html:18
+msgid "AvaliaSPB"
+msgstr ""
+
+#: colab/templates/footer.html:20
+msgid "5cQualiBr"
+msgstr ""
+
+#: colab/templates/footer.html:23
+msgid "Services"
+msgstr "Serviços"
+
+#: colab/templates/footer.html:25
+msgid "Frequently Asked Questions"
+msgstr "Perguntas Frequentes"
+
+#: colab/templates/footer.html:28
+msgid "Contact"
+msgstr "Contato"
+
+#: colab/templates/footer.html:31
+msgid " [Denomination's] services"
+msgstr "Serviços da [Denominação]"
+
+#: colab/templates/footer.html:34
+msgid "Open data"
+msgstr "Dados abertos"
+
+#: colab/templates/footer.html:37
+msgid "Press area"
+msgstr "Área de imprensa"
+
+#: colab/templates/footer.html:41
+msgid "Social networks"
+msgstr "Redes sociais"
+
+#: colab/templates/footer.html:57
+msgid "What is it?"
+msgstr "O que é?"
+
+#: colab/templates/footer.html:58
+msgid "Subscribe"
+msgstr "Assine"
+
+#: colab/templates/footer.html:61
+msgid "Navigation"
+msgstr "Navegação"
+
+#: colab/templates/footer.html:62
+msgid "Accessibility"
+msgstr "Acessibilidade"
+
+#: colab/templates/footer.html:63
+msgid "Site map"
+msgstr "Mapa do site"
+
+#: colab/templates/footer.html:73
+msgid "Information access"
+msgstr "Acesso a Informação"
+
+#: colab/templates/footer.html:76
+msgid "Republic Presidency General Secretary"
+msgstr "Secretaria-geral da Presidência da República"
+
+#: colab/templates/footer.html:76
+msgid "Brazil - Federal Government"
+msgstr "Brasil - Governo Federal"
+
+#: colab/templates/header.html:65
+msgid "My Profile"
+msgstr "Meu Perfil"
+
+#: colab/templates/header.html:66 colab/templates/header.html.py:70
+msgid "Logout"
+msgstr "Sair"
+
+#: colab/templates/header.html:82 colab/templates/header.html.py:85
+msgid "Search here..."
+msgstr "Pesquise aqui..."
+
 #: colab/templates/home.html:17
 msgid "Latest Collaborations"
 msgstr "Últimas Colaborações"
@@ -1281,6 +1447,40 @@ msgstr &quot;&quot;
 "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"
@@ -3,7 +3,7 @@
 .footer-content{
   background: rgb(213,213,213);
-  padding: 50px 0;
+  padding: 50px 0 20px;
   font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
 }
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3		3
4	.footer-content{	4	.footer-content{
5	background: rgb(213,213,213);	5	background: rgb(213,213,213);
6	- padding: 50px 0;	6	+ padding: 50px 0 20px;
7	font-family: 'open_sansregular', Arial, Helvetica, sans-serif;	7	font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
8	}	8	}
9		9