diff --git a/amadeus/locale/pt_BR/LC_MESSAGES/django.po b/amadeus/locale/pt_BR/LC_MESSAGES/django.po
index acbca5f..fc4e42c 100644
--- a/amadeus/locale/pt_BR/LC_MESSAGES/django.po
+++ b/amadeus/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -18,79 +18,87 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: amadeus/templates/base.html:82
+#: amadeus/templates/base.html:85
 msgid "Search for subjects and resources"
 msgstr "Buscar por assuntos ou recursos"
 
-#: amadeus/templates/base.html:94
+#: amadeus/templates/base.html:104
+msgid "PT-BR"
+msgstr ""
+
+#: amadeus/templates/base.html:110
+msgid "EN"
+msgstr ""
+
+#: amadeus/templates/base.html:120
 msgid "settings"
 msgstr "configurações"
 
-#: amadeus/templates/base.html:97
+#: amadeus/templates/base.html:123
 msgid "Settings"
 msgstr "Configurações"
 
-#: amadeus/templates/base.html:100
+#: amadeus/templates/base.html:126
 msgid "Manage Users"
 msgstr "Gerenciar Usuários"
 
-#: amadeus/templates/base.html:101
+#: amadeus/templates/base.html:127
 msgid "Manage Categories"
 msgstr "Gerenciar Categorias"
 
-#: amadeus/templates/base.html:108
+#: amadeus/templates/base.html:134
 msgid "System"
 msgstr "Sistema"
 
-#: amadeus/templates/base.html:115
+#: amadeus/templates/base.html:141
 msgid "Mail Sender"
 msgstr "Remetente de Email"
 
-#: amadeus/templates/base.html:116
+#: amadeus/templates/base.html:142
 msgid "Security"
 msgstr "Segurança"
 
-#: amadeus/templates/base.html:117
+#: amadeus/templates/base.html:143
 msgid "Theme"
 msgstr "Temas"
 
-#: amadeus/templates/base.html:134
+#: amadeus/templates/base.html:160
 msgid "Profile"
 msgstr "Perfil"
 
-#: amadeus/templates/base.html:135
+#: amadeus/templates/base.html:161
 msgid "Edit Profile"
 msgstr "Editar Perfil"
 
-#: amadeus/templates/base.html:136
+#: amadeus/templates/base.html:162
 msgid "Change Password"
 msgstr "Alterar Senha"
 
-#: amadeus/templates/base.html:137
+#: amadeus/templates/base.html:163
 msgid "Delete Account"
 msgstr "Remover Conta"
 
-#: amadeus/templates/base.html:138
+#: amadeus/templates/base.html:164
 msgid "Logout"
 msgstr "Sair"
 
-#: amadeus/templates/base.html:151 amadeus/templates/base.html:195
+#: amadeus/templates/base.html:177 amadeus/templates/base.html:226
 msgid "Subjects"
 msgstr "Assuntos"
 
-#: amadeus/templates/base.html:156 amadeus/templates/base.html:200
+#: amadeus/templates/base.html:182 amadeus/templates/base.html:231
 msgid "Timeline"
 msgstr "Timeline"
 
-#: amadeus/templates/base.html:159 amadeus/templates/base.html:203
+#: amadeus/templates/base.html:185 amadeus/templates/base.html:234
 msgid "Messages"
 msgstr "Mensagens"
 
-#: amadeus/templates/base.html:162 amadeus/templates/base.html:206
+#: amadeus/templates/base.html:188 amadeus/templates/base.html:237
 msgid "Pendencias"
 msgstr "Pendências"
 
-#: amadeus/templates/base.html:165 amadeus/templates/base.html:209
+#: amadeus/templates/base.html:196 amadeus/templates/base.html:245
 msgid "Analytics"
 msgstr "Analytics"
 
diff --git a/categories/locale/pt_BR/LC_MESSAGES/django.po b/categories/locale/pt_BR/LC_MESSAGES/django.po
index 7dccd68..90b10d1 100644
--- a/categories/locale/pt_BR/LC_MESSAGES/django.po
+++ b/categories/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -118,7 +118,7 @@ msgstr "Deletar"
 msgid "categories"
 msgstr "Categorias"
 
-#: categories/templates/categories/list.html:31 categories/views.py:105
+#: categories/templates/categories/list.html:31 categories/views.py:106
 msgid "Create Category"
 msgstr "Criar Categoria"
 
@@ -152,16 +152,16 @@ msgstr "atras"
 msgid "Update: "
 msgstr "Editar: "
 
-#: categories/views.py:103
+#: categories/views.py:104
 msgid "Replicate Category"
 msgstr "Replicar Categoria"
 
-#: categories/views.py:130
+#: categories/views.py:131
 #, python-format
 msgid "Category \"%s\" register successfully!"
 msgstr "Categoria \"%s\" foi registrada com sucesso!"
 
-#: categories/views.py:166
+#: categories/views.py:167
 msgid ""
 "The category cannot be removed, it contains one or more virtual enviroments "
 "attach."
@@ -169,16 +169,16 @@ msgstr ""
 "A categoria não pode ser removida, ela contém um ou mais ambientes virtuais "
 "vinculados."
 
-#: categories/views.py:179
+#: categories/views.py:180
 #, python-format
 msgid "Category \"%s\" removed successfully!"
 msgstr "Categoria \"%s\" removida com sucesso!"
 
-#: categories/views.py:207
+#: categories/views.py:208
 #, python-format
 msgid "Category \"%s\" updated successfully!"
 msgstr "Categoria \"%s\" atualizada com sucesso!"
 
-#: categories/views.py:224
+#: categories/views.py:225
 msgid "Update Category"
 msgstr "Atualizar Categoria"
diff --git a/file_link/locale/pt_BR/LC_MESSAGES/django.po b/file_link/locale/pt_BR/LC_MESSAGES/django.po
index 6e7af84..3eba258 100644
--- a/file_link/locale/pt_BR/LC_MESSAGES/django.po
+++ b/file_link/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -34,7 +34,7 @@ msgstr "Esse assunto já possui um Link para Arquivo com esse nome"
 msgid "The file is too large. It should have less than 10MB."
 msgstr "Esse arquivo é muito grande. Ele deve conter menos de 10MB."
 
-#: file_link/forms.py:70
+#: file_link/forms.py:69
 msgid "This field is required."
 msgstr "Esse campo é obrigatório."
 
@@ -94,7 +94,7 @@ msgstr "Atribuir grupos de estudo ao Link para Arquivo"
 msgid "Save"
 msgstr "Salvar"
 
-#: file_link/templates/file_links/create.html:20 file_link/views.py:135
+#: file_link/templates/file_links/create.html:20 file_link/views.py:177
 msgid "Create File Link"
 msgstr "Criar Link para Arquivo"
 
@@ -114,30 +114,34 @@ msgstr "Remover"
 msgid "Edit: "
 msgstr "Editar: "
 
-#: file_link/views.py:77 file_link/views.py:90 file_link/views.py:180
-#: file_link/views.py:182 file_link/views.py:198 file_link/views.py:200
+#: file_link/views.py:104 file_link/views.py:117 file_link/views.py:227
+#: file_link/views.py:229 file_link/views.py:245 file_link/views.py:247
 msgid "Visualize"
 msgstr "Visualizar"
 
-#: file_link/views.py:146
+#: file_link/views.py:188
 #, python-format
 msgid ""
 "The File Link \"%s\" was added to the Topic \"%s\" of the virtual "
 "environment \"%s\" successfully!"
-msgstr "O Link para Arquivo \"%s\" foi adicionado ao tópico \"%s\" do ambiente virtual \"%s\" com sucesso!"
+msgstr ""
+"O Link para Arquivo \"%s\" foi adicionado ao tópico \"%s\" do ambiente "
+"virtual \"%s\" com sucesso!"
 
-#: file_link/views.py:229
+#: file_link/views.py:291
 msgid "Update File Link"
 msgstr "Atualizar Link para Arquivo"
 
-#: file_link/views.py:240
+#: file_link/views.py:302
 #, python-format
 msgid "The File Link \"%s\" was updated successfully!"
 msgstr "O Link para Arquivo \"%s\" foi atualizado com sucesso!"
 
-#: file_link/views.py:262
+#: file_link/views.py:329
 #, python-format
 msgid ""
 "The File Link \"%s\" was removed successfully from virtual environment \"%s"
 "\"!"
-msgstr "O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com sucesso!"
+msgstr ""
+"O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com "
+"sucesso!"
diff --git a/links/locale/pt_BR/LC_MESSAGES/django.po b/links/locale/pt_BR/LC_MESSAGES/django.po
new file mode 100644
index 0000000..912ceb9
--- /dev/null
+++ b/links/locale/pt_BR/LC_MESSAGES/django.po
@@ -0,0 +1,150 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: links/forms.py:27
+msgid "Tags"
+msgstr ""
+
+#: links/forms.py:28
+msgid "Website URL"
+msgstr ""
+
+#: links/forms.py:30
+msgid "It sets a limit date to finish viewing the website link  "
+msgstr ""
+
+#: links/forms.py:36
+msgid "Link name"
+msgstr ""
+
+#: links/forms.py:37
+msgid "End View"
+msgstr ""
+
+#: links/forms.py:38
+msgid "End View Date"
+msgstr ""
+
+#: links/forms.py:53
+msgid "End View Date is not set"
+msgstr ""
+
+#: links/forms.py:58
+msgid "Initial View Date is not set"
+msgstr ""
+
+#: links/forms.py:63
+msgid "End View Date before Initial View Date"
+msgstr ""
+
+#: links/forms.py:80
+msgid "There is already a link with this name on this subject"
+msgstr ""
+
+#: links/models.py:13
+msgid "simpler_description"
+msgstr ""
+
+#: links/models.py:15
+msgid "Link_URL"
+msgstr ""
+
+#: links/models.py:17 links/models.py:19
+msgid "Initial View"
+msgstr ""
+
+#: links/models.py:18 links/models.py:20
+msgid "Initial View Date"
+msgstr ""
+
+#: links/templates/links/_form.html:199
+msgid "Pendencies Notifications"
+msgstr ""
+
+#: links/templates/links/_form.html:217
+msgid "Action not performed by the user"
+msgstr ""
+
+#: links/templates/links/_form.html:243
+msgid "Wished period"
+msgstr ""
+
+#: links/templates/links/_form.html:339
+msgid "Attribute students to file link"
+msgstr ""
+
+#: links/templates/links/_form.html:359
+msgid "Attribute groups to file link"
+msgstr ""
+
+#: links/templates/links/_form.html:407
+msgid "Save"
+msgstr ""
+
+#: links/templates/links/create.html:20
+msgid "Create Website Link"
+msgstr ""
+
+#: links/templates/links/delete.html:9
+msgid "Are you sure you want delete the Website link"
+msgstr ""
+
+#: links/templates/links/delete.html:14
+msgid "Close"
+msgstr ""
+
+#: links/templates/links/delete.html:17
+msgid "Delete"
+msgstr ""
+
+#: links/templates/links/update.html:20
+msgid "Edit: "
+msgstr ""
+
+#: links/views.py:52 links/views.py:65 links/views.py:224 links/views.py:226
+#: links/views.py:242 links/views.py:244
+msgid "Visualize"
+msgstr ""
+
+#: links/views.py:125
+msgid "Create Webiste Link"
+msgstr ""
+
+#: links/views.py:136
+#, python-format
+msgid ""
+"The  Link \"%s\" was added to the Topic \"%s\" of the virtual environment "
+"\"%s\" successfully!"
+msgstr ""
+
+#: links/views.py:163
+#, python-format
+msgid ""
+"The Website Link \"%s\" was removed successfully from virtual environment "
+"\"%s\"!"
+msgstr ""
+
+#: links/views.py:288
+msgid "Update Website Link"
+msgstr ""
+
+#: links/views.py:299
+#, python-format
+msgid "The Website Link \"%s\" was updated successfully!"
+msgstr ""
diff --git a/log/locale/pt_BR/LC_MESSAGES/django.po b/log/locale/pt_BR/LC_MESSAGES/django.po
index 339b31e..d11873a 100644
--- a/log/locale/pt_BR/LC_MESSAGES/django.po
+++ b/log/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
diff --git a/mailsender/locale/pt_BR/LC_MESSAGES/django.po b/mailsender/locale/pt_BR/LC_MESSAGES/django.po
index ae6ed0f..b200ace 100644
--- a/mailsender/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mailsender/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
diff --git a/notifications/locale/pt_BR/LC_MESSAGES/django.po b/notifications/locale/pt_BR/LC_MESSAGES/django.po
new file mode 100644
index 0000000..c51a750
--- /dev/null
+++ b/notifications/locale/pt_BR/LC_MESSAGES/django.po
@@ -0,0 +1,241 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: notifications/models.py:8
+msgid "Meta"
+msgstr "Meta"
+
+#: notifications/models.py:9
+#: notifications/templates/notifications/_ajax_history.html:33
+#: notifications/templates/notifications/_history.html:32
+msgid "Task"
+msgstr "Tarefa"
+
+#: notifications/models.py:10
+msgid "User"
+msgstr "Usuário"
+
+#: notifications/models.py:11
+msgid "Type"
+msgstr "Tipo"
+
+#: notifications/models.py:11
+msgid "Type 1-A"
+msgstr "Tipo 1-A"
+
+#: notifications/models.py:11
+msgid "Type 1-B"
+msgstr "Tipo 1-B"
+
+#: notifications/models.py:11
+msgid "Type 2"
+msgstr "Tipo 2"
+
+#: notifications/models.py:11
+msgid "Type 3"
+msgstr "Tipo 3"
+
+#: notifications/models.py:12
+msgid "Visualized"
+msgstr "Visualizado"
+
+#: notifications/models.py:13
+msgid "Creation Date"
+msgstr "Data de Criação"
+
+#: notifications/templates/notifications/_ajax_history.html:6
+#: notifications/templates/notifications/_history.html:6
+msgid "rows"
+msgstr "registros"
+
+#: notifications/templates/notifications/_ajax_history.html:11
+#: notifications/templates/notifications/_history.html:11
+msgid "Search"
+msgstr "Buscar"
+
+#: notifications/templates/notifications/_ajax_history.html:13
+#: notifications/templates/notifications/_history.html:13
+msgid "Insert date or resource"
+msgstr "Digite uma data ou recurso"
+
+#: notifications/templates/notifications/_ajax_history.html:23
+#: notifications/templates/notifications/_history.html:22
+msgid "Date"
+msgstr "Data"
+
+#: notifications/templates/notifications/_ajax_history.html:28
+#: notifications/templates/notifications/_history.html:27
+msgid "Resource"
+msgstr "Recurso"
+
+#: notifications/templates/notifications/_ajax_history.html:38
+#: notifications/templates/notifications/_history.html:37
+msgid "Final Date"
+msgstr "Data Final"
+
+#: notifications/templates/notifications/_ajax_history.html:43
+#: notifications/templates/notifications/_history.html:42
+msgid "Notification"
+msgstr "Notificação"
+
+#: notifications/templates/notifications/_ajax_history.html:48
+#: notifications/templates/notifications/_history.html:47
+msgid "Observation"
+msgstr "Observação"
+
+#: notifications/templates/notifications/_ajax_history.html:59
+#: notifications/templates/notifications/_history.html:58
+#: notifications/templates/notifications/_view.html:28
+msgid "Not Informed"
+msgstr "Não Informado"
+
+#: notifications/templates/notifications/_ajax_history.html:66
+#: notifications/templates/notifications/_history.html:65
+msgid "No results found"
+msgstr "Nenhum resultado encontrado"
+
+#: notifications/templates/notifications/_view.html:10
+msgid "Home"
+msgstr "Início"
+
+#: notifications/templates/notifications/_view.html:28
+msgid "Final Date/Time"
+msgstr "Data/Hora Final"
+
+#: notifications/templates/notifications/_view.html:31
+msgid "Your goal was to realize this in"
+msgstr "Sua meta é realizar essa tarefa em"
+
+#: notifications/templates/notifications/_view.html:33
+msgid "Task finished in"
+msgstr "Tarefa finalizada em"
+
+#: notifications/templates/notifications/_view.html:36
+msgid "of the participants already realized this task."
+msgstr "dos participantes já realizaram essa tarefa."
+
+#: notifications/templates/notifications/_view.html:48
+msgid "Access the task"
+msgstr "Acessar a Tarefa"
+
+#: notifications/templates/notifications/_view.html:50
+msgid "Realize the task"
+msgstr "Realizar a Tarefa"
+
+#: notifications/templates/notifications/_view.html:55
+msgid "or"
+msgstr "ou"
+
+#: notifications/templates/notifications/_view.html:58
+msgid "Define goal to realization"
+msgstr "Definir meta para realização"
+
+#: notifications/templates/notifications/_view.html:60
+msgid "Define new goal"
+msgstr "Definir nova meta"
+
+#: notifications/templates/notifications/_view.html:82
+msgid "Save Goal"
+msgstr "Salvar Meta"
+
+#: notifications/templates/notifications/_view.html:85
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: notifications/templates/notifications/index.html:20
+msgid "You got pendencies in the following subjects"
+msgstr "Você possui pendências nos seguintes assuntos"
+
+#: notifications/templates/notifications/index.html:38
+#: notifications/templates/notifications/subject.html:31
+msgid "Actual Pendencies"
+msgstr "Pendências Atuais"
+
+#: notifications/templates/notifications/index.html:39
+#: notifications/templates/notifications/subject.html:32
+msgid "Notifications History"
+msgstr "Histórico de Notificações"
+
+#: notifications/templates/notifications/index.html:63
+msgid "You do not posses any pendency."
+msgstr "Você não possui nenhuma pendência."
+
+#: notifications/templates/notifications/subject.html:23
+#: notifications/views.py:162
+msgid "Pendencies"
+msgstr "Pendências"
+
+#: notifications/templates/notifications/subject.html:44
+msgid "You do not posses any pendency in this subject"
+msgstr "Você não possui nenhuma pendência nesse assunto"
+
+#: notifications/templatetags/notification_filters.py:27
+#: notifications/templatetags/notification_filters.py:29
+msgid "You still did not realize this task"
+msgstr "Você ainda não realizou essa tarefa"
+
+#: notifications/templatetags/notification_filters.py:31
+msgid "This task is late"
+msgstr "Essa tarefa está atrasada"
+
+#: notifications/templatetags/notification_filters.py:33
+msgid "You miss this task"
+msgstr "Você perdeu essa tarefa"
+
+#: notifications/templatetags/notification_filters.py:120
+#: notifications/templatetags/notification_filters.py:124
+#, python-format
+msgid "Goal defined to task realization: %s"
+msgstr "Meta definida para realização da tarefa: %s"
+
+#: notifications/templatetags/notification_filters.py:126
+#, python-format
+msgid "New goal defined to task realization: %s"
+msgstr "Nova meta definida para realização da tarefa: %s"
+
+#: notifications/views.py:59 notifications/views.py:123
+#, python-format
+msgid "%s - Pendencies"
+msgstr "%s - Pendências"
+
+#: notifications/views.py:245
+msgid "No goal date received"
+msgstr "Nenhuma data para meta recebida"
+
+#: notifications/views.py:252
+msgid "Could not identify the notification"
+msgstr "Não foi possível identificar a notificação"
+
+#: notifications/views.py:259
+msgid "The goal date should be equal or after today's date"
+msgstr "A meta de realização da tarefa deve ser uma data igual ou posterior à data atual"
+
+#: notifications/views.py:262
+msgid "The goal date should be equal or before subject's date"
+msgstr "A meta de realização da tarefa deve ser uma data igual ou anterior à data final do assunto"
+
+#: notifications/views.py:268
+#, python-format
+msgid "Your new goal to realize the task %s is %s"
+msgstr "Sua nova meta para realizar a tarefa %s é %s"
+
+#: notifications/views.py:270
+#, python-format
+msgid "Your goal to realize the task %s is %s"
+msgstr "Sua meta para realizar a tarefa %s é %s"
diff --git a/pendencies/locale/pt_BR/LC_MESSAGES/django.po b/pendencies/locale/pt_BR/LC_MESSAGES/django.po
index cd59c7f..3912fcb 100644
--- a/pendencies/locale/pt_BR/LC_MESSAGES/django.po
+++ b/pendencies/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
diff --git a/security/locale/pt_BR/LC_MESSAGES/django.po b/security/locale/pt_BR/LC_MESSAGES/django.po
index 6829e6b..ec6ab45 100644
--- a/security/locale/pt_BR/LC_MESSAGES/django.po
+++ b/security/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
diff --git a/students_group/locale/pt_BR/LC_MESSAGES/django.po b/students_group/locale/pt_BR/LC_MESSAGES/django.po
index f0c3542..bf269cc 100644
--- a/students_group/locale/pt_BR/LC_MESSAGES/django.po
+++ b/students_group/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -54,7 +54,7 @@ msgstr "Última Atualização"
 msgid "Students Group"
 msgstr "Grupo de Estudo"
 
-#: students_group/models.py:19 students_group/views.py:46
+#: students_group/models.py:19 students_group/views.py:48
 msgid "Students Groups"
 msgstr "Grupos de Estudo"
 
@@ -71,7 +71,7 @@ msgid "Replicate: "
 msgstr "Replicar: "
 
 #: students_group/templates/groups/create.html:15
-#: students_group/templates/groups/index.html:31 students_group/views.py:98
+#: students_group/templates/groups/index.html:31 students_group/views.py:123
 msgid "Create Group"
 msgstr "Criar Grupo"
 
@@ -119,25 +119,25 @@ msgstr "Participante(s)"
 msgid "Update: "
 msgstr "Editar: "
 
-#: students_group/views.py:108
+#: students_group/views.py:133
 msgid "Replicate Group"
 msgstr "Replicar Grupo"
 
-#: students_group/views.py:115
+#: students_group/views.py:140
 #, python-format
 msgid "The group \"%s\" was created successfully!"
 msgstr "O grupo \"%s\" foi criado com sucesso!"
 
-#: students_group/views.py:140
+#: students_group/views.py:170
 msgid "Update Group"
 msgstr "Atualizar Grupo"
 
-#: students_group/views.py:150
+#: students_group/views.py:180
 #, python-format
 msgid "The group \"%s\" was updated successfully!"
 msgstr "O grupo \"%s\" foi atualizado com sucesso!"
 
-#: students_group/views.py:172
+#: students_group/views.py:219
 #, python-format
 msgid "The group \"%s\" was removed successfully!"
 msgstr "O grupo \"%s\" foi removido com sucesso!"
diff --git a/subjects/locale/pt_BR/LC_MESSAGES/django.po b/subjects/locale/pt_BR/LC_MESSAGES/django.po
index fe03ba9..dfd0730 100644
--- a/subjects/locale/pt_BR/LC_MESSAGES/django.po
+++ b/subjects/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: subjects/forms.py:14
+#: subjects/forms.py:14 subjects/forms.py:129
 msgid "Tags"
 msgstr "Tags"
 
-#: subjects/forms.py:82
+#: subjects/forms.py:82 subjects/forms.py:187
 msgid "There is another subject with this name, try another one."
-msgstr ""
+msgstr "Já existe um assunto com esse nome, tente outro."
 
 #: subjects/forms.py:91 subjects/forms.py:100 subjects/forms.py:108
 #: subjects/forms.py:116
@@ -120,8 +120,7 @@ msgid "Meus Assuntos"
 msgstr "Meus Assuntos"
 
 #: subjects/templates/subjects/initial.html:57
-#: subjects/templates/subjects/list.html:186
-#: subjects/templates/subjects/list_search.html:59
+#: subjects/templates/subjects/list.html:194
 msgid "You still do not posses any subject in our platform"
 msgstr "Você ainda não possui assuntos em nossa plataforma"
 
@@ -136,90 +135,95 @@ msgid "All subjects"
 msgstr "Todos os assuntos"
 
 #: subjects/templates/subjects/list.html:75
-#: subjects/templates/subjects/list.html:140
+#: subjects/templates/subjects/list.html:144
 #: subjects/templates/subjects/subject_card.html:29
 #: subjects/templates/subjects/view.html:51
 msgid "Replicate"
 msgstr "Replicar"
 
 #: subjects/templates/subjects/list.html:77
-#: subjects/templates/subjects/list.html:142
+#: subjects/templates/subjects/list.html:146
 #: subjects/templates/subjects/subject_card.html:31
 #: subjects/templates/subjects/view.html:53
 msgid "Edit"
 msgstr "Editar"
 
 #: subjects/templates/subjects/list.html:79
-#: subjects/templates/subjects/list.html:143
+#: subjects/templates/subjects/list.html:147
 #: subjects/templates/subjects/subject_card.html:33
 #: subjects/templates/subjects/view.html:55
 msgid "Remove"
 msgstr "Remover"
 
-#: subjects/templates/subjects/list.html:97
-#: subjects/templates/subjects/list.html:161
+#: subjects/templates/subjects/list.html:101
+#: subjects/templates/subjects/list.html:169
 msgid "Coordinator(s) "
 msgstr "Coordenador(es) "
 
-#: subjects/templates/subjects/list.html:101
-#: subjects/templates/subjects/list.html:165
+#: subjects/templates/subjects/list.html:105
+#: subjects/templates/subjects/list.html:173
 msgid "It doesn't possess coordinators"
 msgstr "Não possui coordenadores"
 
-#: subjects/templates/subjects/list.html:107
-#: subjects/templates/subjects/list.html:171
+#: subjects/templates/subjects/list.html:111
+#: subjects/templates/subjects/list.html:179
 msgid "Create new subject"
 msgstr "Criar novo assunto"
 
+#: subjects/templates/subjects/list_search.html:31
 #: subjects/templates/subjects/list_search.html:33
-#: subjects/templates/subjects/list_search.html:36 subjects/views.py:527
-#: subjects/views.py:534
-#, fuzzy
-#| msgid "My Subjects"
+msgid "Search results"
+msgstr "Resultados da busca"
+
+#: subjects/templates/subjects/list_search.html:33
+msgid " any subjects or resources were found on the search for "
+msgstr " quaisquer assuntos ou recursos foram encontrados na busca por "
+
+#: subjects/templates/subjects/list_search.html:38
+#: subjects/templates/subjects/list_search.html:41 subjects/views.py:617
+#: subjects/views.py:624
 msgid "Subjects"
-msgstr "Meus assuntos"
+msgstr "Assuntos"
 
-#: subjects/templates/subjects/list_search.html:34
-#: subjects/templates/subjects/list_search.html:37
+#: subjects/templates/subjects/list_search.html:39
+#: subjects/templates/subjects/list_search.html:42
 msgid "Resources"
-msgstr ""
-
-#: subjects/templates/subjects/list_search.html:43
-msgid "Search results"
-msgstr ""
+msgstr "Recursos"
 
 #: subjects/templates/subjects/subject_card.html:32
 #: subjects/templates/subjects/view.html:54
 msgid "Groups"
 msgstr "Grupos"
 
-#: subjects/templates/subjects/subject_card.html:48
+#: subjects/templates/subjects/subject_card.html:57
 msgid "Professor(s) "
 msgstr "Professor(es) "
 
-#: subjects/templates/subjects/subject_card.html:52
+#: subjects/templates/subjects/subject_card.html:61
 msgid "It doesn't possess professors"
 msgstr "Não possui professores"
 
-#: subjects/templates/subjects/subject_card.html:56
+#: subjects/templates/subjects/subject_card.html:65
 msgid "Beginning"
 msgstr "Início"
 
-#: subjects/templates/subjects/subject_card.html:59
+#: subjects/templates/subjects/subject_card.html:68
 msgid "End"
 msgstr "Fim"
 
-#: subjects/templates/subjects/subject_card.html:69
+#: subjects/templates/subjects/subject_card.html:78
 msgid "Access Subject"
 msgstr "Acessar Assunto"
 
-#: subjects/templates/subjects/subject_card.html:71
+#: subjects/templates/subjects/subject_card.html:80
 msgid "Subscribe to Subject"
 msgstr "Inscrever-se no Assunto"
 
+#: subjects/templates/subjects/subject_card.html:83
+msgid "This subject doesn't allow new subscriptions"
+msgstr "Esse assunto não permite novas inscrições"
+
 #: subjects/templates/subjects/subscribe.html:10
-#, fuzzy
-#| msgid "Subscribe to Subject"
 msgid "Subscribe To Subject"
 msgstr "Inscrever-se no Assunto"
 
@@ -239,7 +243,7 @@ msgstr "Ok"
 msgid "Update: "
 msgstr "Editar: "
 
-#: subjects/templates/subjects/view.html:70
+#: subjects/templates/subjects/view.html:73
 msgid "Create new topic"
 msgstr "Criar novo tópico"
 
@@ -265,29 +269,27 @@ msgstr "Meus assuntos"
 msgid "All Subjects"
 msgstr "Todos os assuntos"
 
-#: subjects/views.py:282
+#: subjects/views.py:294
 msgid "Create Subject"
 msgstr "Criar Assunto"
 
-#: subjects/views.py:288
+#: subjects/views.py:300
 msgid "Replicate Subject"
 msgstr "Replicar Assunto"
 
-#: subjects/views.py:319
-#, python-format
-msgid "Subject \"%s\" was registered on \"%s\" successfully!"
-msgstr "Assunto \"%s\" foi registrado em \"%s\" com sucesso!"
+#: subjects/views.py:342
+msgid "The Subject \"%s\" was registered on \"%s\" Category successfully!"
+msgstr "Assunto \"%s\" foi registrado na categoria \"%s\" com sucesso!"
 
-#: subjects/views.py:351
+#: subjects/views.py:379
 msgid "Update Subject"
 msgstr "Atualizar Assunto"
 
-#: subjects/views.py:362
-#, python-format
-msgid "Subject \"%s\" was updated on \"%s\" successfully!"
-msgstr "Assunto \"%s\" foi atualizado em \"%s\" com sucesso!"
+#: subjects/views.py:399
+msgid "The Subject \"%s\" was updated on \"%s\" Category successfully!"
+msgstr "Assunto \"%s\" foi atualizado na categoria \"%s\" com sucesso!"
 
-#: subjects/views.py:389
+#: subjects/views.py:430
 msgid ""
 "Subject can't be removed. The subject still possess students and learning "
 "objects associated"
@@ -295,25 +297,14 @@ msgstr ""
 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
 "aprendizado associados"
 
-#: subjects/views.py:411
-#, fuzzy, python-format
-#| msgid "Subject removed successfully!"
+#: subjects/views.py:459
 msgid "Subject \"%s\" removed successfully!"
-msgstr "Assunto removido com sucesso!"
+msgstr "Assunto \"%s\" removido com sucesso!"
 
-#: subjects/views.py:475
+#: subjects/views.py:547
 msgid "Subscription date is due!"
 msgstr "O período de inscrição está encerrado!"
 
-#: subjects/views.py:479
+#: subjects/views.py:560
 msgid "Subscription was successfull!"
-msgstr "Inscrição feita com sucesso!"
-
-#~ msgid "ACESS SUBJECT"
-#~ msgstr "Acessar assunto"
-
-#~ msgid "SUBSCRIBE TO SUBJECT"
-#~ msgstr "Inscrever-se no assunto"
-
-#~ msgid "Delete Subject"
-#~ msgstr "Deletar Assunto"
+msgstr "Inscrição feita com sucesso!"
\ No newline at end of file
diff --git a/themes/locale/pt_BR/LC_MESSAGES/django.po b/themes/locale/pt_BR/LC_MESSAGES/django.po
index d7e43d4..7889c47 100644
--- a/themes/locale/pt_BR/LC_MESSAGES/django.po
+++ b/themes/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
diff --git a/topics/locale/pt_BR/LC_MESSAGES/django.po b/topics/locale/pt_BR/LC_MESSAGES/django.po
index 486f0c8..b368c52 100644
--- a/topics/locale/pt_BR/LC_MESSAGES/django.po
+++ b/topics/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -118,7 +118,7 @@ msgstr "Apenas um tópico por asssunto pode ser um repositório"
 msgid "Save"
 msgstr "Salvar"
 
-#: topics/templates/topics/create.html:8 topics/views.py:59
+#: topics/templates/topics/create.html:8 topics/views.py:81
 msgid "Create Topic"
 msgstr "Criar Tópico"
 
@@ -138,51 +138,55 @@ msgstr "Fechar"
 msgid "Delete"
 msgstr "Deletar"
 
-#: topics/templates/topics/list.html:49
+#: topics/templates/topics/list.html:52
 msgid "Add Resource"
 msgstr "Adicionar Recurso"
 
-#: topics/templates/topics/list.html:52
+#: topics/templates/topics/list.html:55
 msgid "Video Embed"
 msgstr "Embed de Vídeo"
 
-#: topics/templates/topics/list.html:53
+#: topics/templates/topics/list.html:56
 msgid "Forum"
 msgstr "Fórum"
 
-#: topics/templates/topics/list.html:54
+#: topics/templates/topics/list.html:57
 msgid "File Link"
 msgstr "Link para arquivo"
 
-#: topics/templates/topics/list.html:55
+#: topics/templates/topics/list.html:58
+msgid "Link to Website"
+msgstr ""
+
+#: topics/templates/topics/list.html:59
 msgid "Webpage"
 msgstr "Página Web"
 
-#: topics/templates/topics/list.html:56
+#: topics/templates/topics/list.html:60
 msgid "Questionary"
 msgstr "Questionário"
 
-#: topics/templates/topics/update.html:8 topics/views.py:103
+#: topics/templates/topics/update.html:8 topics/views.py:130
 msgid "Update Topic"
 msgstr "Atualizar Tópico"
 
-#: topics/views.py:69
+#: topics/views.py:91
 #, python-format
 msgid "Topic \"%s\" was created on virtual enviroment \"%s\" successfully!"
 msgstr "Tópico \"%s\" foi criado no ambiente virtual \"%s\" com sucesso!"
 
-#: topics/views.py:113
+#: topics/views.py:140
 #, python-format
 msgid "Topic \"%s\" was updated on virtual enviroment \"%s\" successfully!"
 msgstr "Tópico \"%s\" foi atualizado no ambiente virtual \"%s\" com sucesso!"
 
-#: topics/views.py:138
+#: topics/views.py:182
 msgid "Could not remove this topic. It has on or more resources attached."
 msgstr ""
 "Não é possível remover esse tópico. Ele possui um ou mais recursos "
 "vinculados."
 
-#: topics/views.py:147
+#: topics/views.py:191
 #, python-format
 msgid "Topic \"%s\" was removed from virtual enviroment \"%s\" successfully!"
 msgstr "Tópico \"%s\" foi removido do ambiente virtual \"%s\" com sucesso!"
diff --git a/users/locale/pt_BR/LC_MESSAGES/django.po b/users/locale/pt_BR/LC_MESSAGES/django.po
index 65726c0..5ca015b 100644
--- a/users/locale/pt_BR/LC_MESSAGES/django.po
+++ b/users/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -30,7 +30,7 @@ msgstr "A imagem é muito grande. Ela deve conter menos de 2MB."
 msgid "The confirmation password is incorrect."
 msgstr "A confirmação de senha está incorreta."
 
-#: users/forms.py:49 users/forms.py:102 users/templates/users/login.html:51
+#: users/forms.py:49 users/forms.py:102 users/templates/users/login.html:52
 msgid "Password"
 msgstr "Senha"
 
@@ -39,7 +39,7 @@ msgid "Confirm Password"
 msgstr "Confirmação de Senha"
 
 #: users/forms.py:67 users/forms.py:166 users/templates/users/list.html:56
-#: users/templates/users/login.html:46 users/templates/users/search.html:47
+#: users/templates/users/login.html:47 users/templates/users/search.html:47
 msgid "Email"
 msgstr "Email"
 
@@ -188,7 +188,7 @@ msgstr "Remover Conta"
 msgid "Are you sure you want delete your account?"
 msgstr "Tem certeza que deseja deletar sua conta?"
 
-#: users/templates/users/forgot_password.html:39 users/views.py:336
+#: users/templates/users/forgot_password.html:39 users/views.py:379
 msgid "Forgot Password"
 msgstr "Esqueceu Senha"
 
@@ -239,15 +239,23 @@ msgstr "Nenhum usuário encontrado"
 msgid "Sign in with your account to continue"
 msgstr "Entre com a sua conta para continuar"
 
-#: users/templates/users/login.html:59 users/templates/users/login.html:66
+#: users/templates/users/login.html:66
+msgid "PT-BR"
+msgstr ""
+
+#: users/templates/users/login.html:72
+msgid "EN"
+msgstr ""
+
+#: users/templates/users/login.html:81 users/templates/users/login.html:88
 msgid "Log in"
 msgstr "Entrar"
 
-#: users/templates/users/login.html:62 users/views.py:310
+#: users/templates/users/login.html:84 users/views.py:353
 msgid "Sign Up"
 msgstr "Cadastrar"
 
-#: users/templates/users/login.html:75 users/templates/users/login.html:81
+#: users/templates/users/login.html:97 users/templates/users/login.html:103
 msgid "Forgot your password?"
 msgstr "Esqueceu sua senha?"
 
@@ -295,37 +303,37 @@ msgstr "Não é professor"
 msgid "Is not a student"
 msgstr "Não é estudante"
 
-#: users/views.py:51
+#: users/views.py:54
 msgid "Manage Users"
 msgstr "Gerenciar Usuários"
 
-#: users/views.py:81
+#: users/views.py:84
 msgid "Search Users"
 msgstr "Pesquisar Usuário"
 
-#: users/views.py:99
+#: users/views.py:107
 #, python-format
 msgid "User %s created successfully"
 msgstr "Usuário %s criado com sucesso"
 
-#: users/views.py:107
+#: users/views.py:121
 msgid "Add User"
 msgstr "Cadastrar Usuário"
 
-#: users/views.py:136
+#: users/views.py:155
 #, python-format
 msgid "User %s updated successfully"
 msgstr "Usuário %s atualizado com sucesso"
 
-#: users/views.py:144
+#: users/views.py:169
 msgid "Update User"
 msgstr "Atualizar Usuário"
 
-#: users/views.py:189
+#: users/views.py:224
 msgid "User removed successfully!"
 msgstr "Usuário removido com sucesso!"
 
-#: users/views.py:190
+#: users/views.py:225
 msgid ""
 "Could not remove the account. The user is attach to one or more functions "
 "(administrator, coordinator, professor ou student) in the system."
@@ -333,39 +341,39 @@ msgstr ""
 "Não é possível deletar a conta. O usuário está vinculado com uma ou mais "
 "funções (administrador, coordenador, professor ou estudante) no sistema."
 
-#: users/views.py:205
+#: users/views.py:248
 msgid "Delete Account"
 msgstr "Remover Conta"
 
-#: users/views.py:248
+#: users/views.py:291
 msgid "Password changed successfully!"
 msgstr "Senha alterada com sucesso!"
 
-#: users/views.py:254
+#: users/views.py:297
 msgid "Change Password"
 msgstr "Alterar Senha"
 
-#: users/views.py:272
+#: users/views.py:315
 msgid "Profile"
 msgstr "Perfil"
 
-#: users/views.py:291
+#: users/views.py:334
 msgid "Update Profile"
 msgstr "Atualizar Perfil"
 
-#: users/views.py:297
+#: users/views.py:340
 msgid "Profile edited successfully!"
 msgstr "Perfil editado com sucesso!"
 
-#: users/views.py:317
+#: users/views.py:360
 msgid "User successfully registered!"
 msgstr "Usuário cadastrado com sucesso!"
 
-#: users/views.py:355
+#: users/views.py:398
 msgid "Recover Password"
 msgstr "Recuperar Senha"
 
-#: users/views.py:391
+#: users/views.py:434
 msgid ""
 "Soon you'll receive an email with instructions to set your new password. If "
 "you don't receive it in 24 hours, please check your spam box."
@@ -373,34 +381,34 @@ msgstr ""
 "Em breve você receberá um email com instruções para cadastrar sua nova "
 "senha. Se você não recebê-lo em 24 hhoras, por favor olhe sua caixa de spam."
 
-#: users/views.py:396
+#: users/views.py:439
 msgid "No user is associated with this email address"
 msgstr "Nenhum usuário associado com esse endereço de email."
 
-#: users/views.py:407
+#: users/views.py:450
 msgid "Reset Password"
 msgstr "Recuperar Senha"
 
-#: users/views.py:429
+#: users/views.py:472
 msgid "Password reset successfully."
 msgstr "Senha alterada com sucesso!"
 
-#: users/views.py:433
+#: users/views.py:476
 msgid "We were not able to reset your password."
 msgstr "Não foi possível restaurar sua senha"
 
-#: users/views.py:436
+#: users/views.py:479
 msgid "The reset password link is no longer valid."
 msgstr "O link para restaurar senha não está mais válido."
 
-#: users/views.py:442
+#: users/views.py:485
 msgid "Log In"
 msgstr "Entrar"
 
-#: users/views.py:457
+#: users/views.py:506
 msgid "System under maintenance. Try again later"
 msgstr "Sistema em manutenção. Tente novamente mais tarde"
 
-#: users/views.py:459
+#: users/views.py:508
 msgid "E-mail or password are incorrect."
 msgstr "Email ou senha incorretos."
diff --git a/webpage/locale/pt_BR/LC_MESSAGES/django.po b/webpage/locale/pt_BR/LC_MESSAGES/django.po
index b5f7136..808ee2a 100644
--- a/webpage/locale/pt_BR/LC_MESSAGES/django.po
+++ b/webpage/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 23:42-0300\n"
+"POT-Creation-Date: 2017-02-01 15:48-0300\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"
@@ -78,7 +78,7 @@ msgstr "Atribuir grupos de estudo à Página Web"
 msgid "Save"
 msgstr "Salvar"
 
-#: webpage/templates/webpages/create.html:20 webpage/views.py:144
+#: webpage/templates/webpages/create.html:20 webpage/views.py:219
 msgid "Create Webpage"
 msgstr "Criar Página Web"
 
@@ -98,12 +98,12 @@ msgstr "Remover"
 msgid "Edit: "
 msgstr "Editar: "
 
-#: webpage/views.py:86 webpage/views.py:99 webpage/views.py:197
-#: webpage/views.py:199 webpage/views.py:215 webpage/views.py:217
+#: webpage/views.py:146 webpage/views.py:159 webpage/views.py:277
+#: webpage/views.py:279 webpage/views.py:295 webpage/views.py:297
 msgid "Visualize"
 msgstr ""
 
-#: webpage/views.py:155
+#: webpage/views.py:230
 #, python-format
 msgid ""
 "The Webpage \"%s\" was added to the Topic \"%s\" of the virtual environment "
@@ -112,16 +112,16 @@ msgstr ""
 "A Página Web \"%s\" foi adicionado ao tópico \"%s\" do ambiente virtual \"%s"
 "\" com sucesso!"
 
-#: webpage/views.py:246
+#: webpage/views.py:341
 msgid "Update Webpage"
 msgstr "Atualizar Página Web"
 
-#: webpage/views.py:257
+#: webpage/views.py:352
 #, python-format
 msgid "The Webpage \"%s\" was updated successfully!"
 msgstr "A Página Web \"%s\" foi atualizada com sucesso!"
 
-#: webpage/views.py:288
+#: webpage/views.py:388
 #, python-format
 msgid ""
 "The webpage \"%s\" was removed successfully from virtual environment \"%s\"!"
--
libgit2 0.21.2