Merge in dev

ailsoncgt
2 parents 8617ef0d 170950c6
Showing 58 changed files with 2638 additions and 1030 deletions Show diff stats
app/locale/he_il/LC_MESSAGES/django.po
app/locale/pt_BR/LC_MESSAGES/django.po
app/templates/home.html
app/templates/home_student.html
core/locale/he_il/LC_MESSAGES/django.po
core/locale/pt_BR/LC_MESSAGES/django.po
core/static/css/base/amadeus.css
core/static/img/favicon.ico
core/static/js/base/amadeus.js
core/templates/base.html
core/templates/guest.html
core/templates/index.html
core/templates/lembrar_senha.html
core/templates/notifications.html
core/templates/registration/passwor_reset_email.html
core/templates/registration/password_reset_subject.txt
core/views.py
courses/locale/pt_BR/LC_MESSAGES/django.po
courses/templates/course/course_card.html
courses/templates/course/index.html
@@ -1,178 +0,0 @@
-# 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: 2016-09-16 02:41-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"
-
-#: app/templates/app/base.html:10
-msgid "The Project"
-msgstr ""
-
-#: app/templates/app/base.html:11
-msgid "CCTE Group"
-msgstr ""
-
-#: app/templates/app/base.html:14
-msgid "Hi"
-msgstr ""
-
-#: app/templates/app/base.html:16
-msgid "See Profile"
-msgstr ""
-
-#: app/templates/app/base.html:17
-msgid "Settings"
-msgstr ""
-
-#: app/templates/app/base.html:18
-msgid "Logout"
-msgstr ""
-
-#: app/templates/app/index.html:6
-msgid "You have:"
-msgstr ""
-
-#: app/templates/app/index.html:10 app/templates/home.html:88
-msgid "Pending Tasks"
-msgstr ""
-
-#: app/templates/app/index.html:14
-msgid "Users Online"
-msgstr ""
-
-#: app/templates/app/index.html:20
-msgid "You can:"
-msgstr ""
-
-#: app/templates/app/index.html:24 app/templates/home_professor.html:25
-msgid "Create Course"
-msgstr ""
-
-#: app/templates/app/index.html:29 app/templates/home.html:93
-msgid "Manage Users"
-msgstr ""
-
-#: app/templates/app/index.html:33 app/templates/home.html:96
-msgid "Manage Courses"
-msgstr ""
-
-#: app/templates/app/index.html:37
-msgid "Gerenciar Categorias"
-msgstr ""
-
-#: app/templates/app/index.html:45
-msgid "Your course(s):"
-msgstr ""
-
-#: app/templates/app/index.html:46
-msgid "No courses subscribed yet"
-msgstr ""
-
-#: app/templates/app/index.html:56
-msgid "Search course:"
-msgstr ""
-
-#: app/templates/app/index.html:62
-msgid "Search"
-msgstr ""
-
-#: app/templates/app/index.html:67
-msgid "Most popular keywords:"
-msgstr ""
-
-#: app/templates/home.html:86
-msgid "Home"
-msgstr ""
-
-#: app/templates/home.html:87 app/templates/home_student.html:25
-msgid "Profile"
-msgstr ""
-
-#: app/templates/home.html:90
-msgid "My courses"
-msgstr ""
-
-#: app/templates/home.html:105 app/templates/home_professor.html:33
-msgid "Courses"
-msgstr ""
-
-#: app/templates/home.html:131
-msgid "No pending tasks at the moment."
-msgstr ""
-
-#: app/templates/home_admin_content.html:10
-msgid "Students"
-msgstr ""
-
-#: app/templates/home_admin_content.html:11
-msgid "Beginning"
-msgstr ""
-
-#: app/templates/home_admin_content.html:12
-msgid "End"
-msgstr ""
-
-#: app/templates/home_admin_content.html:15
-msgid "Edit"
-msgstr ""
-
-#: app/templates/home_professor.html:20 app/templates/home_student.html:21
-msgid "Menu"
-msgstr ""
-
-#: app/templates/home_professor.html:24
-msgid "Pending tasks"
-msgstr ""
-
-#: app/templates/home_professor.html:26
-msgid "Manage Course"
-msgstr ""
-
-#: app/templates/home_professor.html:43
-msgid "Students:"
-msgstr ""
-
-#: app/templates/home_professor.html:44
-msgid "Beginning:"
-msgstr ""
-
-#: app/templates/home_professor.html:45
-msgid "End:"
-msgstr ""
-
-#: app/templates/home_professor.html:52
-msgid "You didn't create any course yet."
-msgstr ""
-
-#: app/templates/home_professor.html:58 app/templates/home_student.html:73
-msgid "Goals"
-msgstr ""
-
-#: app/templates/home_student.html:26
-msgid "My Courses"
-msgstr ""
-
-#: app/templates/home_student.html:27
-msgid "Google accounts"
-msgstr ""
-
-#: app/templates/home_student.html:34
-msgid "Notifications"
-msgstr ""
-
-#: app/templates/home_student.html:76
-msgid "Favorites"
-msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
+"POT-Creation-Date: 2016-10-26 14:47-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,161 +18,198 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app/templates/app/base.html:10
-msgid "The Project"
-msgstr ""
-
-#: app/templates/app/base.html:11
-msgid "CCTE Group"
-msgstr ""
+#: app/templates/home.html:69 app/templates/home_professor.html:20
+#: app/templates/home_student.html:21
+msgid "Menu"
+msgstr "Menu"
-#: app/templates/app/base.html:14
-msgid "Hi"
-msgstr ""
+#: app/templates/home.html:73
+msgid "Home"
+msgstr "Início"
-#: app/templates/app/base.html:16
-#, fuzzy
-#| msgid "Profile"
-msgid "See Profile"
+#: app/templates/home.html:74 app/templates/home_student.html:25
+msgid "Profile"
 msgstr "Perfil"
-#: app/templates/app/base.html:17
-msgid "Settings"
-msgstr "Configurações"
-
-#: app/templates/app/base.html:18
-msgid "Logout"
-msgstr "Sair"
-
-#: app/templates/app/index.html:6
-msgid "You have:"
-msgstr ""
-
-#: app/templates/app/index.html:10
+#: app/templates/home.html:76
 #, fuzzy
-#| msgid "Pending tasks"
-msgid "Pending Tasks"
-msgstr "Tarefas Pendentes"
-
-#: app/templates/app/index.html:14
-msgid "Users Online"
-msgstr "Usuários Online"
-
-#: app/templates/app/index.html:20
-msgid "You can:"
-msgstr ""
+#| msgid "My Courses"
+msgid "My courses"
+msgstr "Meus Cursos"
-#: app/templates/app/index.html:24 app/templates/home_app.html:26
-#: app/templates/home_professor.html:23
-msgid "Create Course"
-msgstr "Criar Curso"
+#: app/templates/home.html:78 app/templates/home_student.html:27
+#, fuzzy
+#| msgid "Courses"
+msgid "All Courses"
+msgstr "Cursos"
-#: app/templates/app/index.html:29
+#: app/templates/home.html:80
 #, fuzzy
 #| msgid "Manage Course"
 msgid "Manage Users"
-msgstr "Gerenciar Curso"
+msgstr "Gerenciar Usuários"
-#: app/templates/app/index.html:33
+#: app/templates/home.html:84
 #, fuzzy
 #| msgid "Manage Course"
 msgid "Manage Courses"
-msgstr "Gerenciar Curso"
-
-#: app/templates/app/index.html:37
-msgid "Gerenciar Categorias"
-msgstr ""
-
-#: app/templates/app/index.html:45
-msgid "Your course(s):"
-msgstr ""
+msgstr "Gerenciar Cursos"
-#: app/templates/app/index.html:46
-msgid "No courses subscribed yet"
-msgstr ""
+#: app/templates/home.html:101 app/templates/home_professor.html:34
+msgid "Courses"
+msgstr "Cursos"
-#: app/templates/app/index.html:56
-msgid "Search course:"
-msgstr ""
+#: app/templates/home_admin_content.html:10
+#, fuzzy
+#| msgid "Students:"
+msgid "Students"
+msgstr "Alunos"
-#: app/templates/app/index.html:62
-msgid "Search"
-msgstr ""
+#: app/templates/home_admin_content.html:11
+#, fuzzy
+#| msgid "Beginning:"
+msgid "Beginning"
+msgstr "Começo"
-#: app/templates/app/index.html:67
-msgid "Most popular keywords:"
-msgstr ""
+#: app/templates/home_admin_content.html:12
+#, fuzzy
+#| msgid "End:"
+msgid "End"
+msgstr "Fim:"
-#: app/templates/home_app.html:14 app/templates/home_professor.html:9
-#: app/templates/home_student.html:9
-msgid "Home"
-msgstr "Início"
+#: app/templates/home_admin_content.html:15
+msgid "Edit"
+msgstr "Editar"
-#: app/templates/home_app.html:22 app/templates/home_professor.html:22
+#: app/templates/home_professor.html:24
 msgid "Pending tasks"
 msgstr "Tarefas Pendentes"
-#: app/templates/home_app.html:23
-#, fuzzy
-#| msgid "Users Online"
-msgid "Users Online (1)"
-msgstr "Usuários Online"
-
-#: app/templates/home_app.html:24
-#, fuzzy
-#| msgid "Courses"
-msgid "Course"
-msgstr "Cursos"
+#: app/templates/home_professor.html:25
+msgid "Create Course"
+msgstr "Criar Curso"
-#: app/templates/home_app.html:27 app/templates/home_professor.html:24
+#: app/templates/home_professor.html:26
 msgid "Manage Course"
 msgstr "Gerenciar Curso"
-#: app/templates/home_app.html:35 app/templates/home_professor.html:31
-msgid "Courses"
-msgstr "Cursos"
-
-#: app/templates/home_app.html:51 app/templates/home_professor.html:48
-msgid "You didn't create any course yet."
-msgstr "Você não criou nenhum curso ainda."
-
-#: app/templates/home_app.html:59 app/templates/home_professor.html:54
-#: app/templates/home_student.html:60
-msgid "Goals"
-msgstr "Metas"
-
-#: app/templates/home_professor.html:18 app/templates/home_student.html:18
-msgid "Menu"
-msgstr "Menu"
-
-#: app/templates/home_professor.html:40
+#: app/templates/home_professor.html:44
 msgid "Students:"
 msgstr "Alunos"
-#: app/templates/home_professor.html:41
+#: app/templates/home_professor.html:45
 msgid "Beginning:"
 msgstr "Começo"
-#: app/templates/home_professor.html:42
+#: app/templates/home_professor.html:46
 msgid "End:"
-msgstr "Fim"
+msgstr "Fim:"
-#: app/templates/home_student.html:22
-msgid "Profile"
-msgstr "Perfil"
+#: app/templates/home_professor.html:53
+msgid "You didn't create any course yet."
+msgstr "Você não criou nenhum curso ainda."
-#: app/templates/home_student.html:23
+#: app/templates/home_student.html:26
 msgid "My Courses"
 msgstr "Meus Cursos"
-#: app/templates/home_student.html:24
+#: app/templates/home_student.html:28
 msgid "Google accounts"
 msgstr "Contas do Google"
-#: app/templates/home_student.html:31
+#: app/templates/home_student.html:35
 msgid "Notifications"
 msgstr "Notificações"
-#: app/templates/home_student.html:63
-msgid "Favorites"
-msgstr "Favoritos"
+#: app/templates/home_student.html:48
+msgid "His course has notified a new activity!"
+msgstr "Seu curso tem uma nova atividade!"
+
+#: app/templates/home_student.html:51 app/templates/home_student.html:59
+#: app/templates/home_student.html:67
+msgid "Go"
+msgstr "Ir"
+
+#: app/templates/home_student.html:56
+msgid "His teacher has notified a new material!"
+msgstr "Seu professor adicionou um novo material!"
+
+#: app/templates/home_student.html:64
+msgid "You have a new guardian!"
+msgstr "Você tem um novo tutor!"
+
+#: app/templates/home_teacher_student_content.html:14
+msgid "at"
+msgstr "em"
+
+#: app/templates/home_teacher_student_content.html:15
+msgid "ago"
+msgstr "atrás"
+
+#~ msgid "The Project"
+#~ msgstr "O projeto"
+
+#~ msgid "CCTE Group"
+#~ msgstr "Grupo CCTE"
+
+#~ msgid "Hi"
+#~ msgstr "Olá"
+
+#, fuzzy
+#~| msgid "Profile"
+#~ msgid "See Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "Settings"
+#~ msgstr "Configurações"
+
+#~ msgid "Logout"
+#~ msgstr "Sair"
+
+#~ msgid "You have:"
+#~ msgstr "Você tem:"
+
+#, fuzzy
+#~| msgid "Pending tasks"
+#~ msgid "Pending Tasks"
+#~ msgstr "Tarefas Pendentes"
+
+#~ msgid "Users Online"
+#~ msgstr "Usuários Online"
+
+#~ msgid "You can:"
+#~ msgstr "Você pode:"
+
+#~ msgid "Manage Categories"
+#~ msgstr "Gerenciar Categorias"
+
+#~ msgid "Your course(s):"
+#~ msgstr "Seus cursos:"
+
+#~ msgid "No courses subscribed yet"
+#~ msgstr "Nenhum curso inscrito ainda"
+
+#~ msgid "Search course:"
+#~ msgstr "Pesquisar curso"
+
+#~ msgid "Search"
+#~ msgstr "Pesquisar"
+
+#~ msgid "Most popular keywords:"
+#~ msgstr "Palavras mais populares:"
+
+#, fuzzy
+#~| msgid "Users Online"
+#~ msgid "Users Online (1)"
+#~ msgstr "Usuários Online"
+
+#, fuzzy
+#~| msgid "Courses"
+#~ msgid "Course"
+#~ msgstr "Cursos"
+
+#~ msgid "Goals"
+#~ msgstr "Metas"
+
+#~ msgid "Favorites"
+#~ msgstr "Favoritos"
@@ -66,7 +66,7 @@
 {% block sidebar %}
     <div class="panel panel-primary">
         <div class="panel-heading">
-            <h4>Menu</h4>
+            <h4>{% trans 'Menu' %}</h4>
         </div>
         <div class="panel-body">
             <ul class="nav nav-pills nav-stacked">
@@ -45,26 +45,26 @@
     {% endif %}
     <div class="panel panel-default">
         <div class="panel-body">
-          His course has notified a new activity!
+          {% trans 'His course has notified a new activity!' %}
         </div>
         <div class="panel-footer">
-          Go
+          {% trans 'Go' %}
         </div>
     </div>
     <div class="panel panel-default">
         <div class="panel-body">
-          His teacher has notified a new material!
+          {% trans 'His teacher has notified a new material!' %}
         </div>
         <div class="panel-footer">
-          Go
+          {% trans 'Go' %}
         </div>
     </div>
     <div class="panel panel-default">
         <div class="panel-body">
-            You have a new guardian!
+            {% trans 'You have a new guardian!' %}
         </div>
         <div class="panel-footer">
-          Go
+          {% trans 'Go' %}
         </div>
     </div>
 {% endblock %}
@@ -1,66 +0,0 @@
-# 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: 2016-09-16 02:41-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"
-
-#: core/templates/base.html:97
-msgid "Log out"
-msgstr ""
-
-#: core/templates/index.html:38
-msgid "Username"
-msgstr ""
-
-#: core/templates/index.html:44
-msgid "Password"
-msgstr ""
-
-#: core/templates/index.html:52
-msgid "Remember Email"
-msgstr ""
-
-#: core/templates/index.html:61
-msgid "Guest"
-msgstr ""
-
-#: core/templates/index.html:64 core/templates/register_user.html:71
-msgid "Login"
-msgstr ""
-
-#: core/templates/index.html:73
-msgid "Sign Up"
-msgstr ""
-
-#: core/templates/register_user.html:29
-msgid "User Register"
-msgstr ""
-
-#: core/templates/register_user.html:68
-msgid "Save"
-msgstr ""
-
-#: core/templates/remember_password.html:27
-msgid "E-mail"
-msgstr ""
-
-#: core/templates/remember_password.html:31
-msgid "Registration"
-msgstr ""
-
-#: core/templates/remember_password.html:35
-msgid "Send"
-msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
+"POT-Creation-Date: 2016-10-26 14:47-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"
@@ -17,91 +17,391 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: core/forms.py:12
+msgid "Password"
+msgstr "Senha"
+
+#: core/forms.py:13
+msgid "Password confirmation"
+msgstr "Confirmação de senha"
+
+#: core/forms.py:27
+msgid "There is already a registered User with this e-mail"
+msgstr "Já existe um usuário cadastrado com esse e-mail"
+
+#: core/forms.py:33
+msgid "Please enter a valid date"
+msgstr "Por favor, insira uma data válida"
+
+#: core/forms.py:40
+msgid "There is already a registeres User with this CPF"
+msgstr "Já existem usuários cadastrados com este CPF"
+
+#: core/forms.py:42
+msgid "Please enter a valid CPF"
+msgstr "Por favor, insira um CPF válido"
+
+#: core/forms.py:50
+#, python-format
+msgid "The password must contain at least % d characters."
+msgstr "A senha deve conter pelo menos % d caracteres"
+
+#: core/forms.py:55
+msgid ""
+"The password must contain at least one letter and at least one digit or a "
+"punctuation character."
+msgstr "A senha deve conter pelo menos uma letra, um dígito ou caracter de pontuação."
+
+#: core/forms.py:65
+msgid "The confirmation password is incorrect."
+msgstr "A confirmação de senha está incorreta."
+
+#: core/models.py:8
+msgid "Type"
+msgstr "Tipo"
-#: core/models.py:15 core/models.py:36
+#: core/models.py:9
+msgid "Icon"
+msgstr ""
+
+#: core/models.py:12
+msgid "Amadeus Mime Type"
+msgstr ""
+
+#: core/models.py:13
+msgid "Amadeus Mime Types"
+msgstr ""
+
+#: core/models.py:27 core/models.py:51
 msgid "Name"
 msgstr "Nome"
-#: core/models.py:16 core/models.py:37
-msgid "Created Date"
+#: core/models.py:28 core/models.py:52
+msgid "Slug"
 msgstr ""
-#: core/models.py:49
+#: core/models.py:29 core/models.py:53
+msgid "Created Date"
+msgstr "Data de criação"
+
+#: core/models.py:54
+msgid "URL"
+msgstr "URL"
+
+#: core/models.py:67
 msgid "Action_Applied"
 msgstr ""
-#: core/models.py:50
+#: core/models.py:68
 msgid "Resource"
 msgstr ""
-#: core/models.py:61
-msgid "message"
-msgstr "mensagem"
+#: core/models.py:89
+msgid "Message"
+msgstr "Mensagem"
-#: core/models.py:62
-msgid "Actor"
+#: core/models.py:90
+#, python-format
+msgid "%(class)s_Actor"
 msgstr ""
-#: core/models.py:63
+#: core/models.py:90
+msgid "User"
+msgstr "Usuário"
+
+#: core/models.py:91
 msgid "Read"
 msgstr ""
-#: core/models.py:64
+#: core/models.py:92 core/models.py:104
+msgid "Date and Time of action"
+msgstr "Data e hora da ação"
+
+#: core/models.py:93 core/models.py:106
 msgid "Action_Resource"
 msgstr ""
-#: core/templates/base.html:56
-msgid "Log out"
-msgstr "Sair"
+#: core/models.py:94
+#, python-format
+msgid "%(class)s_Performer"
+msgstr ""
+
+#: core/models.py:94
+msgid "Perfomer"
+msgstr "Ator"
+
+#: core/models.py:97
+msgid "Notification"
+msgstr "Notificação"
+
+#: core/models.py:98 core/templates/base.html:73 core/templates/guest.html:68
+msgid "Notifications"
+msgstr "Notificações"
+
+#: core/models.py:105
+msgid "Actor"
+msgstr "Ator"
+
+#: core/models.py:109
+msgid "Log"
+msgstr "Log"
+
+#: core/models.py:110
+msgid "Logs"
+msgstr "Logs"
+
+#: core/templates/base.html:80 core/templates/guest.html:75
+msgid "See More"
+msgstr "Ver Mais"
+
+#: core/templates/base.html:87 core/templates/guest.html:81
+msgid "messages"
+msgstr "Mensagens"
+
+#: core/templates/base.html:100 core/templates/guest.html:94
+msgid "Menu"
+msgstr "Menu"
+
+#: core/templates/base.html:104 core/templates/lembrar_senha.html:110
+msgid "Home"
+msgstr "Início"
+
+#: core/templates/base.html:105
+msgid "Profile"
+msgstr "Perfil"
+
+#: core/templates/base.html:107
+msgid "My courses"
+msgstr "Meus cursos"
+
+#: core/templates/base.html:108
+msgid "All Courses"
+msgstr "Cursos"
+
+#: core/templates/base.html:111
+msgid "Manage Users"
+msgstr "Gerenciar usuários"
+
+#: core/templates/base.html:115
+msgid "Manage Courses"
+msgstr "Gerenciar cursos"
+
+#: core/templates/base.html:133
+msgid "Category"
+msgstr "Categoria"
+
+#: core/templates/base.html:137
+msgid "Create Category"
+msgstr "Criar categorias"
+
+#: core/templates/base.html:138
+msgid "List Category"
+msgstr "Listar categoria"
+
+#: core/templates/guest.html:98
+msgid "Register"
+msgstr "Cadastrar"
-#: core/templates/index.html:30
+#: core/templates/guest.html:123
+msgid "All"
+msgstr "Todos"
+
+#: core/templates/guest.html:141
+msgid "Are you sure you want to subscribe to this course?"
+msgstr "Tem certeza que deseja se inscrever neste curso?"
+
+#: core/templates/guest.html:141
+msgid "Subscribe"
+msgstr "Inscrever"
+
+#: core/templates/guest.html:146
+msgid "Course Name"
+msgstr "Nome do curso"
+
+#: core/templates/guest.html:147
+msgid "Begining"
+msgstr "Início"
+
+#: core/templates/guest.html:148
+msgid "End"
+msgstr "Fim"
+
+#: core/templates/guest.html:149
+msgid "Professor"
+msgstr "Professor"
+
+#: core/templates/guest.html:151
+msgid "Description"
+msgstr "Descrição"
+
+#: core/templates/index.html:39
 msgid "Username"
-msgstr "Usuário"
+msgstr "Login"
-#: core/templates/index.html:36
-msgid "Password"
+#: core/templates/index.html:45
+msgid "password"
 msgstr "Senha"
-#: core/templates/index.html:44
+#: core/templates/index.html:52
 msgid "Remember Email"
-msgstr "Lembrar Senha"
+msgstr "Lembrar E-mail"
+
+#: core/templates/index.html:58
+msgid "Login"
+msgstr ""
-#: core/templates/index.html:53
+#: core/templates/index.html:61
 msgid "Guest"
 msgstr "Convidado"
-#: core/templates/index.html:56
-msgid "Login"
-msgstr "Entrar"
+#: core/templates/index.html:64
+msgid "Forgot your password?"
+msgstr "Esqueceu a senha?"
-#: core/templates/index.html:65
+#: core/templates/index.html:68
 msgid "Sign Up"
 msgstr "Cadastrar"
-#: core/templates/register_user.html:29
+#: core/templates/lembrar_senha.html:40
+msgid "Amadeus Project"
+msgstr "Projeto Amadeus"
+
+#: core/templates/lembrar_senha.html:65
+msgid "Enter"
+msgstr "Entrar"
+
+#: core/templates/lembrar_senha.html:101
+msgid "The Project"
+msgstr "O Projeto"
+
+#: core/templates/lembrar_senha.html:103
+msgid "CCTE Group"
+msgstr "Grupo CCTE"
+
+#: core/templates/lembrar_senha.html:106 core/templates/lembrar_senha.html:111
+msgid "Remember password"
+msgstr "Lembrar senha"
+
+#: core/templates/lembrar_senha.html:117
+msgid "New account"
+msgstr "Nova conta"
+
+#: core/templates/lembrar_senha.html:126
+msgid "Email"
+msgstr "E-mail"
+
+#: core/templates/lembrar_senha.html:128
+msgid "Your Email address (exemple@mail.com)"
+msgstr "Seu endereço de e-mail (exemplo@mail.com)"
+
+#: core/templates/lembrar_senha.html:163
+msgid "Copyright Amadeus. All rights reserved"
+msgstr "Copyright Amadeus. Todos os direitos reservados"
+
+#: core/templates/register_user.html:36
 msgid "User Register"
-msgstr "Registrar Usuário"
+msgstr "Cadastro de usuário"
-#: core/templates/register_user.html:53
+#: core/templates/register_user.html:88
 msgid "Save"
 msgstr "Salvar"
-#: core/templates/remember_password.html:18
+#: core/templates/register_user.html:91
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: core/templates/registration/passwor_reset_complete.html:25
+msgid "Your password has been set. You can go ahead and go now."
+msgstr "Sua senha foi redefinida. Você pode prosseguir."
+
+#: core/templates/registration/passwor_reset_confirm.html:24
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr "Por favor, insira uma nova senha duas vezes para verificarmos que digitou corretamente."
+
+#: core/templates/registration/passwor_reset_confirm.html:28
+msgid "New password:"
+msgstr "Nova senha:"
+
+#: core/templates/registration/passwor_reset_confirm.html:30
+msgid "Confirm password:"
+msgstr "Confirmação de senha:"
+
+#: core/templates/registration/passwor_reset_confirm.html:31
+msgid "Change my password"
+msgstr "Mudar senha"
+
+#: core/templates/registration/passwor_reset_confirm.html:36
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr "O link de redefinição de senha está inválido, possivelmente porque ele já foi utilizado. Por favor, solicite uma nova redefinição de senha."
+
+#: core/templates/registration/passwor_reset_done.html:39
+msgid ""
+"We have sent instructions to set up your password, if an account exists with "
+"the email entered. You should receive them soon."
+msgstr "Foi enviado as instruções para redefinição de senha, se a conta existe com o e-mail informado. Você deve receber a mensagem em breve."
+
+#: core/templates/registration/passwor_reset_done.html:40
+msgid ""
+"If you do not receive an email, please make sure you entered the address you "
+"registered, and check the spam folder."
+msgstr "Se você não recebeu a mensagem, certifique que informou o e-mail corretamente e cheque sua caixa de spam"
+
+#: core/templates/registration/passwor_reset_done.html:43
+#: core/templates/registration/passwor_reset_form.html:46
+msgid "Back"
+msgstr "Voltar"
+
+#: core/templates/registration/passwor_reset_form.html:39
 msgid "E-mail"
 msgstr "E-mail"
-#: core/templates/remember_password.html:22
-msgid "Registration"
-msgstr "Registrar"
-
-#: core/templates/remember_password.html:26
+#: core/templates/registration/passwor_reset_form.html:43
 msgid "Send"
 msgstr "Enviar"
-#: core/views.py:31
+#: core/templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Senha redefinida em %(site_name)s"
+
+#: core/tests.py:97
+msgid "Enter a valid email address."
+msgstr "Insira um e-mail válido."
+
+#: core/tests.py:111 core/tests.py:204
+msgid "This field is required."
+msgstr "Este campo é obrigatório."
+
+#: core/views.py:41
 msgid "User successfully registered!"
-msgstr "Usuario cadastrado com sucesso"
+msgstr "Usuário cadastrado com sucesso!"
+
+#: core/views.py:56
+msgid "Recover your password"
+msgstr "Redefina sua senha"
+
+#: core/views.py:57
+#, python-brace-format
+msgid ""
+"Hello {0}, \n"
+"Recover your password to use your account.\n"
+"Number of registration: {1}\n"
+"Link for recuver password.\n"
+"\n"
+"Respectfully,\n"
+"Team Amadeus."
+msgstr "Olá, {0} \n"
+"Redefina a senha para utilizar sua conta.\n"
+"Número de registro: {1}\n"
+"Link para redefinição de senha.\n"
+"\n"
+"Atenciosamente,\n"
+"Equipe Amadeus."
-#: core/views.py:54
-msgid "E-mail or password are incorrect!"
-msgstr "O E-mail e/ou a senha estão incorretos"
+#: core/views.py:83
+msgid "E-mail or password are incorrect."
+msgstr "E-mail ou senha incorretos."
@@ -411,4 +411,9 @@ ul, li {
 .cards-detail .panel .panel-heading{/*background-color:;*/}
 .cards-detail .panel .panel-heading h4{color:black;}
 .course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
-.course-detail{padding-top: 10px; padding-bottom: 10px;}
 \ No newline at end of file
+.course-detail{padding-top: 10px; padding-bottom: 10px;}
+
+/* Menu link remove radius */
+.nav-pills > li > a {
+  border-radius: 0px;
+}
 \ No newline at end of file
@@ -91,10 +91,15 @@ This functions get the next 5 notifications from the user given a &quot;step&quot;(an amou
 function getNotifications(step){
 	$.get('/getNotifications',
 		{'steps':step, 'amount': 5}, function(data){
-			$("#notification-dropdown").append(data);
-			$('#notification-see-more').remove();
-			var seemore = '<li><a onclick="getNotifications('+(step+5)+')"> <div id="notification-see-more" class="list-group-item"> <div class="row-content"><p class="list-group-item-text">See More</p> </div>  </a></li>';
-			$("#notification-dropdown").append(seemore);
-			$("#notification-count").text(step+5);
+			if(data == "nothing"){
+				console.log("No notifications");
+			}else{
+				$("#notification-dropdown").append(data['html']);
+				$('#notification-see-more').remove();
+				var seemore = '<li><a onclick="getNotifications('+(step+data['amountGotten'])+')"> <div id="notification-see-more" class="list-group-item"> <div class="row-content"><p class="list-group-item-text">See More</p> </div>  </a></li>';
+				$("#notification-dropdown").append(seemore);
+				$("#notification-count").text(step+data['amountGotten']);
+			}
+			
 		});
 }
@@ -9,7 +9,7 @@
 	<title>{{ title }}</title>
 	<meta http-equiv="Cache-Control" content="no-cache, no-store" />
-	<link href="{% static 'img/favicon.ico' %}" rel="shortcut icon" />
+	<link href="{% static 'img/topo-amadeus.png' %}" rel="shortcut icon" />
 	<!-- Roboto font -->
 	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 <!DOCTYPE html>
-{% load static i18n %}
+
 {% load i18n custom_filters %}
+{% load static i18n %}
 <html>
 <head>
@@ -47,6 +48,7 @@
     {% block javascript %}
         <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
     {% endblock %}
+
 </head>
 <body>
     {% block nav %}
@@ -64,14 +66,14 @@
                          <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
                  <a  class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
                    <ul id="notification-dropdown" class="dropdown-menu">
-                   <li class="dropdown-header">Notifications</li>
+                   <li class="dropdown-header">{% trans 'Notifications' %}</li>
                         {% include "notifications.html" %}
                         <li>
                          <a onclick="getNotifications(5)">
                             <div id="notification-see-more" class="list-group-item">
                                   <div class="row-content">
-                                    <p class="list-group-item-text">See More</p>
+                                    <p class="list-group-item-text">{% trans 'See More' %}</p>
                                 </div>
                        </a>
                         </li>
@@ -90,7 +92,7 @@
     			{% block sidebar %}
     				<div class="panel panel-primary">
 				        <div class="panel-heading">
-				            <h4>Menu</h4>
+				            <h4>{% trans 'Menu' %}</h4>
 				        </div>
 				        <div class="panel-body">
 				            <ul class="nav nav-pills nav-stacked">
@@ -119,7 +121,7 @@
 				<div class="col-md-10">
 					<div class="btn-group btn-group-justified btn-group-raised">
-						<a href="?category=all" class="btn btn-raised btn-info">Todos</a>
+						<a href="?category=all" class="btn btn-raised btn-info">{% trans 'All' %}</a>
 						{% for category in categories %}
 							<a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
 						{% endfor %}
@@ -142,12 +144,12 @@
 					  		</div>
 						  	<div class="panel-body">
-						    	<p><b>Course Name: </b>{{course.name}}</p>
-						    	<p><b>Begining: </b>{{course.init_date}}</p>
-						    	<p><b>End: </b>{{course.end_date}}</p>
-						    	<p><b>Professor: </b>{{course.professors.name}}</p>
+						    	<p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
+						    	<p><b>{% trans 'Begining' %}: </b>{{course.init_date}}</p>
+						    	<p><b>{% trans 'End' %}: </b>{{course.end_date}}</p>
+						    	<p><b>{% trans 'Professor' %}: </b>{{course.professors.name}}</p>
 						    	<p>
-							    <b>Description:</b>
+							    <b>{% trans 'Description' %}:</b>
 							    <i>
 							        {{course.content}}
 							    </i>
@@ -42,7 +42,7 @@
                                     </div>
                                     <div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">
                                       <div class="form-group">
-                                        <label for="inputPassword" class="control-label"> {% trans 'Password' %}</label>
+                                        <label for="inputPassword" class="control-label"> {% trans 'password' %}</label>
                                         <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
                                       </div>
                                     </div>
@@ -61,7 +61,7 @@
                                   <a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
                               </div>
                               <div class="col-md-10 col-sm-10 col-xs-10 col-lg-6 col-lg-offset-7 forgotPassword">
-                                  <a href="{% url 'core:password_reset' %}">{% trans "Forgot your password?" %}</a>
+                                  <a href="{% url 'core:password_reset' %}">{% trans 'Forgot your password?' %}</a>
                               </div>
                 </div>
               </div>
@@ -98,23 +98,23 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 <div id="institutional_menu">
-	<span><a href="/amadeuslms/fProject.do" target="_blank">{% trans 'O Projeto' %}</a></span>
+	<span><a href="/amadeuslms/fProject.do" target="_blank">{% trans 'The Project' %}</a></span>
 	<span>&nbsp;|&nbsp;</span>
-	<span><a href="/amadeuslms/fCCTE.do" target="_blank">{% trans 'Grupo CCTE' %}</a></span>
+	<span><a href="/amadeuslms/fCCTE.do" target="_blank">{% trans 'CCTE Group' %}</a></span>
 </div>
 		<div id="pTitle" class="pTitle">
-			<h2>{% trans 'Lembrar senha' %}</h2>
+			<h2>{% trans 'Remember password' %}</h2>
 		</div>
 		<div id="pBreadCrumbs" class="pBreadCrumbs">
 			<ul id="breadcrumb">
-				<li><a href="{% url 'home' %}">{% trans 'Página Inicial' %}</a></li>
-				<li>{%trans 'Lembrar senha' %}</li>
+				<li><a href="{% url 'home' %}">{% trans 'Home' %}</a></li>
+				<li>{%trans 'Remember password' %}</li>
 			</ul>
 		</div>
 		<div id="pLeftMenu" class="pLeftMenu">
 			<div id="side_menu_1">
 				<ul id="menu_sessoes">
-					<li><a href="{% url 'create_account' %}" class="insert">{% trans 'Nova conta' %}</a></li>
+					<li><a href="{% url 'create_account' %}" class="insert">{% trans 'New account' %}</a></li>
 			    </ul>
 			</div>
 		</div>
@@ -123,9 +123,9 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 				<form name="remindPasswordForm" method="post" action="/amadeuslms/remindPassword.do">
-				<dt>{% trans 'Endereço de e-mail' %}</dt>
+				<dt>{% trans 'Email' %}</dt>
 					<dd><input type="text" name="email" value="" class="formfield2" id="username"></dd>
-					<dd class="description">{% trans 'Seu endereço de e-mail (exemplo@mail.com)' %}</dd>
+					<dd class="description">{% trans 'Your Email address (exemple@mail.com)' %}</dd>
 					<dt class="field"><input type="submit" name="remindPassword" value="Enviar e-mail" class="button"></dt>
 				</form>
 <script type="text/javascript" language="JavaScript">
@@ -160,7 +160,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 <div id="footnote">
-	<dl><dd>{% trans 'Copyright Amadeus. Todos os direitos reservados' %}<dd></dl>
+	<dl><dd>{% trans 'Copyright Amadeus. All rights reserved' %}<dd></dl>
 </div>
 	</div>
@@ -14,7 +14,7 @@
 	    <div class="least-content "> {{ notification.datetime|timesince }} </div>
 	  </div>
 	  <div class="row-content">
-	    <p class="list-group-item-text">{{ notification.message }}</p>
+	    <p class="list-group-item-text">{{notification.actor.username}} {{ notification.message }}</p>
 	  </div>
 	  </div>
 	  </a>
@@ -30,7 +30,7 @@
 	            <div class="least-content pull-right">{{ notification.datetime|timesince }}</div>
-	            <p class="list-group-item-text">{{ notification.message }}</p>
+	            <p class="list-group-item-text">{{notification.actor.username}} {{ notification.message }}</p>
 	        </div>
 	     </a>
 	</li>
+{% load static i18n %}
+
 {% trans 'To initiate the password reset process for your {{ user.get_username }} TestSite Account,
 click the link below:' %}
 {% load i18n %}{% autoescape off %}
-{% blocktrans %}{% trans 'Password reset on' %} {{ site_name }}{% endblocktrans %}
+{% blocktrans %}Password reset on {{ site_name }}{% endblocktrans %}
 {% endautoescape %}
@@ -54,7 +54,7 @@ def remember_password(request):
 		registration = request.POST['registration']
 		if email and registration:
 			subject = _('Recover your password')
-			message = _('Hello %s, \nRecover your password to use your account.\nNumber of registration: %s\nLink for recuver password.\n\nRespectfully,\nTeam Amadeus.' % (request.user,registration))
+			message = _('Hello {0}, \nRecover your password to use your account.\nNumber of registration: {1}\nLink for recuver password.\n\nRespectfully,\nTeam Amadeus.'.format(request.user,registration))
 			try:
 				send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [email],fail_silently=False)
 				context['success'] = 'Email successfully sent'
@@ -101,17 +101,24 @@ def processNotification(self, notificationId):
 def getNotifications(request):
 	context = {}
 	if request.user.is_authenticated:
-
+		amountGotten = 0 #amountOfNotifications actually received
 		steps = int(request.GET['steps'])
 		amount = int(request.GET['amount'])
 		notifications = Notification.objects.filter(user= request.user, read=False).order_by('-datetime')[steps:steps+amount]
+		if len(notifications) == 0:
+			return HttpResponse("nothing")
+		else:
+			amountGotten = len(notifications)
 		context['notifications'] = notifications
 	else: #go to login page
 		return HttpResponse('teste')
 	html = render_to_string("notifications.html", context)
-	return HttpResponse(html)
+	data = {}
+	data['html'] = html
+	data['amountGotten'] = amountGotten
+	return JsonResponse(data)
 def guest (request):
 	context = {
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
+"POT-Creation-Date: 2016-10-26 14:47-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,290 +18,564 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: courses/forms.py:11 courses/forms.py:25 courses/forms.py:58
-#: courses/models.py:7 courses/models.py:20 courses/models.py:44
-#: courses/templates/category/index.html:38
+#: courses/forms.py:13 courses/forms.py:56 courses/forms.py:96
+#: courses/forms.py:133 courses/forms.py:153 courses/models.py:14
+#: courses/models.py:26 courses/models.py:39 courses/models.py:75
+#: courses/models.py:103 courses/models.py:165
+#: courses/templates/course/replicate.html:18
+#: courses/templates/subject/form_view_teacher.html:224
+#: courses/templates/subject/form_view_teacher.html:279
 msgid "Name"
 msgstr "Nome"
-#: courses/forms.py:14
-msgid "Category name"
-msgstr ""
+#: courses/forms.py:16
+#, fuzzy
+#| msgid "Category name"
+msgid "CourseCategory name"
+msgstr "Nome da categoria"
+
+#: courses/forms.py:26 courses/forms.py:42
+msgid "The end date may not be before the start date."
+msgstr "A data final não pode anteceder a data inicial."
+
+#: courses/forms.py:34
+msgid "The course start date must be after the end of registration."
+msgstr "A data de início do curso deve ocorrer após as inscrições."
-#: courses/forms.py:26
+#: courses/forms.py:57 courses/forms.py:97
+#: courses/templates/course/replicate.html:28
 msgid "Objectives"
 msgstr "Objetivos"
-#: courses/forms.py:27 courses/models.py:23
+#: courses/forms.py:58 courses/forms.py:98 courses/models.py:42
+#: courses/templates/course/replicate.html:37
 msgid "Content"
 msgstr "Conteúdo"
-#: courses/forms.py:28
+#: courses/forms.py:59 courses/forms.py:99
+#: courses/templates/course/replicate.html:47
 msgid "Number of studets maximum"
 msgstr "Número máximo de estudantes"
-#: courses/forms.py:29
+#: courses/forms.py:60 courses/forms.py:100
+#: courses/templates/course/replicate.html:57
 msgid "Course registration start date"
 msgstr "Início das inscrições"
-#: courses/forms.py:30
+#: courses/forms.py:61 courses/forms.py:101
+#: courses/templates/course/replicate.html:67
 msgid "Course registration end date"
 msgstr "Fim da Inscrições"
-#: courses/forms.py:31
+#: courses/forms.py:62 courses/forms.py:102
+#: courses/templates/course/replicate.html:77
 msgid "Course start date"
 msgstr "Data de inicio do Curso"
-#: courses/forms.py:32
+#: courses/forms.py:63 courses/forms.py:103
+#: courses/templates/course/replicate.html:87
 msgid "Course end date"
 msgstr "Data de termino do curso"
-#: courses/forms.py:33 courses/models.py:30
+#: courses/forms.py:64 courses/forms.py:104 courses/models.py:49
 msgid "Image"
 msgstr "Imagem"
-#: courses/forms.py:34 courses/models.py:12 courses/models.py:31
-msgid "Category"
-msgstr "Categoria"
+#: courses/forms.py:65 courses/forms.py:105
+#: courses/templates/course/replicate.html:115
+#, fuzzy
+#| msgid "Create Category"
+msgid "CourseCategory"
+msgstr "Criar Categoria"
-#: courses/forms.py:37
+#: courses/forms.py:68 courses/forms.py:109
+#: courses/templates/course/replicate.html:23
 msgid "Course name"
 msgstr "Nome do Curso"
-#: courses/forms.py:38
+#: courses/forms.py:69 courses/forms.py:110
+#: courses/templates/course/replicate.html:32
 msgid "Course objective"
 msgstr "Objetivo do Curso"
-#: courses/forms.py:39
+#: courses/forms.py:70 courses/forms.py:111
+#: courses/templates/course/replicate.html:42
 msgid "Course modules"
 msgstr "Ḿódulos do curso"
-#: courses/forms.py:40
+#: courses/forms.py:71 courses/forms.py:112
+#: courses/templates/course/replicate.html:52
 msgid "Max number of students that a class can have"
 msgstr "Número máximo de estudantes que uma classe pode ter"
-#: courses/forms.py:41
+#: courses/forms.py:72 courses/forms.py:113
+#: courses/templates/course/replicate.html:62
 msgid "Date that starts the registration period of the course (dd/mm/yyyy)"
 msgstr "Data do começo do período de inscrição do curso (dia/mês/ano)"
-#: courses/forms.py:42
+#: courses/forms.py:73 courses/forms.py:114
+#: courses/templates/course/replicate.html:72
 msgid "Date that ends the registration period of the course (dd/mm/yyyy)"
 msgstr "Data do termino do período de inscrição do curso (dia/mês/ano)"
-#: courses/forms.py:43
+#: courses/forms.py:74 courses/forms.py:115
+#: courses/templates/course/replicate.html:82
 msgid "Date that the course starts (dd/mm/yyyy)"
 msgstr "Data que o curso começa (dia/mês/ano)"
-#: courses/forms.py:44
+#: courses/forms.py:75 courses/forms.py:116
+#: courses/templates/course/replicate.html:92
 msgid "Date that the course ends (dd/mm/yyyy)"
 msgstr "Data que o curso termina (dia/mês/ano)"
-#: courses/forms.py:45
+#: courses/forms.py:76 courses/forms.py:117
+#: courses/templates/course/replicate.html:110
 msgid "Representative image of the course"
 msgstr "Imagem representativa do curso"
-#: courses/forms.py:46
-msgid "Category which the course belongs"
+#: courses/forms.py:77 courses/forms.py:118
+#: courses/templates/course/replicate.html:124
+#, fuzzy
+#| msgid "Category which the course belongs"
+msgid "CourseCategory which the course belongs"
 msgstr "Categoria ao qual o curso pertence"
-#: courses/forms.py:59 courses/models.py:46
+#: courses/forms.py:106
+#, fuzzy
+#| msgid "Maximum Students"
+msgid "Student"
+msgstr "Quantidade máxima de estudantes"
+
+#: courses/forms.py:119
+#, fuzzy
+#| msgid "Course modules"
+msgid "Course's Students"
+msgstr "Ḿódulos do curso"
+
+#: courses/forms.py:134 courses/forms.py:154 courses/models.py:77
+#: courses/models.py:105 courses/models.py:167
+#: courses/templates/course/course_card.html:35
+#: courses/templates/course/view.html:69
+#: courses/templates/course/view.html:164
+#: courses/templates/course/view.html:220
+#: courses/templates/subject/form_view_teacher.html:121
+#: courses/templates/subject/index.html:80
 msgid "Description"
 msgstr "Descrição"
-#: courses/forms.py:60
+#: courses/forms.py:135
+#, fuzzy
+#| msgid "Course start date"
+msgid "Start date"
+msgstr "Data de inicio do Curso"
+
+#: courses/forms.py:136
+#, fuzzy
+#| msgid "Course end date"
+msgid "End date"
+msgstr "Data de termino do curso"
+
+#: courses/forms.py:137
 msgid "Is it visible?"
 msgstr "Visível?"
-#: courses/forms.py:63
-msgid "Module's name"
-msgstr "nome do módulo"
+#: courses/forms.py:140
+#, fuzzy
+#| msgid "Module's name"
+msgid "Subjects's name"
+msgstr "Nome do módulo"
-#: courses/forms.py:64
-msgid "Modules's description"
-msgstr "descrição do módulo"
+#: courses/forms.py:141
+#, fuzzy
+#| msgid "Modules's description"
+msgid "Subjects's description"
+msgstr "Descrição do módulo"
-#: courses/forms.py:65
-msgid "Is the module visible?"
-msgstr ""
+#: courses/forms.py:142
+msgid "Start date of the subject"
+msgstr "Data de início do assunto"
-#: courses/models.py:8 courses/models.py:21 courses/models.py:45
-#: courses/templates/category/index.html:39
+#: courses/forms.py:143
+msgid "End date of the subject"
+msgstr "Data final do assunto"
+
+#: courses/forms.py:144
+#, fuzzy
+#| msgid "Is the module visible?"
+msgid "Is the subject visible?"
+msgstr "O módulo é visível?"
+
+#: courses/forms.py:157
+#, fuzzy
+#| msgid "Module's name"
+msgid "Topic's name"
+msgstr "nome do módulo"
+
+#: courses/forms.py:158
+#, fuzzy
+#| msgid "Modules's description"
+msgid "Topic's description"
+msgstr "Descrição do módulo"
+
+#: courses/models.py:15 courses/models.py:27 courses/models.py:40
+#: courses/models.py:76 courses/models.py:104 courses/models.py:166
 msgid "Slug"
 msgstr ""
-#: courses/models.py:9 courses/models.py:25 courses/models.py:48
+#: courses/models.py:16 courses/models.py:28 courses/models.py:44
+#: courses/models.py:81 courses/models.py:106
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de criação"
-#: courses/models.py:13 courses/templates/category/create.html:16
-#: courses/templates/category/delete.html:15
-#: courses/templates/category/index.html:15
-#: courses/templates/category/update.html:16
-#: courses/templates/category/view.html:15
+#: courses/models.py:19 courses/models.py:31 courses/models.py:50
+#: courses/models.py:84 courses/templates/category/create.html:43
+#: courses/templates/category/index.html:44
+#: courses/templates/category/update.html:43
+#: courses/templates/course/index.html:48
+msgid "Category"
+msgstr "Categoria"
+
+#: courses/models.py:20 courses/models.py:32
 msgid "Categories"
 msgstr "Categorias"
-#: courses/models.py:22
+#: courses/models.py:41
 msgid "Objectivies"
-msgstr ""
+msgstr "Objetivos"
-#: courses/models.py:24
+#: courses/models.py:43
 msgid "Maximum Students"
 msgstr "Quantidade máximo de estudantes"
-#: courses/models.py:26
+#: courses/models.py:45
 msgid "Register Date (Begin)"
-msgstr ""
+msgstr "Data de inscrição (Início)"
-#: courses/models.py:27
+#: courses/models.py:46
 msgid "Register Date (End)"
-msgstr ""
+msgstr "Data de inscrição (término)"
-#: courses/models.py:28
+#: courses/models.py:47
 msgid "Begin of Course Date"
-msgstr ""
+msgstr "Início do curso"
-#: courses/models.py:29
+#: courses/models.py:48
 msgid "End of Course Date"
-msgstr ""
+msgstr "Término do curso"
-#: courses/models.py:32
-msgid "User"
-msgstr ""
+#: courses/models.py:51 courses/models.py:85
+msgid "Professors"
+msgstr "Professores"
-#: courses/models.py:36 courses/models.py:49
+#: courses/models.py:52 courses/models.py:86 courses/models.py:127
+#: courses/models.py:147
+#, fuzzy
+#| msgid "Maximum Students"
+msgid "Students"
+msgstr "Quantidade máximo de estudantes"
+
+#: courses/models.py:53
+msgid "Public"
+msgstr "Público"
+
+#: courses/models.py:57 courses/models.py:83
 msgid "Course"
 msgstr "Curso"
-#: courses/models.py:37 courses/templates/course/create.html:16
-#: courses/templates/course/delete.html:15
-#: courses/templates/course/filtered.html:8
-#: courses/templates/course/home.html:16 courses/templates/course/index.html:15
-#: courses/templates/course/update.html:16
-#: courses/templates/course/view.html:15
-#: courses/templates/module/create.html:17
-#: courses/templates/module/delete.html:16
-#: courses/templates/module/index.html:16
-#: courses/templates/module/update.html:17
+#: courses/models.py:58 courses/templates/course/filtered.html:8
+#: courses/templates/course/home.html:16
 msgid "Courses"
 msgstr "Cursos"
-#: courses/models.py:47 courses/templates/module/index.html:107
+#: courses/models.py:78 courses/models.py:110
 msgid "Visible"
 msgstr "Visível"
-#: courses/models.py:53
-msgid "Module"
-msgstr "Modulo"
+#: courses/models.py:79
+#, fuzzy
+#| msgid "Begin of Course Date"
+msgid "Begin of Subject Date"
+msgstr "Início do curso"
+
+#: courses/models.py:80
+#, fuzzy
+#| msgid "End of Course Date"
+msgid "End of Subject Date"
+msgstr "Término do curso"
+
+#: courses/models.py:82 courses/models.py:107
+msgid "Date of last update"
+msgstr "Data da última atualização"
+
+#: courses/models.py:90 courses/models.py:108
+msgid "Subject"
+msgstr "Assunto"
+
+#: courses/models.py:91
+#, fuzzy
+#| msgid "Objectives"
+msgid "Subjects"
+msgstr "Objetivos"
+
+#: courses/models.py:109
+msgid "Owner"
+msgstr "Proprietário"
-#: courses/models.py:54 courses/templates/module/index.html:92
-msgid "Modules"
-msgstr "Modulos"
+#: courses/models.py:114 courses/models.py:125 courses/models.py:146
+msgid "Topic"
+msgstr "Tópico"
+
+#: courses/models.py:115
+msgid "Topics"
+msgstr "Tópicos"
+
+#: courses/models.py:126
+msgid "Deliver Date"
+msgstr "Data de entrega"
+
+#: courses/models.py:128 courses/models.py:148
+#, fuzzy
+#| msgid "Maximum Students"
+msgid "All Students"
+msgstr "Quantidade máximo de estudantes"
+
+#: courses/models.py:151 courses/models.py:156
+#: courses/templates/subject/form_view_student.html:35
+#: courses/templates/subject/form_view_teacher.html:56
+#: courses/templates/subject/form_view_teacher.html:127
+msgid "Material"
+msgstr "Material"
+
+#: courses/models.py:171
+#, fuzzy
+#| msgid "Create Category"
+msgid "subject category"
+msgstr "Criar Categoria"
+
+#: courses/models.py:172
+#, fuzzy
+#| msgid "Categories"
+msgid "subject categories"
+msgstr "Categorias"
 #: courses/templates/category/create.html:8
-#: courses/templates/category/delete.html:7
-#: courses/templates/category/index.html:7
-#: courses/templates/category/update.html:8
-#: courses/templates/category/view.html:7
+#: courses/templates/category/index.html:9
+#: courses/templates/category/update.html:9
 #: courses/templates/course/create.html:8
 #: courses/templates/course/delete.html:7 courses/templates/course/home.html:8
-#: courses/templates/course/index.html:7 courses/templates/course/update.html:8
-#: courses/templates/course/view.html:7 courses/templates/module/create.html:8
-#: courses/templates/module/delete.html:7 courses/templates/module/index.html:7
-#: courses/templates/module/update.html:8
+#: courses/templates/course/index.html:20
+#: courses/templates/course/replicate.html:8
+#: courses/templates/course/view.html:28
+#: courses/templates/subject/index.html:8
+#: courses/templates/subject/index.html:25
+#: courses/templates/subject_category/index.html:8
+#: courses/templates/topic/index.html:8
 msgid "Home"
 msgstr "Inicio"
 #: courses/templates/category/create.html:9
-#: courses/templates/category/delete.html:18
-#: courses/templates/category/index.html:18
-#: courses/templates/category/view.html:18
+#: courses/templates/category/create.html:36
+#: courses/templates/category/create.html:47
+#: courses/templates/category/index.html:37
+#: courses/templates/category/index.html:48
+#: courses/templates/category/update.html:37
+#: courses/templates/category/update.html:47
+#: courses/templates/course/index.html:52
 msgid "Create Category"
 msgstr "Criar Categoria"
-#: courses/templates/category/create.html:26
-#: courses/templates/category/update.html:26
-#: courses/templates/course/create.html:26
-#: courses/templates/course/update.html:32
-#: courses/templates/module/create.html:52
-#: courses/templates/module/update.html:52
-msgid "All fields are required"
-msgstr "Todos os campos são obrigatótios"
-
-#: courses/templates/category/create.html:51
-#: courses/templates/category/update.html:51
-#: courses/templates/course/create.html:51
-#: courses/templates/course/update.html:57
-#: courses/templates/module/create.html:77
-#: courses/templates/module/update.html:77
+#: courses/templates/category/create.html:16
+#: courses/templates/category/index.html:17
+#: courses/templates/category/update.html:17
+#: courses/templates/course/index.html:16
+#: courses/templates/course/view.html:24
+#: courses/templates/subject/index.html:21
+#: courses/templates/topic/index.html:24
+msgid "Menu"
+msgstr "Menu"
+
+#: courses/templates/category/create.html:20
+#: courses/templates/category/index.html:21
+#: courses/templates/category/update.html:21
+#: courses/templates/course/index.html:21
+#: courses/templates/course/view.html:29
+#: courses/templates/subject/index.html:26
+#: courses/templates/topic/index.html:28
+msgid "Profile"
+msgstr "Perfil"
+
+#: courses/templates/category/create.html:21
+#: courses/templates/category/index.html:22
+#: courses/templates/category/update.html:22
+#: courses/templates/course/view.html:30 courses/templates/topic/index.html:29
+#, fuzzy
+#| msgid "Courses"
+msgid "My Courses"
+msgstr "Meus Cursos"
+
+#: courses/templates/category/create.html:30
+#: courses/templates/category/index.html:31
+#: courses/templates/category/update.html:31
+#: courses/templates/topic/index.html:37
+msgid "Actions"
+msgstr "Ações"
+
+#: courses/templates/category/create.html:34
+#: courses/templates/category/index.html:35
+#: courses/templates/category/update.html:35
+#: courses/templates/course/replicate.html:9 courses/views.py:133
+#, fuzzy
+#| msgid "Duplicate Course"
+msgid "Replicate Course"
+msgstr "Duplicar curso"
+
+#: courses/templates/category/create.html:35
+#: courses/templates/category/index.html:36
+#: courses/templates/category/update.html:36
+#: courses/templates/course/create.html:9
+#: courses/templates/course/filtered.html:11 courses/views.py:104
+msgid "Create Course"
+msgstr "Criar curso"
+
+#: courses/templates/category/create.html:48
+#: courses/templates/category/index.html:49
+#: courses/templates/category/update.html:48
+#: courses/templates/course/index.html:53
+#, fuzzy
+#| msgid "Edit Category"
+msgid "List Category"
+msgstr "Editar categoria"
+
+#: courses/templates/category/create.html:77
+#: courses/templates/category/update.html:90
 msgid "Save"
 msgstr "Salvar"
-#: courses/templates/category/delete.html:8
-#: courses/templates/category/index.html:8
-msgid "Manage Categories"
-msgstr ""
+#: courses/templates/category/delete.html:10
+#, fuzzy
+#| msgid "Create Category"
+msgid "Delete Category"
+msgstr "Criar Categoria"
-#: courses/templates/category/delete.html:26
-msgid "Are you sure you want to delete the category"
-msgstr ""
+#: courses/templates/category/delete.html:17
+#: courses/templates/subject/delete.html:11
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to delete the subject"
+msgstr "Você tem certeza que deseja deletar o curso"
-#: courses/templates/category/delete.html:27
-#: courses/templates/course/delete.html:28
-#: courses/templates/module/delete.html:50
-msgid "Yes"
-msgstr "Sim"
+#: courses/templates/category/delete.html:23
+#: courses/templates/course/course_card.html:57
+#: courses/templates/subject/form_view_teacher.html:352
+msgid "Close"
+msgstr "Fechar"
-#: courses/templates/category/delete.html:28
-#: courses/templates/course/delete.html:29
-#: courses/templates/module/delete.html:51
-msgid "No"
-msgstr "Não"
+#: courses/templates/category/delete.html:24
+#, fuzzy
+#| msgid "Delete Course"
+msgid "Delete"
+msgstr "Deletar curso"
-#: courses/templates/category/index.html:40
-msgid "Actions"
-msgstr ""
+#: courses/templates/category/index.html:10
+msgid "Manage Categories"
+msgstr "Gerenciar categorias"
-#: courses/templates/category/index.html:59
-msgid "No categories found"
-msgstr ""
+#: courses/templates/category/index.html:84
+#: courses/templates/course/update.html:54
+#: courses/templates/subject/update.html:20
+#: courses/templates/topic/update.html:20
+msgid "Update"
+msgstr "Atualizar"
-#: courses/templates/category/update.html:9
-#: courses/templates/category/view.html:21
+#: courses/templates/category/index.html:85
+#, fuzzy
+#| msgid "Remove Category"
+msgid "Remover"
+msgstr "Remover categoria"
+
+#: courses/templates/category/update.html:10
 msgid "Edit Category"
-msgstr ""
+msgstr "Editar categoria"
-#: courses/templates/category/view.html:24
-msgid "Remove Category"
-msgstr ""
+#: courses/templates/course/course_card.html:22
+#: courses/templates/course/view.html:56
+#: courses/templates/course/view.html:145
+#: courses/templates/course/view.html:202
+#: courses/templates/subject/form_view_teacher.html:36
+#: courses/templates/subject/index.html:68
+#: courses/templates/topic/index.html:69
+msgid "Replicate"
+msgstr "Repetir"
+
+#: courses/templates/course/course_card.html:23
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to delete this course?"
+msgstr "Você tem certeza que deseja deletar o curso"
+
+#: courses/templates/course/course_card.html:23
+#: courses/templates/course/view.html:58
+#: courses/templates/course/view.html:146
+#: courses/templates/course/view.html:203
+#: courses/templates/subject/form_view_teacher.html:38
+#: courses/templates/subject/index.html:70
+#: courses/templates/topic/index.html:71
+msgid "Remove"
+msgstr "Remover"
+
+#: courses/templates/course/course_card.html:32
+#: courses/templates/course/view.html:66
+#, fuzzy
+#| msgid "Course name"
+msgid "Course Name"
+msgstr "Nome do Curso"
-#: courses/templates/category/view.html:32
-msgid "Name:"
-msgstr ""
+#: courses/templates/course/course_card.html:33
+#: courses/templates/course/view.html:67
+msgid "Coordinator"
+msgstr "Coordenador"
+
+#: courses/templates/course/course_card.html:49
+#, fuzzy
+#| msgid "Duplicate Course"
+msgid "Repicate Course"
+msgstr "Duplicar Curso"
+
+#: courses/templates/course/course_card.html:58
+#: courses/templates/course/create.html:55
+#: courses/templates/subject/create.html:20
+#: courses/templates/subject/form_view_teacher.html:353
+#: courses/templates/topic/create.html:20
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create"
+msgstr "Criar curso"
-#: courses/templates/category/view.html:33
-msgid "Slug:"
+#: courses/templates/course/create.html:29
+#: courses/templates/course/replicate.html:105
+#: courses/templates/course/update.html:28
+msgid "attach_file"
 msgstr ""
-#: courses/templates/course/create.html:9
+#: courses/templates/course/delete.html:17
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to delete the course"
+msgstr "Você tem certeza que deseja deletar o curso"
+
 #: courses/templates/course/delete.html:18
-#: courses/templates/course/filtered.html:11
-#: courses/templates/course/index.html:18 courses/templates/course/view.html:25
-#: courses/templates/module/create.html:20
-#: courses/templates/module/delete.html:19
-#: courses/templates/module/index.html:26
-#: courses/templates/module/update.html:20
-msgid "Create Course"
-msgstr ""
+#: courses/templates/subject/delete.html:12
+msgid "Yes"
+msgstr "Sim"
-#: courses/templates/course/delete.html:27
-msgid "Are you sure you want to delete the couse"
-msgstr ""
+#: courses/templates/course/delete.html:19
+#: courses/templates/subject/delete.html:13
+msgid "No"
+msgstr "Não"
 #: courses/templates/course/filtered.html:19
-#: courses/templates/course/index.html:26
 msgid "Categories:"
-msgstr ""
+msgstr "Categorias:"
 #: courses/templates/course/home.html:9
 #, fuzzy
@@ -309,155 +583,398 @@ msgstr &quot;&quot;
 msgid "Home Course"
 msgstr "Curso"
-#: courses/templates/course/index.html:8
-msgid "Manage Courses"
-msgstr ""
+#: courses/templates/course/index.html:23
+#: courses/templates/subject/index.html:28
+#, fuzzy
+#| msgid "Courses"
+msgid "My courses"
+msgstr "Cursos"
-#: courses/templates/course/index.html:80
-msgid "students tops"
-msgstr ""
+#: courses/templates/course/index.html:24
+#: courses/templates/course/view.html:31
+#: courses/templates/subject/index.html:29
+#, fuzzy
+#| msgid "Courses"
+msgid "All Courses"
+msgstr "Cursos"
-#: courses/templates/course/index.html:86
-msgid "Subscribe Period:"
-msgstr ""
+#: courses/templates/course/index.html:27
+#: courses/templates/subject/index.html:32
+#, fuzzy
+#| msgid "Manage Courses"
+msgid "Manage Users"
+msgstr "Gerenciar cursos"
-#: courses/templates/course/index.html:88 courses/templates/course/view.html:59
-#: courses/templates/module/index.html:83
-msgid "Period:"
-msgstr ""
+#: courses/templates/course/index.html:31
+#: courses/templates/subject/index.html:36
+msgid "Manage Courses"
+msgstr "Gerenciar cursos"
 #: courses/templates/course/index.html:104
 msgid "No courses found"
-msgstr ""
+msgstr "Nenhum curso encontrado"
-#: courses/templates/course/update.html:9 courses/templates/course/view.html:28
-#: courses/templates/module/create.html:26
-#: courses/templates/module/delete.html:25
-#: courses/templates/module/index.html:29
-#: courses/templates/module/update.html:26
-msgid "Edit Course"
-msgstr ""
+#: courses/templates/course/replicate.html:97
+#, fuzzy
+#| msgid "Image"
+msgid "Imagem"
+msgstr "Imagem"
-#: courses/templates/course/update.html:19
-#: courses/templates/course/view.html:21
-#: courses/templates/module/create.html:29
-#: courses/templates/module/delete.html:9
-#: courses/templates/module/delete.html:28
-#: courses/templates/module/index.html:9 courses/templates/module/index.html:22
-#: courses/templates/module/update.html:29
-msgid "Manage Modules"
-msgstr ""
+#: courses/templates/course/view.html:55
+#: courses/templates/course/view.html:243
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create Subject"
+msgstr "Criar curso"
+
+#: courses/templates/course/view.html:57
+#: courses/templates/subject/form_view_teacher.html:37
+#: courses/templates/subject/index.html:69
+#: courses/templates/topic/index.html:70
+msgid "Edit"
+msgstr "Editar"
+
+#: courses/templates/course/view.html:83
+msgid "Create a New Subject"
+msgstr "Criar novo assunto"
+
+#: courses/templates/course/view.html:89
+#: courses/templates/subject/form_view_teacher.html:173
+#: courses/templates/subject/form_view_teacher.html:313
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: courses/templates/course/view.html:90
+#: courses/templates/course/view.html:117
+#: courses/templates/course/view.html:260
+#: courses/templates/subject/form_view_teacher.html:206
+#: courses/templates/subject/form_view_teacher.html:258
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: courses/templates/course/view.html:113
+#: courses/templates/course/view.html:256
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to remove this subject?"
+msgstr "Você tem certeza que deseja deletar o curso"
-#: courses/templates/course/update.html:22
-#: courses/templates/course/view.html:31
-#: courses/templates/module/create.html:32
-#: courses/templates/module/delete.html:31
-#: courses/templates/module/index.html:32
-#: courses/templates/module/update.html:32
-msgid "Participants"
-msgstr ""
+#: courses/templates/course/view.html:154
+#: courses/templates/course/view.html:210
+#, fuzzy
+#| msgid "Are you sure you want to delete the couse"
+msgid "Are you sure you want to subscribe to this subject?"
+msgstr "Você tem certeza que deseja deletar o curso"
-#: courses/templates/course/view.html:18
-#: courses/templates/module/create.html:23
-#: courses/templates/module/delete.html:22
-#: courses/templates/module/index.html:19
-#: courses/templates/module/update.html:23
-msgid "Course Info"
-msgstr ""
+#: courses/templates/course/view.html:154
+#: courses/templates/course/view.html:210
+#, fuzzy
+#| msgid "Subscribes:"
+msgid "Subscribe"
+msgstr "Inscrições:"
+
+#: courses/templates/course/view.html:161
+#: courses/templates/course/view.html:217
+#: courses/templates/subject/index.html:78
+msgid "Professor"
+msgstr "Professor"
+
+#: courses/templates/course/view.html:171
+#: courses/templates/course/view.html:227
+msgid "Begining"
+msgstr "Início"
+
+#: courses/templates/course/view.html:174
+#: courses/templates/course/view.html:230
+#: courses/templates/subject/index.html:88
+msgid "End"
+msgstr "Final"
+
+#: courses/templates/subject/form_view_student.html:45
+#: courses/templates/subject/form_view_teacher.html:83
+#: courses/templates/subject/form_view_teacher.html:94
+#: courses/templates/subject/form_view_teacher.html:153
+#, fuzzy
+#| msgid "Objectivies"
+msgid "Activities"
+msgstr "Objetivos"
-#: courses/templates/course/view.html:34
-#: courses/templates/module/create.html:35
-#: courses/templates/module/delete.html:34
-#: courses/templates/module/index.html:35
-#: courses/templates/module/update.html:35
-msgid "Course avaliations"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:62
+#: courses/templates/subject/form_view_teacher.html:133
+msgid "Create a Link"
+msgstr "Criar link"
-#: courses/templates/course/view.html:37
-#: courses/templates/module/create.html:38
-#: courses/templates/module/delete.html:37
-#: courses/templates/module/index.html:38
-#: courses/templates/module/update.html:38
-msgid "Duplicate Course"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:65
+#: courses/templates/subject/form_view_teacher.html:136
+#, fuzzy
+#| msgid "Create Module"
+msgid "Create a file"
+msgstr "Criar módulos"
-#: courses/templates/course/view.html:40
-#: courses/templates/module/create.html:41
-#: courses/templates/module/delete.html:40
-#: courses/templates/module/index.html:41
-#: courses/templates/module/update.html:41
-msgid "Delete Course"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:100
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create Forum"
+msgstr "Criar curso"
-#: courses/templates/course/view.html:56
-msgid "Subscribes:"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:101
+#, fuzzy
+#| msgid "Create Module"
+msgid "Create Poll"
+msgstr "Criar módulos"
-#: courses/templates/course/view.html:66
-msgid "Objectives:"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:117
+msgid "Name Topic"
+msgstr "Nome do tópico"
-#: courses/templates/course/view.html:69
-msgid "Work Plan:"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:159
+msgid "Anything"
+msgstr "Qualquer coisa"
-#: courses/templates/module/create.html:10
-#: courses/templates/module/index.html:70
-msgid "Create Module"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:174
+#: courses/templates/subject/form_view_teacher.html:314
+msgid "Submit"
+msgstr "Enviar"
-#: courses/templates/module/delete.html:49
-msgid "Are you sure you want to delete the module"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:202
+#, fuzzy
+#| msgid "Delete Course"
+msgid "Delete your Topic?"
+msgstr "Deletar curso"
-#: courses/templates/module/index.html:80
-msgid "students maximum"
+#: courses/templates/subject/form_view_teacher.html:220
+msgid "Material EMBED"
 msgstr ""
-#: courses/templates/module/index.html:109
-msgid "Invisible"
+#: courses/templates/subject/form_view_teacher.html:231
+msgid "Code"
 msgstr ""
-#: courses/templates/module/index.html:125
-msgid "No modules found"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:235
+#, fuzzy
+#| msgid "Modules's description"
+msgid "Material description"
+msgstr "Descrição do módulo"
-#: courses/templates/module/update.html:10
-msgid "Edit Module"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:277
+msgid "Proposal Activity"
+msgstr "Atividade proposta"
-#: courses/views.py:48
-msgid "Course created successfully!"
-msgstr ""
+#: courses/templates/subject/form_view_teacher.html:285
+#, fuzzy
+#| msgid "Description"
+msgid "Describe"
+msgstr "Descrição"
+
+#: courses/templates/subject/form_view_teacher.html:291
+msgid "Opening"
+msgstr "Abertura"
+
+#: courses/templates/subject/form_view_teacher.html:297
+msgid "Ending"
+msgstr "Final"
+
+#: courses/templates/subject/form_view_teacher.html:306
+msgid "Send Later"
+msgstr "Enviar depois"
+
+#: courses/templates/subject/form_view_teacher.html:344
+msgid "Forum"
+msgstr "Fórum"
+
+#: courses/templates/subject/index.html:11
+#, fuzzy
+#| msgid "Manage Courses"
+msgid "Manage Subjects"
+msgstr "Gerenciar cursos"
+
+#: courses/templates/subject/index.html:85
+msgid "Beginning"
+msgstr "Início"
-#: courses/views.py:70
-msgid "Course edited successfully!"
+#: courses/templates/subject/index.html:105
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create Topic"
+msgstr "Criar curso"
+
+#: courses/templates/subject/poll_item_actions.html:9
+#: courses/templates/subject/poll_item_actions.html:11
+msgid "poll"
+msgstr "Enquete"
+
+#: courses/templates/subject_category/index.html:34
+#, fuzzy
+#| msgid "Create Category"
+msgid "Create Subject Category"
+msgstr "Criar Categoria"
+
+#: courses/templates/subject_category/index.html:48
+msgid "edit"
+msgstr "Editar"
+
+#: courses/templates/subject_category/index.html:54
+msgid "delete"
+msgstr "Deletar"
+
+#: courses/templates/topic/index.html:12
+#, fuzzy
+#| msgid "Manage Categories"
+msgid "Manage Topic"
+msgstr "Gerenciar categorias"
+
+#: courses/templates/topic/index.html:41
+msgid "Participants"
+msgstr "Participantes"
+
+#: courses/templates/topic/index.html:42
+#, fuzzy
+#| msgid "Duplicate Course"
+msgid "Replicate subject"
+msgstr "Duplicar curso"
+
+#: courses/templates/topic/index.html:43
+#, fuzzy
+#| msgid "Create Course"
+msgid "Create subject"
+msgstr "Criar curso"
+
+#: courses/templates/topic/index.html:44
+#, fuzzy
+#| msgid "Edit Course"
+msgid "Edit subject"
+msgstr "Editar curso"
+
+#: courses/templates/topic/index.html:45
+msgid "Remove subject"
+msgstr "Remover assunto"
+
+#: courses/templates/topic/index.html:112
+msgid "Atividade.doc"
 msgstr ""
-#: courses/views.py:92
+#: courses/templates/topic/index.html:117
+msgid "Grade"
+msgstr "Nota"
+
+#: courses/templates/topic/index.html:127
+msgid "Send"
+msgstr "Enviar"
+
+#: courses/templates/topic/index.html:150
+#, fuzzy
+#| msgid "No categories found"
+msgid "No activity found"
+msgstr "Nenhuma categoria encontrada"
+
+#: courses/views.py:265
 msgid "Course deleted successfully!"
-msgstr ""
+msgstr "Curso deletado com sucesso!"
+
+#: courses/views.py:276
+msgid "Successfully subscribed to the course!"
+msgstr "Inscrição no curso realizada com sucesso!"
+
+#: courses/views.py:278
+msgid ""
+"An error has occured. Could not subscribe to this course, try again later"
+msgstr "Ocorreu um erro. Não pôde inscrever no curso, tente novamente"
-#: courses/views.py:142
+#: courses/views.py:336
 msgid "Category created successfully!"
-msgstr ""
+msgstr "Categoria criada com sucesso!"
-#: courses/views.py:164
-msgid "Category edited successfully!"
-msgstr ""
+#: courses/views.py:349
+#, fuzzy
+#| msgid "Category edited successfully!"
+msgid "Category updated successfully!"
+msgstr "Categoria editada com sucesso!"
-#: courses/views.py:185
+#: courses/views.py:374
 msgid "Category deleted successfully!"
-msgstr ""
+msgstr "Categoria deletada com sucesso!"
-#: courses/views.py:237
-msgid "Module created successfully!"
-msgstr ""
+#: courses/views.py:633
+msgid "Successfully subscribed to the subject!"
+msgstr "Inscrição no assunto realizada com sucesso!"
-#: courses/views.py:268
-msgid "Module edited successfully!"
-msgstr ""
+#: courses/views.py:635
+msgid ""
+"An error has occured. Could not subscribe to this subject, try again later"
+msgstr "Ocorreu um erro. Não pôde inscrever no assunto, tente novamente"
-#: courses/views.py:291
-msgid "Module deleted successfully!"
-msgstr ""
+#: courses/views.py:637
+msgid "You're not subscribed in the course yet."
+msgstr "Você não está inscrito no curso ainda."
+
+#~ msgid "User"
+#~ msgstr "Usuário"
+
+#~ msgid "Module"
+#~ msgstr "Modulo"
+
+#~ msgid "Modules"
+#~ msgstr "Modulos"
+
+#~ msgid "All fields are required"
+#~ msgstr "Todos os campos são obrigatótios"
+
+#~ msgid "Are you sure you want to delete the category"
+#~ msgstr "Você tem certeza que deseja deletar a categoria"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "students tops"
+#~ msgstr "Melhores estudantes"
+
+#~ msgid "Subscribe Period:"
+#~ msgstr "Inscrever período:"
+
+#~ msgid "Period:"
+#~ msgstr "Período:"
+
+#~ msgid "Manage Modules"
+#~ msgstr "Gerenciar módulos"
+
+#~ msgid "Course Info"
+#~ msgstr "Informações do curso"
+
+#~ msgid "Course avaliations"
+#~ msgstr "Avaliações do curso"
+
+#~ msgid "Objectives:"
+#~ msgstr "Objetivos:"
+
+#~ msgid "Work Plan:"
+#~ msgstr "Plano de trabalho:"
+
+#~ msgid "Are you sure you want to delete the module"
+#~ msgstr "Você tem certeza que deseja deletar o módulo"
+
+#~ msgid "students maximum"
+#~ msgstr "Capacidade de estudantes"
+
+#~ msgid "Invisible"
+#~ msgstr "Invisível"
+
+#~ msgid "No modules found"
+#~ msgstr "Nenhum módulo encontrado"
+
+#~ msgid "Edit Module"
+#~ msgstr "Editar módulo"
+
+#~ msgid "Course created successfully!"
+#~ msgstr "Curso criado com sucesso!"
+
+#~ msgid "Course edited successfully!"
+#~ msgstr "Curso editado com sucesso!"
+
+#~ msgid "Module created successfully!"
+#~ msgstr "Módulo criado com sucesso!"
+
+#~ msgid "Module edited successfully!"
+#~ msgstr "Módulo editado com sucesso!"
+
+#~ msgid "Module deleted successfully!"
+#~ msgstr "Módulo deletado com sucesso!"
@@ -29,10 +29,10 @@
         </div>
         <div class="panel-collapse collapseOne-{{course.slug}} collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
           <div class="panel-body">
-            <p><b>Course Name: </b>{{course.name}}</p>
-            <p><b>Coordinator: </b>{{course.professors.all.0}}</p>
+            <p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
+            <p><b>{% trans 'Coordinator' %}: </b>{{course.professors.all.0}}</p>
             <p>
-              <b>Description:</b>
+              <b>{% trans 'Description' %}:</b>
               <i>
                 {{course.content}}
               </i>
@@ -13,7 +13,7 @@
 {% block sidebar %}
     <div class="panel panel-primary">
         <div class="panel-heading">
-            <h4>Menu</h4>
+            <h4>{% trans 'Menu' %}</h4>
         </div>
         <div class="panel-body">
             <ul class="nav nav-pills nav-stacked">
@@ -45,12 +45,12 @@
         {% if user|has_role:'professor' or user|has_role:'system_admin' %}
         <div class="panel panel-primary">
             <div class="panel-heading">
-                <h3 class="panel-title">Category</h3>
+                <h3 class="panel-title">{% trans 'Category' %}</h3>
             </div>
             <div class="panel-body">
                 <ul class="nav nav-pills nav-stacked">
-                    <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-                    <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
+                    <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
+                    <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
                 </ul>
             </div>
         </div>
@@ -19,7 +19,7 @@
 {% endblock %}
 {% block sidebar %}
-  <div class="panel panel-primary">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h5>{% trans 'Menu' %}</h5>
         </div>
@@ -33,7 +33,19 @@
         </div>
     </div>
-
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h5>{% trans 'Categories' %}</h5>
+        </div>
+        <div class="panel-body">
+            <ul class="nav nav-pills nav-stacked">
+                <li {% if category is None %}class="active"{% endif %}><a href="{% url 'course:view' course.slug %}">{% trans 'All' %}</a></li>
+                {% for cat in categorys_subjects %}
+                    <li {% if category == cat.slug %}class="active"{% endif %}><a href="{% url 'course:view_filter' course.slug cat.slug %}">{{ cat }}</a></li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
 {% endblock %}
 {% block content %}
@@ -63,12 +75,13 @@
       </div>
     </div>
     <div class="panel-body">
-      <p><b>Course Name: </b>{{course.name}}</p>
-      <p><b>Coordinator: </b>{{course.professors}}</p>
+      <p><b>{% trans 'Course Name' %}: </b>{{ course.name }}</p>
+      <p><b>{% trans 'Coordinator' %}: </b>{% for professor in course.professors.all %}{% if not forloop.first %},{% endif %}
+              {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
       <p>
-        <b>Description:</b>
+        <b>{% trans 'Description' %}:</b>
         <i>
-          {{course.description}}
+          {{ course.objectivies }}
         </i>
       </p>
@@ -122,8 +135,7 @@
 </div>
 </div>
 <div class="cards-detail">
-    {% if request.GET.category == 'all' or none or request.GET.category == '' %}
-      {% for subject in subjects %}
+    {% for subject in subjects %}
         <div class="panel panel-default panel_{{ subject.id }}">
           <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle">
             <div class="row">
@@ -142,8 +154,8 @@
                         <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
                       </button>
                       <ul class="dropdown-menu" aria-labelledby="moreActions">
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Replicate' %}</a></li>
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Remove' %}</a></li>
                       </ul>
                     </div>
                   </div>
@@ -161,6 +173,9 @@
             <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
               {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
               <p>
+                <b>{% trans 'Category' %}: </b><i>{{ subject.category }}</i>
+              </p>
+              <p>
                 <b>{% trans "Description" %}: </b>
                 <i>
                   {{subject.description}}
@@ -177,65 +192,8 @@
           </div>
          </div>
         </div>
-      {% endfor %}
-  {% else %}
-        {% for subject in subjects_category %}
-            {% if subject.category.name == request.GET.category %}
-              <div class="panel panel-info panel_{{ subject.id }}">
-               <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle" role="tab">
-                <div class="row">
-                 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}">
-                  <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
-                 </div>
-                 <div class="col-xs-9 col-md-4 titleTopic">
-                   <a role="button" href="{% url 'course:view_subject' subject.slug %}">
-                    <h4>{{subject.name}}</h4>
-                   </a>
-                 </div>
-                {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
-                  <div class="col-xs-3 col-md-6" id="divMoreActions">
-                    <div class="btn-group">
-                      <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-                      </button>
-                      <ul class="dropdown-menu" aria-labelledby="moreActions">
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
-                      </ul>
-                    </div>
-                  </div>
-                {% endif %}
-                {% if user|show_subject_subscribe:subject %}
-                  <div class="col-xs-3 col-md-2">
-                    <a onclick="subscribe($(this), '{% url 'course:subscribe_subject' subject.slug %}', {{ subject.id }}, '{% trans 'Are you sure you want to subscribe to this subject?' %}')" class="btn btn-sm btn-primary btn-raised">{% trans 'Subscribe' %}</a>
-                  </div>
-                {% endif %}
-            </div>
-          </div>
-          <div class="panel-collapse collapseSubject-{{subject.slug}} collapse in" aria-labelledby="heading_{{subject.id}}" aria-expanded="true" aria-hidden="false">
-           <div class="panel-body">
-              <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
-                {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
-                <p>
-                  <b>{% trans "Description" %}: </b>
-                  <i>
-                    {{subject.description}}
-                  </i>
-                </p>
-                <div class="row">
-                  <div class="col-xs-6 col-md-6">
-                    <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
-                  </div>
-                  <div class="col-xs-6 col-md-6">
-                    <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
-                  </div>
-                </div>
-            </div>
-           </div>
-        </div>
-            {% endif %}
-        {% endfor %}
-  {% endif %}
+    {% endfor %}
+  
 {% if  user|has_role:'professor' and user in course.professors.all or user|has_role:'system_admin' %}
     {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
+
     {% block javascript %}
         <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
         <script src="{% static 'js/file.js' %}"></script>
@@ -15,7 +16,7 @@
           <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
         </div>
         <div class="col-xs-9 col-md-9 titleTopic">
-          <a role="button">
+          <a href="{% url 'course:view_topic' topic.slug %}" role="button">
             <h4>{{topic}}</h4>
           </a>
         </div>
@@ -29,30 +30,7 @@
               {{topic.description|linebreaks}}
             </i>
           </p>
-          <div class="row">
-            <div class="col-xs-6 col-md-6">
-              <div class="resource_inline">
-                <h4>Material</h4>
-              </div>
-              <ul id="list-materials">
-                  {% list_topic_file request topic %}
-                  {% list_topic_link request topic%}
-
-              </ul>
-            </div>
-            <div class="col-xs-4 col-md-4">
-              <div class="resource_inline">
-                <h4>Activities</h4>
-              </div>
-              <ul>
-
-                  <div class="foruns_list">
-                      {% list_topic_foruns request topic %}
-                  </div>
-              </ul>
-            </div>
-            {% list_topic_poll request topic %}
-          </div>
+          
         </div>
       </div>
     </div>
@@ -91,7 +91,7 @@
               </div>
               <div class="col-xs-4 col-md-4">
                 <div class="resource_inline">
-                  <h4>Activities</h4>
+                  <h4>{% trans 'Activities' %}</h4>
                 </div>
                 <div class="resource_inline">
                   <div class="dropdown">
@@ -106,31 +106,32 @@
                 <ul>
                     <div class="foruns_list">
+                        {% list_topic_poll request topic %}
                         {% list_topic_foruns request topic %}
                     </div>
                 </ul>
               </div>
-              {% list_topic_poll request topic %}
+             
             </div>
             <div class="editation" style="display: none">
               <div class="form-group">
-                <label class="control-label" for="focusedInput2">Name Topic</label>
+                <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
                 <input type="text" class="form-control" value="Topic 1">
               </div>
               <div class="form-group is-empty">
-                <label class="control-label" for="focusedInput2">Description</label>
+                <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
                 <textarea class="form-control" rows="3" id="textArea"></textarea>
               </div>
               <div class="row">
                 <div class=" col-xs-6 col-md-4">
                   <div class="resource_inline">
-                    <h4>Material</h4>
+                    <h4>{% trans 'Material' %}</h4>
                   </div>
                   <div class="resource_inline">
                     <div class="dropdown">
                       <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                       <ul class="dropdown-menu" aria-labelledby="dLabel">
-                        <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
+                        <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">{% trans 'Create a Link' %}</a></li>
                         <li>
                           <a href="#">
                               {% trans "Create a file" %}
@@ -150,13 +151,13 @@
                 </div>
                 <div class="col-xs-4 col-md-offset-1 col-md-4">
                   <div class="resource_inline">
-                    <h4>Activities</h4>
+                    <h4>{% trans 'Activities' %}</h4>
                   </div>
                   <div class="resource_inline">
                     <div class="dropdown">
                       <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                       <ul class="dropdown-menu" aria-labelledby="dLabel">
-                        <li>Qualquer coisa</li>
+                        <li>{% trans 'Anything' %}</li>
                       </ul>
                     </div>
                   </div>
@@ -170,8 +171,8 @@
               </div>
               <div class="form-group">
                 <div class="col-md-10">
-                  <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>
-                  <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button>
+                  <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
+                  <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
                 </div>
               </div>
             </div>
@@ -236,13 +237,13 @@
                 </div>
               </div>
               <div class="form-group is-empty">
-              <label for="number" class="col-md-2 control-label">{% trans 'Height' %}</label>
+              <label for="number" class="col-md-2 control-label">Height</label>
                 <div class="col-md-4">
                   <input type="number" class="form-control" id="inputNumber" placeholder="Heiht">
                 </div>
               </div>
               <div class="form-group is-empty">
-              <label for="number" class="col-md-2 control-label">{% trans 'Weight' %}</label>
+              <label for="number" class="col-md-2 control-label">Weight</label>
                 <div class="col-md-4">
                   <input type="number" class="form-control" id="inputNumber" placeholder="Weight">
                 </div>
@@ -274,7 +275,7 @@
             <form class="form-horizontal">
           <fieldset>
-            <legend>{% trans 'Atividade Proposta' %}</legend>
+            <legend>{% trans 'Proposal Activity' %}</legend>
             <div class="form-group is-empty">
               <label for="NameIn" class="col-md-2 control-label">{% trans 'Name' %}:</label>
               <div class="col-md-10">
@@ -18,7 +18,7 @@
 {% block sidebar %}
 <div class="panel panel-primary">
     <div class="panel-heading">
-        <h4>Menu</h4>
+        <h4>{% trans 'Menu' %}</h4>
     </div>
     <div class="panel-body">
         <ul class="nav nav-pills nav-stacked">
@@ -2,6 +2,15 @@
 {% load static i18n permission_tags professor_access %}
+
+{% block javascript %}
+        <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+        <script src="{% static 'js/file.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
+        <script type = "text/javascript" src="{% static 'links.js' %}"></script>
+{% endblock %}
+
+
 {% block breadcrumbs %}
 	<ol class="breadcrumb">
@@ -31,22 +40,7 @@
         </div>
     </div>
-    {% if user|has_role:'professor' %}
-      <div class="panel panel-primary ">
-      <div class="panel-heading">
-          <h3 class="panel-title">{% trans 'Actions' %}</h3>
-      </div>
-      <div class="panel-body">
-          <ul class="nav nav-pills nav-stacked">
-              <li><a href="javascript:void(0)">{% trans 'Participants' %}</a></li>
-              <li><a href="javascript:void(0)">{% trans 'Replicate subject' %}</a></li>
-              <li><a href="javascript:void(0)">{% trans 'Create subject' %}</a></li>
-              <li><a href="javascript:void(0)">{% trans 'Edit subject' %}</a></li>
-              <li><a href="javascript:void(0)">{% trans 'Remove subject' %}</a></li>
-          </ul>
-      </div>
-    </div>
-    {% endif %}
+   
 {% endblock %}
@@ -56,7 +50,7 @@
     <div class="panel-heading">
 			<div class="row">
 	      <div class="col-md-10 col-sm-7">
-	        <h3>{{subject}}</h3>
+	        <h3> {{topic.name}} </h3>
 	      </div>
 	      <div class="col-xs-4 col-md-2 divMoreActions">
 					{% professor_subject subject user as permissions%}
@@ -66,9 +60,15 @@
                 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
               </button>
               <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-                <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
-                <li><a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
-                <li><a href="{% url 'course:delete_subject' subject.slug %}" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+                <li>
+                    <a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a>
+                </li>
+                <li>
+                    <a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a>
+                </li>
+                <li>
+                    <a href="{% url 'course:delete_subject' subject.slug %}" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a>
+                </li>
               </ul>
             </div>
           {% endif %}
@@ -77,25 +77,22 @@
     </div>
     <div class="panel-body">
       <p>
-        {{subject.description|linebreaks}}
+        {{topic.description|linebreaks}}
       </p>
     </div>
   </div>
   <div class="panel panel-default">
     <div class="panel-body">
-    {% for activit in activitys %}
+        {% include "topic/topic_card_student.html" %}
+        {% comment %}
+          
+        
+    <!--{% for activit in activitys %}
       <form class="form-horizontal" enctype='multipart/form-data'>{% csrf_token %}
         <fieldset>
           <legend>{{activit.name}}</legend>
-          <div class="container-fluid">
-            <div class="row">
-              <div class="col-md-8">
-              <div class="form-group is-empty">
-                <input type="text" class="form-control col-md-4" placeholder="Search Student">
-              </div>
-            </div>
-            </div>
+         
           {% for student in students_activit %}
             <div class="panel-group" id="accordion">
               <div class="panel panel-info">
@@ -114,17 +111,17 @@
 										 {% professor_subject subject user as permi_test%}
                      {% if permi_test %}
                         <div class="col-md-4">
-                          <label> {% trans 'Nota' %}:</label>
+                          <label> {% trans 'Grade' %}:</label>
                           <input type="number" step="0.01">
                         </div>
                       {% else %}
                       <div class="col-md-4">
-                        <!--<input type="hidden" name="id" value="">
-                        <input type="hidden" name="student" value="">-->
+                        <input type="hidden" name="id" value="">
+                        <input type="hidden" name="student" value="">
                         <div class="form-group {% if form.pdf.errors %} has-error {% endif %}">
                             {{ form.as_p }}
                         </div>
-                        <button type="submit" class="btn btn-success" id="send_button">{% trans 'Enviar' %}</button>
+                        <button type="submit" class="btn btn-success" id="send_button">{% trans 'Send' %}</button>
                       </div>
                      {% endif %}
                   </div>
@@ -135,26 +132,15 @@
           {% endfor %}
         </div>
     </fieldset>
-  </form>
+  </form>-->
+{% endcomment %}
+ 
-  <ul class="pagination pagination-sm">
-  <li class="disabled"><a href="javascript:void(0)">«</a></li>
-  <li class="active"><a href="javascript:void(0)">1</a></li>
-  <li><a href="javascript:void(0)">2</a></li>
-  <li><a href="javascript:void(0)">3</a></li>
-  <li><a href="javascript:void(0)">4</a></li>
-  <li><a href="javascript:void(0)">5</a></li>
-  <li><a href="javascript:void(0)">»</a></li>
-</ul>
-{% empty %}
-  {% trans 'No activity found' %}
-{% endfor %}
-
-</div>
+      </div>
-</div>
+    </div>
 </div>
 {% endblock %}
@@ -0,0 +1,28 @@
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
+
+
+<div class="row">
+  <div class="col-xs-6 col-md-6">
+    <div class="resource_inline">
+      <h4>{% trans "Materials" %}</h4>
+    </div>
+    
+    <ul id="list-materials">
+        {% list_topic_file request topic %}
+        {% list_topic_link request topic%}
+      
+    </ul>
+  </div>
+  <div class="col-xs-4 col-md-4">
+    <div class="resource_inline">
+      <h4>{% trans "Activities" %}</h4>
+    </div>
+    <ul>
+        <div class="foruns_list">
+            {% list_topic_poll request topic %}
+            {% list_topic_foruns request topic %}
+        </div>
+    </ul>
+  </div>
+ 
+</div>
 \ No newline at end of file
@@ -6,7 +6,10 @@ urlpatterns = [
 	url(r'^create/$', views.CreateCourseView.as_view(), name='create'),
 	url(r'^replicate_course/(?P<slug>[\w_-]+)/$', views.ReplicateCourseView.as_view(), name='replicate_course'),
 	url(r'^edit/(?P<slug>[\w_-]+)/$', views.UpdateCourseView.as_view(), name='update'),
-	url(r'^(?P<slug>[\w_-]+)/$', views.CourseView.as_view(), name='view'),
+	url(r'^(?P<slug>[\w_-]+)/', include([
+		url(r'^$', views.CourseView.as_view(), name='view'),
+		url(r'^(?P<category>[\w_-]+)/$', views.CourseView.as_view(), name='view_filter')
+	])),
 	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteCourseView.as_view(), name='delete'),
 	url(r'^subscribe/(?P<slug>[\w_-]+)/$', views.subscribe_course, name='subscribe'),
 	url(r'^category/(?P<slug>[\w_-]+)/$', views.FilteredView.as_view(), name='filter'),
@@ -18,7 +18,7 @@ from core.mixins import NotificationMixin
 from users.models import User
 from files.forms import FileForm
 from files.models import TopicFile
-
+from courses.models import Material
 from django.urls import reverse
 from datetime import date
@@ -211,12 +211,19 @@ class CourseView( NotificationMixin, generic.DetailView):
 		context = super(CourseView, self).get_context_data(**kwargs)
 		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
+		category_sub = self.kwargs.get('category', None)
+
 		if has_role(self.request.user,'system_admin'):
 			subjects = course.subjects.all()
 		elif has_role(self.request.user,'professor'):
 			subjects = course.subjects.filter(professors__in=[self.request.user])
 		elif has_role(self.request.user, 'student') or self.request.user is None:
 			subjects = course.subjects.filter(visible=True)
+
+		if not category_sub is None:
+			cat = get_object_or_404(CategorySubject, slug = category_sub)
+			subjects = subjects.filter(category = cat)
+				
 		context['subjects'] = subjects
 		if has_role(self.request.user,'system_admin'):
@@ -238,13 +245,7 @@ class CourseView( NotificationMixin, generic.DetailView):
 		subjects_category = Subject.objects.filter(category__name = self.request.GET.get('category'))
-		none = None
-		q = self.request.GET.get('category', None)
-		if q is  None:
-			none = True
-		context['none'] = none
-
-		context['subjects_category'] = subjects_category
+		context['category'] = category_sub
 		context['categorys_subjects'] = categorys_subjects
 		context['courses'] = courses
 		context['course'] = course
@@ -457,11 +458,13 @@ class TopicsView(LoginRequiredMixin, generic.ListView):
 		context = super(TopicsView, self).get_context_data(**kwargs)
 		activitys = Activity.objects.filter(topic__name = topic.name)
 		students_activit = User.objects.filter(activities__in = Activity.objects.all())
-		
+		materials = Material.objects.filter(topic = topic)
+		print(materials)
 		context['topic'] = topic
 		context['subject'] = topic.subject
 		context['activitys'] = activitys
 		context['students_activit'] = students_activit
+		context['materials'] = materials
 		context['form'] = ActivityForm
 		return context
@@ -0,0 +1,167 @@
+# 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: 2016-10-26 14:47-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"
+
+#: exam/forms.py:18 exam/forms.py:22
+msgid "It is required one these fields."
+msgstr ""
+
+#: exam/forms.py:33
+msgid "Start date to resolve the exam"
+msgstr ""
+
+#: exam/forms.py:35
+msgid "Maximum date permited to resolve the exam"
+msgstr ""
+
+#: exam/models.py:9
+msgid "Begin of Course Date"
+msgstr ""
+
+#: exam/models.py:10
+msgid "Exibe?"
+msgstr ""
+
+#: exam/models.py:13 exam/models.py:35
+msgid "Exam"
+msgstr ""
+
+#: exam/models.py:14
+msgid "Exams"
+msgstr ""
+
+#: exam/models.py:21 exam/models.py:27
+msgid "Answer"
+msgstr ""
+
+#: exam/models.py:22
+msgid "Order"
+msgstr ""
+
+#: exam/models.py:23 exam/models.py:28
+msgid "Answers"
+msgstr ""
+
+#: exam/models.py:34
+msgid "Answered"
+msgstr ""
+
+#: exam/models.py:36
+msgid "Answers Students"
+msgstr ""
+
+#: exam/models.py:37
+msgid "Student"
+msgstr ""
+
+#: exam/models.py:38
+msgid "Answered Date"
+msgstr ""
+
+#: exam/models.py:41
+msgid "Answer Stundent"
+msgstr ""
+
+#: exam/models.py:42
+msgid "Answers Student"
+msgstr ""
+
+#: exam/templates/exam/create.html:9
+msgid "New Exam"
+msgstr ""
+
+#: exam/templates/exam/create.html:14 exam/templates/exam/create.html:16
+msgid "Exam Name"
+msgstr ""
+
+#: exam/templates/exam/create.html:20
+msgid "Exam's begin date"
+msgstr ""
+
+#: exam/templates/exam/create.html:22
+msgid "Begin Date"
+msgstr ""
+
+#: exam/templates/exam/create.html:26
+msgid "Exam's end date"
+msgstr ""
+
+#: exam/templates/exam/create.html:28
+msgid "End Date"
+msgstr ""
+
+#: exam/templates/exam/create.html:35
+msgid "Allow submissions after deadline?"
+msgstr ""
+
+#: exam/templates/exam/create.html:44 exam/templates/exam/create.html:47
+msgid "Question Type"
+msgstr ""
+
+#: exam/templates/exam/create.html:48
+msgid "Multiple Choice"
+msgstr ""
+
+#: exam/templates/exam/create.html:49
+msgid "True or False"
+msgstr ""
+
+#: exam/templates/exam/create.html:50
+msgid "Gap Filling"
+msgstr ""
+
+#: exam/templates/exam/create.html:51
+msgid "Discursive Question"
+msgstr ""
+
+#: exam/templates/exam/create.html:57
+msgid "add question"
+msgstr ""
+
+#: exam/templates/exam/create.html:62
+msgid "Create"
+msgstr ""
+
+#: exam/templates/exam/discursive_question.html:2
+#: exam/templates/exam/discursive_question.html:4
+#: exam/templates/exam/multiple_choice_question.html:5
+#: exam/templates/exam/true_or_false_question.html:20
+#: exam/templates/exam/true_or_false_question.html:25
+msgid "Question"
+msgstr ""
+
+#: exam/templates/exam/gap_filling_question.html:2
+msgid "Gap Filling Question"
+msgstr ""
+
+#: exam/templates/exam/multiple_choice_question.html:15
+msgid "Alternatives"
+msgstr ""
+
+#: exam/templates/exam/true_or_false_answer.html:9
+msgid "Write your alternative"
+msgstr ""
+
+#: exam/templates/exam/true_or_false_question.html:37
+msgid "Alternatives: T/F"
+msgstr ""
+
+#: exam/templates/exam/true_or_false_question.html:45
+msgid "New Alternative"
+msgstr ""
@@ -74,9 +74,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     XXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXX
   XXX
 XXX
-
 XXX XXXXXXXXXXXXXXXX X XX
-
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X
   XXXXXXXXX X
@@ -85,12 +83,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXXXXXXXXX X
   XXXXXXXXX
   XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
   XXXXXXXXXXXXXXXXXXX
 XXX
-
 XXX XXXXXXXXXXXXXXXXXX X XX
-
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X
   XXXXXXXXX X
@@ -104,10 +99,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
   XXXXXXXXXX X
   XXXXXXXXX
   XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
   XXXXXXXXXXXXXXXXXXXXX
 XXX
-
 XXXXXXXXXXXX X
   XX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
 XXX
 XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX
-  XXXXXX XXXXXXX XXXXXXXXXXXX
+  XXX gettext(u'Gap Filling Question') XXXX
 XXXXXX
+{% load i18n %}
+
 <div class="form-group" id="multipleChoice">
   <label for="questionName" class="col-md-2 control-label">{% trans 'Question' %}</label>
+BBBB BBBB
+
 XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-  XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
   XXXX XXXXXXXXXXXXXXXXXX
@@ -10,7 +12,7 @@ XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
 XXXXXX
 XXXX XXXXXXXXXXXXXXXXXXX
-  XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Alternatives') XXXXXXXX
   XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXX
     XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX
       XXXXXXX
@@ -29,7 +31,7 @@ XXXXXX
 XXXX XXX XXXXXXXXXXX XXXXXX XXX
 XXXX XXXXXXXXXXXXXXXXXXX
   XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
+  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXX XXXX XXXXXXXXXXXX XXXXXXXXXXX
   XXXXXX
 XXXXXX
 XXXX XXXXXXXXXXXXXXXXXXX
@@ -0,0 +1,88 @@
+# 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: 2016-10-26 14:47-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"
+
+#: files/forms.py:12 files/forms.py:29
+msgid "File too large (Max 10MB)"
+msgstr ""
+
+#: files/models.py:20
+msgid "Professors"
+msgstr ""
+
+#: files/models.py:21
+msgid "Description"
+msgstr ""
+
+#: files/models.py:22 files/models.py:27
+msgid "File"
+msgstr ""
+
+#: files/models.py:23
+msgid "Type file"
+msgstr ""
+
+#: files/models.py:28
+msgid "Files"
+msgstr ""
+
+#: files/templates/files/create_file.html:10
+msgid "Add File"
+msgstr ""
+
+#: files/templates/files/create_file.html:38
+#: files/templates/files/update_file.html:40
+msgid "Choose your file..."
+msgstr ""
+
+#: files/templates/files/create_file.html:68
+#: files/templates/files/update_file.html:73
+msgid "The file size shouldnt exceed 10MB"
+msgstr ""
+
+#: files/templates/files/create_file.html:74
+#: files/templates/files/delete_file.html:34
+#: files/templates/files/update_file.html:79
+msgid "Close"
+msgstr ""
+
+#: files/templates/files/create_file.html:75
+#: files/templates/files/update_file.html:80
+msgid "Submit"
+msgstr ""
+
+#: files/templates/files/delete_file.html:12
+msgid "Delete File"
+msgstr ""
+
+#: files/templates/files/delete_file.html:30
+msgid "Are you sure to delete "
+msgstr ""
+
+#: files/templates/files/delete_file.html:35
+msgid "Delete"
+msgstr ""
+
+#: files/templates/files/update_file.html:12
+msgid "Edit File"
+msgstr ""
+
+#: files/templates/files/update_file.html:48
+msgid "See current file"
+msgstr ""
@@ -65,14 +65,14 @@ XXXX XXXXXXXXXXXXX
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                                    XXXXXXXXX XXXX XXXX XXXXXXXXX XXXXXX XXXXXXXXXXXX
+                                    XXXXXX gettext(u'The file size shouldnt exceed 10MB') XXXXXXXX
                                 XXXXXX
                             XXXXXX
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXXXX
                                      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX
-                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Submit') XXXXXXXXX
                                 XXXXXX
                             XXXXXX
                         XXXXXXXXXXX
@@ -32,7 +32,7 @@ XXXX XXXXXXXXXXXXXXXXXXXX
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXXXX
                                      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX
-                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Delete') XXXXXXXXX
                                 XXXXXX
                             XXXXXX
                         XXXXXXXXXXX
@@ -70,14 +70,14 @@ XXXX XXXXXXXXXXXXXXXXXXXX
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                                    XXXXXXXXX XXXX XXXX XXXXXXXXX XXXXXX XXXXXXXXXXXX
+                                    XXXXXX gettext(u'The file size shouldnt exceed 10MB') XXXXXXXX
                                 XXXXXX
                             XXXXXX
                             XXXX XXXXXXXXXXXXXXXXXXX
                                 XXXX XXXXXXXXXXXXXXXXXX
                                      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX
-                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Submit') XXXXXXXXX
                                 XXXXXX
                             XXXXXX
                         XXXXXXXXXXX
@@ -0,0 +1,250 @@
+# 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: 2016-10-26 14:47-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"
+
+#: forum/forms.py:11
+msgid "Title"
+msgstr ""
+
+#: forum/forms.py:12 forum/models.py:14
+#: forum/templates/forum/forum_list.html:23
+#: forum/templates/forum/forum_view.html:58
+#: forum/templates/forum/render_forum.html:4
+msgid "Description"
+msgstr ""
+
+#: forum/forms.py:13
+msgid "Limit Date"
+msgstr ""
+
+#: forum/forms.py:16
+msgid "Forum title"
+msgstr ""
+
+#: forum/forms.py:17
+msgid "What is this forum about?"
+msgstr ""
+
+#: forum/forms.py:18
+msgid "Limit date for students post on this forum"
+msgstr ""
+
+#: forum/forms.py:33 forum/forms.py:46
+msgid "Message"
+msgstr ""
+
+#: forum/models.py:15 forum/models.py:33 forum/models.py:61
+msgid "Modification Date"
+msgstr ""
+
+#: forum/models.py:16
+msgid "Create Date"
+msgstr ""
+
+#: forum/models.py:19 forum/models.py:35
+#: forum/templates/forum/forum_view.html:16
+#: forum/templates/forum/forum_view.html:116
+msgid "Forum"
+msgstr ""
+
+#: forum/models.py:20
+msgid "Foruns"
+msgstr ""
+
+#: forum/models.py:31 forum/models.py:58
+msgid "Autor"
+msgstr ""
+
+#: forum/models.py:32
+msgid "Post message"
+msgstr ""
+
+#: forum/models.py:34
+msgid "Post Date"
+msgstr ""
+
+#: forum/models.py:38 forum/models.py:59
+msgid "Post"
+msgstr ""
+
+#: forum/models.py:39
+msgid "Posts"
+msgstr ""
+
+#: forum/models.py:60
+msgid "Answer message"
+msgstr ""
+
+#: forum/models.py:62
+msgid "Answer Date"
+msgstr ""
+
+#: forum/models.py:65
+msgid "Post Answer"
+msgstr ""
+
+#: forum/models.py:66
+msgid "Post Answers"
+msgstr ""
+
+#: forum/templates/forum/forum_list.html:16
+#: forum/templates/forum/forum_view.html:44
+#: forum/templates/post/post_list.html:20
+#: forum/templates/post/post_load_more_render.html:20
+#: forum/templates/post/post_render.html:18
+#: forum/templates/post_answers/post_answer_list.html:17
+#: forum/templates/post_answers/post_answer_load_more_render.html:17
+#: forum/templates/post_answers/post_answer_render.html:15
+msgid "Edit"
+msgstr ""
+
+#: forum/templates/forum/forum_list.html:17
+#: forum/templates/forum/forum_view.html:45
+msgid "Are you sure you want to delete this forum?"
+msgstr ""
+
+#: forum/templates/forum/forum_list.html:17
+#: forum/templates/forum/forum_view.html:45
+msgid "Delete"
+msgstr ""
+
+#: forum/templates/forum/forum_list.html:24
+#: forum/templates/forum/forum_view.html:59
+#: forum/templates/forum/render_forum.html:5
+msgid "Opened in"
+msgstr ""
+
+#: forum/templates/forum/forum_list.html:59
+#: forum/templates/forum/forum_view.html:91
+#: forum/templates/post_answers/post_answer_form.html:38
+msgid "send"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:13
+msgid "Home"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:27
+msgid "Menu"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:31
+msgid "Profile"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:32
+msgid "My Courses"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:40
+msgid "Actions"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:44
+msgid "Forum edited successfully!"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:124
+msgid "Close"
+msgstr ""
+
+#: forum/templates/forum/forum_view.html:125
+msgid "Update"
+msgstr ""
+
+#: forum/templates/post/post_list.html:11
+#: forum/templates/post/post_load_more_render.html:11
+#: forum/templates/post/post_render.html:9
+msgid "reply"
+msgstr ""
+
+#: forum/templates/post/post_list.html:20
+#: forum/templates/post/post_load_more_render.html:20
+#: forum/templates/post/post_render.html:18
+msgid "Post edited successfully!"
+msgstr ""
+
+#: forum/templates/post/post_list.html:21
+#: forum/templates/post/post_load_more_render.html:21
+#: forum/templates/post/post_render.html:19
+#: forum/templates/post_answers/post_answer_list.html:18
+#: forum/templates/post_answers/post_answer_load_more_render.html:18
+#: forum/templates/post_answers/post_answer_render.html:16
+msgid "Remove"
+msgstr ""
+
+#: forum/templates/post/post_list.html:30
+#: forum/templates/post/post_load_more_render.html:30
+#: forum/templates/post/post_render.html:28
+#: forum/templates/post_answers/post_answer_list.html:26
+#: forum/templates/post_answers/post_answer_load_more_render.html:26
+#: forum/templates/post_answers/post_answer_render.html:24
+msgid "ago"
+msgstr ""
+
+#: forum/templates/post/post_list.html:32
+#: forum/templates/post/post_load_more_render.html:32
+#: forum/templates/post/post_render.html:30
+#: forum/templates/post_answers/post_answer_list.html:28
+#: forum/templates/post_answers/post_answer_load_more_render.html:28
+#: forum/templates/post_answers/post_answer_render.html:26
+msgid "Edited"
+msgstr ""
+
+#: forum/templates/post/post_list.html:54 forum/views.py:196
+msgid "Load more posts"
+msgstr ""
+
+#: forum/templates/post/post_update_form.html:32
+#: forum/templates/post_answers/post_answer_form.html:32
+msgid "Cancel"
+msgstr ""
+
+#: forum/templates/post/post_update_form.html:33
+#: forum/templates/post_answers/post_answer_form.html:33
+msgid "Save changes"
+msgstr ""
+
+#: forum/templates/post_answers/post_answer_list.html:17
+#: forum/templates/post_answers/post_answer_load_more_render.html:17
+#: forum/templates/post_answers/post_answer_render.html:15
+msgid "Answer edited sucessfully!"
+msgstr ""
+
+#: forum/templates/post_answers/post_answer_list.html:18
+#: forum/templates/post_answers/post_answer_load_more_render.html:18
+#: forum/templates/post_answers/post_answer_render.html:16
+msgid "Are you sure you want to delete this answer?"
+msgstr ""
+
+#: forum/templates/post_answers/post_answer_list.html:42 forum/views.py:295
+msgid "Load more answers"
+msgstr ""
+
+#: forum/views.py:130
+msgid "Forum deleted successfully."
+msgstr ""
+
+#: forum/views.py:253
+msgid "Post deleted successfully."
+msgstr ""
+
+#: forum/views.py:365
+msgid "Post answer deleted successfully."
+msgstr ""
@@ -56,7 +56,7 @@ XXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXX
                     BBBBB
                     XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
                         XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXXXXXXX
-                            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'send') XXXX
                         XXXXXXXXX
                     XXXXXXX
                 XXXXXX
@@ -34,7 +34,7 @@ BBBBB BBBBBBB
         XXXXXX
     XXXXXX
-    BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBB BBBBBBBBBBBB BB BBBBBBBBB
+    BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBB BBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
         XXXX XXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXX
             XXXX XXXXXXXXXXXXXXXXXXXXXX
                 XXX XXXXXXXXXXXXXXXXXXXX gettext(u'Actions') XXXXX
@@ -88,7 +88,7 @@ BBBBB BBBBBBB
                                     BBBBB
                                     XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
                                         XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXXXXXXX
-                                            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'send') XXXX
                                         XXXXXXXXX
                                     XXXXXXX
                                 XXXXXX
@@ -8,7 +8,7 @@ BB BBBBBBBBBBBB B B
                     XXXX XXXXXXXXXXXXXXXXXXX
                         XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBXXXXX
-                            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'reply') XXXX
                         XXXX
                         BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBB BB BBBBBBBBB
                             BBBBBBBBBB
@@ -0,0 +1,50 @@
+BBBB BBBB BBBBBBBBBBBBBBB BBBBBBBBBBBBBBBB
+
+BB BBBBBBBBBBBB B B
+    BBB BBBB BB BBBBB
+        XXXX XXXXXXXXXX XXXXXXXX
+            XXXX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
+                XXX XXXXXXXXXXXXXXXXXX
+                    
+                    XXXX XXXXXXXXXXXXXXXXXXX
+                        XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'reply') XXXX
+                        XXXX
+                        BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBB BB BBBBBBBBB
+                            BBBBBBBBBB
+                            XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
+                                XX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
+                                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                XXXX
+                                XXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXX X gettext(u'Post edited successfully!') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Edit') XXXXXXXXX
+                                    XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Remove') XXXXXXXXX
+                                XXXXX
+                            XXXXXX
+                        BBBBB
+                    XXXXXX
+                XXXXX
+                XXXX XXXXXXXXXXXXXXXXXXXXX
+                    XXXX XXXXXXXXXXXXXXXXXX
+                        XX XXXXXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXX XXXXXXXXXXXXXXXX FFFFFFFFF  gettext(u'ago') 
+                            BB BBBBBBBBBBBBBBBB
+                                XXXX X  gettext(u'Edited') XXXXX
+                            BBBBB
+                        XXXX
+                    XXXXXX
+                    XX XXXXXXXXXXXXXXXXXXXXXFFFFFFFFFFXXXX
+                XXXXXX
+                XXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
+                XXXX XXXXXXXXXXXXXXXXXXXX
+                    BBBBBBBBBBBBBBBB BBBBBBB BBBB
+                XXXXXX
+                XXXX XXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXX
+                    XXXXXXXX
+                        XXXXX XXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
+                    XXXXXXXXX
+                XXXXXX
+            XXXXXX
+        XXXXXX
+    BBBBBB
+BBBBB
 \ No newline at end of file
 BBBB BBBB BBBBBBBBBBBBBBB BBBBBBBBBBBBBBBB
-XXXX  XXXXXXXXXXXX
+XXXX XXXXXXXXXX XXXXXXXXXX
     XXXX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
         XXX XXXXXXXXXXXXXXXXXX
             XXXX XXXXXXXXXXXXXXXXXXX
                 XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBXXXXX
-                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                    XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'reply') XXXX
                 XXXX
                 BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBB BBBBBBBBBBBB BB BBBBBBBBB
                     BBBBBBBBBB
@@ -15,7 +15,7 @@ XXXX  XXXXXXXXXXXX
                             XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
                         XXXX
                         XXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                            XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXX X gettext(u'Post edited successfully!') XXXXXXXXX
+                            XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXX X gettext(u'Post edited successfully!') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Edit') XXXXXXXXX
                             XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Remove') XXXXXXXXX
                         XXXXX
                     XXXXXX
@@ -26,7 +26,7 @@ XXXX  XXXXXXXXXXXX
             XXXX XXXXXXXXXXXXXXXXXX
                 XX XXXXXXXXXXXXXXXXXXXXX
                     XX XXXXXXXXX XXXXXXXXXXXXXXXX FFFFFFFFF  gettext(u'ago') 
-                    BB BBBBBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBB
+                    BB BBBBBBBBBBBBBBBB
                         XXXX X  gettext(u'Edited') XXXXX
                     BBBBB
                 XXXX
@@ -35,7 +35,7 @@ XXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXBB BBBBBBBBB BBBBBBBBBBBBBB
 					BBBB
 						XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
 					        XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXXXXXXX
-					            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+					            XX XXXXXXXXXXXXXXXXXXXXXXX gettext(u'send') XXXX
 					        XXXXXXXXX
 					    XXXXXXX
 					BBBBB
@@ -0,0 +1,38 @@
+BBBB BBBB BBBBBBBBBBBBBBB
+
+BB BBBBBBBBBBBBBB B B
+    BBB BBBBBB BB BBBBBBB
+        XXXX XXXXXXXXXXXXXXX
+            XXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
+                XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
+                    XXX XXXXXXXXXXXXXXXXXX
+                        
+                        BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BB BBBBBBBBBBBB BB BBBBBBBBBBB
+                            XXXX XXXXXXXXXXXXXXXXXXX
+                                XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
+                                    XX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
+                                        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                    XXXX
+                                    XXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                                        XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBXX XXX X gettext(u'Answer edited sucessfully!') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Edit') XXXXXXXXX
+                                        XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBXX XXX X gettext(u'Are you sure you want to delete this answer?') XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  gettext(u'Remove') XXXXXXXXX
+                                    XXXXX
+                                XXXXXX
+                            XXXXXX
+                        BBBBB
+                    XXXXX
+                    XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                        XXXX XXXXXXXXXXXXXXXXXX
+                            XX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXX FFFFFFFFF  gettext(u'ago') 
+                                BB BBBBBBBBBBBBBBBBBB
+                                    XXXX X  gettext(u'Edited') XXXXX
+                                BBBBB
+                            XXXX
+                        XXXXXX
+                        XX XXXXXXXXXXXXXXXXXXXXXFFFFFFFFFFXXXX
+                    XXXXXX
+                XXXXXX
+            XXXXXX
+        XXXXXX
+    BBBBBB
+BBBBB
 \ No newline at end of file
 BBBB BBBB BBBBBBBBBBBBBBB
-XXXXX
+XXXX XXXXXXXXXXXXXXXXXXX
     XXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
         XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
             XXX XXXXXXXXXXXXXXXXXX
@@ -0,0 +1,53 @@
+from bs4 import BeautifulSoup
+from urllib.request import urlopen
+import urllib.request
+
+
+def make_soup(url):
+    try:
+        html = urlopen(url).read()
+        return BeautifulSoup(html,"lxml")
+    except urllib.error.HTTPError as e:
+        return "Use default image"
+
+def get_images(url):
+    try:
+        soup = make_soup(url)
+    except:
+        return("Use default image")
+    if soup == None or type(soup) == str:
+        return "Use default image"
+    images = [img for img in soup.findAll('img')]
+    image_links = [each.get('src') for each in images]
+    contador = 0
+    for each in image_links:
+        booleano = False
+        if each != "":
+            if each == None:
+                continue
+            if 'jpg' in each:
+                booleano = True
+                pos = each.index("jpg")
+                each = each[0:pos+3]
+            elif 'png' in each:
+                booleano = True
+                pos = each.index("png")
+                each = each[0:pos+3]
+            elif 'jpeg' in each:
+                booleano = True
+                pos = each.index('jpeg')
+                each = each[0:pos+4]
+            if not booleano:
+                continue
+
+            if each[0] + each[1] == '//' or each[0] == '/':
+                each = 'http:'+each
+            if each[0:4] != 'http' and each[0:5] != 'https':
+                each = url[0:url.index('/',8)] + each
+            contador += 1
+            caminho = ""
+            filename=each.split('/')[-1]
+            try:
+                urllib.request.urlretrieve(each,"%s"%(caminho)+str(contador)+filename)
+            except Exception:
+                continue
@@ -0,0 +1,81 @@
+# 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: 2016-10-26 14:47-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:10
+msgid "Please enter a valid URL"
+msgstr ""
+
+#: links/templates/links/create_link.html:9
+msgid "Create a New Link"
+msgstr ""
+
+#: links/templates/links/create_link.html:34
+#: links/templates/links/delete_link.html:15
+#: links/templates/links/update_link.html:25
+msgid "Cancel"
+msgstr ""
+
+#: links/templates/links/delete_link.html:11
+msgid "Do you really want to delete this link?"
+msgstr ""
+
+#: links/templates/links/delete_link.html:16
+msgid "Confirm"
+msgstr ""
+
+#: links/templates/links/update_link.html:8
+msgid "Links"
+msgstr ""
+
+#: links/templates/links/update_link.html:13
+msgid "Name"
+msgstr ""
+
+#: links/templates/links/update_link.html:17
+msgid "URL"
+msgstr ""
+
+#: links/templates/links/update_link.html:21
+msgid "Descrição"
+msgstr ""
+
+#: links/templates/links/update_link.html:26
+msgid "Submit"
+msgstr ""
+
+#: links/templates/links/view_link.html:8
+msgid "Link"
+msgstr ""
+
+#: links/templates/links/view_link.html:17
+msgid "Read more"
+msgstr ""
+
+#: links/views.py:28
+msgid "Link created successfully!"
+msgstr ""
+
+#: links/views.py:50
+msgid "Link deleted Successfully!"
+msgstr ""
+
+#: links/views.py:69
+msgid "Link updated successfully!"
+msgstr ""
@@ -6,12 +6,22 @@ XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXX
     XXXX XXXXXXXXXXXXXXXXXXXXXX
       XXXX XXXXXXXXXXXXXXXXXXXXX
         XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX X XXX XXXXXXXXX
+        XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX gettext(u'Create a New Link') XXXXX
       XXXXXX
       XXXX XXXXXXXXXXXXXXXXXXX
         XXXX XXXX XXX
         XXXXX XXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
           BBBBBBBBBB
+          BB BBBBBBBB
+              BBB BBBBBBB BB BBBBBBBB
+                  XXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
+                      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX
+                          XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                      XXXXXXXXX
+                      XXXXXXX
+                  XXXXXX
+              BBBBBB
+          BBBBB
         BBB BBBBB BB BBBB
             BB BBBBBBBBBBBBBBBBBBBB
               XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -21,8 +31,8 @@ XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXX
             BBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBBBBBB
         BBBBBB
         XXXX XXXXXXXXXXXXXXXXXXX
-          XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-          XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXX
+          XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXX XXXXXXXX XXXXXXXXXXX
         XXXXXX
         XXXX XXXX XXXX XXX
       XXXXXX
+BBBB BBBBBBBBBBBBB BBBB
 XXXX XXXXX XXXXXX XXXX XXX
 XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXX
   XXXX XXXXXXXXXXXXXXXXXXXXX
@@ -7,12 +8,12 @@ XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXX
         XXX XXXXXXXXXXXXXXXXXXXXXXXXX
       XXXXXX
       XXXX XXXXXXXXXXXXXXXXXXX
-        XXXXX XXX XXXXXX XXXX XX XXXXXX XXXX XXXXXXXXX
+        XXX gettext(u'Do you really want to delete this link?') XXXX
       XXXXXX
       XXXX XXXXXXXXXXXXXXXXXXXXX
         XXXX  XXX
-        XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXXXXXXX
+        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Confirm') XXXXXXXXXXXXX
       XXXXXX
     XXXXXX
+BBBB BBBBBBBBBBBBB BBBB
 XXXX XXXXX XXXX XXXXXXX
 XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
   XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
     XXXX XXXXXXXXXXXXXXXXXXXXXX
       XXXX XXXXXXXXXXXXXXXXXXXXX
         XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'Links') XXXXX
       XXXXXX
       XXXX XXXXXXXXXXXXXXXXXXX
         XXXX XXXX XXX
         XXXX XXXXXXXXXXXXXXXXXXX
-          XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Name') XXXXXXXX
           XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
         XXXXXX
         XXXX XXXXXXXXXXXXXXXXXXX
-          XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'URL') XXXXXXXX
           XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
         XXXXXX
         XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
-          XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Descrição') XXXXXXXX
           XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
         XXXXXX
         XXXX XXXXXXXXXXXXXXXXXXX
-          XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-          XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
+          XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXX
+          XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX gettext(u'Submit') XXXX
       XXXXXX
         XXXX XXXX XXXX XXX
       XXXXXX
@@ -5,7 +5,7 @@ XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX X
     XXXX XXXXXXXXXXXXXXXXXXXXXX
       XXXX XXXXXXXXXXXXXXXXXXXXX
         XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX
+        XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'Link') XXXXX
       XXXXXX
       XXXX XXXXXXXXXXXXXXXXXXX
         XXXX XXXX XXX
@@ -14,7 +14,7 @@ XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX X
            XXXX XXXXXXXXXXXXXXXXXXX
               XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
               XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX
-              XX XXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXX
+              XX XXXXXXX XXXXXXXXXX XXXXXXXXXXXXX gettext(u'Read more') XXXX
            XXXXXX
         XXXXXXXXXX
         XXXX XXXX XXXX XXX
@@ -0,0 +1,131 @@
+# 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: 2016-10-26 14:47-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"
+
+#: poll/forms.py:18 poll/forms.py:22
+msgid "It is required one these fields."
+msgstr ""
+
+#: poll/models.py:11 poll/models.py:32
+msgid "Poll"
+msgstr ""
+
+#: poll/models.py:12
+msgid "Polls"
+msgstr ""
+
+#: poll/models.py:18 poll/models.py:24 poll/templates/poll/answer.html:11
+#: poll/templates/poll/answer_student.html:27
+#: poll/templates/poll/create.html:68 poll/templates/poll/create.html:85
+#: poll/templates/poll/view.html:33
+msgid "Answer"
+msgstr ""
+
+#: poll/models.py:19
+msgid "Order"
+msgstr ""
+
+#: poll/models.py:20 poll/models.py:25
+msgid "Answers"
+msgstr ""
+
+#: poll/models.py:31
+msgid "Answered"
+msgstr ""
+
+#: poll/models.py:33
+msgid "Answers Students"
+msgstr ""
+
+#: poll/models.py:34
+msgid "Student"
+msgstr ""
+
+#: poll/models.py:35
+msgid "Answered Date"
+msgstr ""
+
+#: poll/models.py:38
+msgid "Answer Stundent"
+msgstr ""
+
+#: poll/models.py:39
+msgid "Answers Student"
+msgstr ""
+
+#: poll/templates/poll/answer.html:12 poll/templates/poll/create.html:69
+#: poll/templates/poll/create.html:86
+msgid "Possible answer for the question"
+msgstr ""
+
+#: poll/templates/poll/create.html:22
+msgid "Create a Poll"
+msgstr ""
+
+#: poll/templates/poll/create.html:38
+msgid "Question?"
+msgstr ""
+
+#: poll/templates/poll/create.html:39
+msgid "A Question to be answered"
+msgstr ""
+
+#: poll/templates/poll/create.html:154
+msgid "Close"
+msgstr ""
+
+#: poll/templates/poll/create.html:157
+msgid "Create"
+msgstr ""
+
+#: poll/templates/poll/remove.html:7
+msgid "Delete Poll"
+msgstr ""
+
+#: poll/templates/poll/remove.html:15
+msgid "Are you sure you want to delete the subject"
+msgstr ""
+
+#: poll/templates/poll/remove.html:19
+msgid "Delete"
+msgstr ""
+
+#: poll/templates/poll/update.html:7
+msgid "Update a Poll"
+msgstr ""
+
+#: poll/templates/poll/update.html:12
+msgid "Update"
+msgstr ""
+
+#: poll/templates/poll/view.html:17
+msgid "Limit date:"
+msgstr ""
+
+#: poll/templates/poll/view.html:20
+msgid "Status:"
+msgstr ""
+
+#: poll/templates/poll/view.html:22
+msgid "Poll answered"
+msgstr ""
+
+#: poll/templates/poll/view.html:24
+msgid "Poll don't yet answered"
+msgstr ""
@@ -21,4 +21,7 @@ pycpfcnpj==1.0.2
 six==1.10.0
 validators==0.11.0
 Werkzeug==0.11.11
-whitenoise==3.2.2
 \ No newline at end of file
+whitenoise==3.2.2
+beautifulsoup4==4.5.1
+lxml==3.6.4
+requests==2.11.1
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 00:13-0300\n"
+"POT-Creation-Date: 2016-10-26 14:47-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,15 +18,19 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: users/forms.py:10
-msgid "Password"
-msgstr "Senha"
+#: users/forms.py:60
+msgid "Please enter a valid CPF"
+msgstr "Por favor, insira um CPF válido"
+
+#: users/forms.py:67
+msgid "Please enter a valid date"
+msgstr "Por favor, insira uma data válida"
-#: users/models.py:10
+#: users/models.py:11 users/templates/users/profile.html:61
 msgid "Login"
-msgstr "Entrar"
+msgstr "Login"
-#: users/models.py:13
+#: users/models.py:14
 msgid ""
 "Type a valid username. This fields should only contain letters, numbers and "
 "the characteres: @/./+/-/_ ."
@@ -34,223 +38,369 @@ msgstr &quot;&quot;
 "Digite um nome de usuário válido. Esse campo deve conter apenas letras, "
 "números e os caracteres: @/./+/-/_ ."
-#: users/models.py:16
+#: users/models.py:17
 msgid ""
 "A short name that will be used to identify you in the platform and to access "
 "it"
 msgstr ""
+"Um nome curto que será usado para se identificar no acesso à plataforma"
-#: users/models.py:17
+#: users/models.py:18
 msgid "Mail"
 msgstr "Email"
-#: users/models.py:18 users/templates/list_users.html:50
+#: users/models.py:19 users/templates/list_users.html:67
 msgid "Name"
 msgstr "Nome"
-#: users/models.py:19
+#: users/models.py:20
 msgid "City"
 msgstr "Cidade"
-#: users/models.py:20
+#: users/models.py:21
 msgid "State"
 msgstr "Estado"
-#: users/models.py:21
+#: users/models.py:22 users/templates/users/profile.html:105
 msgid "Gender"
-msgstr "Genero"
+msgstr "Gênero"
-#: users/models.py:21
+#: users/models.py:22
 msgid "Male"
 msgstr "Masculino"
-#: users/models.py:21
+#: users/models.py:22
 msgid "Female"
 msgstr "Feminino"
-#: users/models.py:22
+#: users/models.py:23
 msgid "Image"
 msgstr "Imagem"
-#: users/models.py:23
+#: users/models.py:24 users/templates/users/profile.html:109
 msgid "Birth Date"
 msgstr "Data de nascimento"
-#: users/models.py:24
+#: users/models.py:25
 msgid "Phone"
 msgstr "Telefone"
-#: users/models.py:25 users/templates/users/profile.html:42
+#: users/models.py:26
 msgid "Cpf"
-msgstr "Cpf"
+msgstr "CPF"
-#: users/models.py:26
+#: users/models.py:27
 msgid "Type"
 msgstr "Tipo"
-#: users/models.py:26
+#: users/models.py:27
 msgid "Professor"
 msgstr "Professor"
-#: users/models.py:26
+#: users/models.py:27 users/templates/users/profile.html:81
 msgid "Student"
 msgstr "Aluno"
-#: users/models.py:27
+#: users/models.py:28
+msgid "Titration"
+msgstr "Título"
+
+#: users/models.py:29
+msgid "Year of titration"
+msgstr "Ano do título"
+
+#: users/models.py:30
+msgid "Institution where he had titration"
+msgstr "Instituição o qual obteve o título"
+
+#: users/models.py:31 users/templates/users/profile.html:135
+msgid "Curriculum"
+msgstr "Currículo"
+
+#: users/models.py:32
 msgid "Create Date"
 msgstr "Data de criação"
-#: users/models.py:28
+#: users/models.py:33
 msgid "Administrador"
 msgstr "Administrador"
-#: users/models.py:29
+#: users/models.py:34
 msgid "Active"
 msgstr "Ativo"
-#: users/models.py:37
+#: users/models.py:42
 msgid "User"
 msgstr "Usuário"
-#: users/models.py:38
+#: users/models.py:43
 msgid "Users"
 msgstr "Usuários"
-#: users/templates/list_users.html:9 users/templates/users/create.html:8
-#: users/templates/users/edit_profile.html:8 users/templates/users/index.html:7
-#: users/templates/users/profile.html:8 users/templates/users/update.html:8
+#: users/templates/list_users.html:15 users/templates/users/profile.html:17
+msgid "Menu"
+msgstr "Menu"
+
+#: users/templates/list_users.html:19 users/templates/users/index.html:7
 #: users/templates/users/view.html:7
 msgid "Home"
 msgstr "Início"
-#: users/templates/list_users.html:10 users/templates/users/index.html:8
-msgid "Manage Users"
-msgstr "Gerenciar Usuários"
-
-#: users/templates/list_users.html:23
+#: users/templates/list_users.html:20
 msgid "Add user"
 msgstr "Adicionar usuário"
-#: users/templates/list_users.html:24
+#: users/templates/list_users.html:21
 msgid "Send email"
 msgstr "Enviar e-mail"
-#: users/templates/list_users.html:34
+#: users/templates/list_users.html:41
 msgid "Search..."
 msgstr "Pesquisar..."
-#: users/templates/list_users.html:37
+#: users/templates/list_users.html:45
 msgid "Search"
 msgstr "Pesquisar"
-#: users/templates/list_users.html:51
-#: users/templates/users/edit_profile.html:16
-#: users/templates/users/profile.html:9 users/templates/users/profile.html:16
+#: users/templates/list_users.html:68
 msgid "Profile"
 msgstr "Perfil"
-#: users/templates/list_users.html:52
+#: users/templates/list_users.html:69 users/templates/users/profile.html:65
 msgid "Email"
 msgstr "Email"
-#: users/templates/list_users.html:53
+#: users/templates/list_users.html:70
 msgid "Contact"
 msgstr "Contato"
-#: users/templates/list_users.html:55
+#: users/templates/list_users.html:72
 msgid "Edit"
 msgstr "Editar"
-#: users/templates/list_users.html:56
+#: users/templates/list_users.html:73 users/templates/list_users.html:91
 msgid "Delete"
 msgstr "Apagar"
-#: users/templates/list_users.html:66 users/templates/users/index.html:74
+#: users/templates/list_users.html:84
+msgid "Confirm delete"
+msgstr "Confirmar"
+
+#: users/templates/list_users.html:87
+msgid "Are you sure you want to delete the user"
+msgstr "Você tem certeza que deseja deletar o usuário"
+
+#: users/templates/list_users.html:90
+#: users/templates/users/change_password.html:47
+#: users/templates/users/create.html:130
+#: users/templates/users/edit_profile.html:79
+#: users/templates/users/remove_account.html:35
+#: users/templates/users/update.html:83
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: users/templates/list_users.html:103 users/templates/users/index.html:74
 msgid "No users found"
 msgstr "Nenhum usuário encontrado"
-#: users/templates/users/create.html:9
-msgid "New User"
-msgstr "Novo usuário"
+#: users/templates/users/change_password.html:31
+#, fuzzy
+#| msgid "Password"
+msgid "Current Password"
+msgstr "Senha"
+
+#: users/templates/users/change_password.html:35
+#, fuzzy
+#| msgid "Password"
+msgid "New Password"
+msgstr "Senha"
-#: users/templates/users/create.html:16 users/templates/users/index.html:15
-#: users/templates/users/update.html:16 users/templates/users/view.html:15
+#: users/templates/users/change_password.html:39
+msgid "Confirmation"
+msgstr "Confirmação"
+
+#: users/templates/users/change_password.html:44
+#: users/templates/users/create.html:127
+#: users/templates/users/edit_profile.html:76
+#: users/templates/users/update.html:80
+msgid "Save"
+msgstr "Salvar"
+
+#: users/templates/users/create.html:51
+#: users/templates/users/edit_profile.html:39
+#: users/templates/users/update.html:42
+msgid "Choose your photo..."
+msgstr "Envie sua foto..."
+
+#: users/templates/users/create.html:67
+msgid "Choose your file..."
+msgstr "Envie um arquivo..."
+
+#: users/templates/users/index.html:8
+msgid "Manage Users"
+msgstr "Gerenciar Usuários"
+
+#: users/templates/users/index.html:15 users/templates/users/view.html:15
 msgid "System Users"
 msgstr "Usuários do sistema"
-#: users/templates/users/create.html:19 users/templates/users/index.html:18
-#: users/templates/users/update.html:19 users/templates/users/view.html:18
+#: users/templates/users/index.html:18 users/templates/users/view.html:18
 msgid "New Account"
-msgstr ""
+msgstr "Nova conta"
-#: users/templates/users/create.html:22 users/templates/users/index.html:21
-#: users/templates/users/update.html:22 users/templates/users/view.html:27
+#: users/templates/users/index.html:21 users/templates/users/view.html:27
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar email"
-#: users/templates/users/create.html:32
-#: users/templates/users/edit_profile.html:29
-#: users/templates/users/update.html:32
-msgid "All fields are required"
-msgstr ""
+#: users/templates/users/index.html:56 users/templates/users/view.html:39
+msgid "Administrator"
+msgstr "Administrador"
-#: users/templates/users/create.html:57
-#: users/templates/users/edit_profile.html:64
-#: users/templates/users/update.html:57
-msgid "Save"
-msgstr ""
+#: users/templates/users/profile.html:21
+#, fuzzy
+#| msgid "Home"
+msgid "Home page"
+msgstr "Início"
-#: users/templates/users/edit_profile.html:9
-#: users/templates/users/edit_profile.html:19
-#: users/templates/users/profile.html:19
+#: users/templates/users/profile.html:22
+#, fuzzy
+#| msgid "Edit Profile"
+msgid "View Profile"
+msgstr "Editar perfil"
+
+#: users/templates/users/profile.html:23
 msgid "Edit Profile"
-msgstr ""
+msgstr "Editar perfil"
-#: users/templates/users/index.html:56 users/templates/users/profile.html:32
-#: users/templates/users/view.html:39
-msgid "Administrator"
-msgstr ""
+#: users/templates/users/profile.html:24
+#, fuzzy
+#| msgid "Password"
+msgid "Change Password"
+msgstr "Senha"
-#: users/templates/users/profile.html:36 users/templates/users/view.html:43
-msgid "Mail:"
-msgstr ""
+#: users/templates/users/profile.html:25
+#, fuzzy
+#| msgid "New Account"
+msgid "Remove account"
+msgstr "Nova conta"
-#: users/templates/users/profile.html:39 users/templates/users/view.html:46
-msgid "Phone:"
-msgstr ""
+#: users/templates/users/profile.html:53
+#, fuzzy
+#| msgid "State"
+msgid "Status"
+msgstr "Estado"
-#: users/templates/users/profile.html:45
-msgid "Birth date"
-msgstr ""
+#: users/templates/users/profile.html:77
+msgid "User role"
+msgstr "Tipo de usuário"
-#: users/templates/users/update.html:9
-msgid "Edit user"
-msgstr ""
+#: users/templates/users/profile.html:79
+msgid "Teacher"
+msgstr "Professor"
+
+#: users/templates/users/profile.html:86
+msgid "CPF"
+msgstr "CPF"
+
+#: users/templates/users/profile.html:91
+msgid "doesn't posssess CPF"
+msgstr "Não possui CPF"
+
+#: users/templates/users/profile.html:96
+msgid "Phone Number"
+msgstr "Telefone"
+
+#: users/templates/users/profile.html:100
+msgid "doesn't posssess Phone"
+msgstr "Não possui telefone"
+
+#: users/templates/users/profile.html:113
+msgid "State and City"
+msgstr "Estado e cidade"
+
+#: users/templates/users/profile.html:117
+msgid "Title"
+msgstr "Título"
+
+#: users/templates/users/profile.html:121
+msgid "Year"
+msgstr "Ano"
+
+#: users/templates/users/profile.html:125
+msgid "Institution"
+msgstr "Instituição"
+
+#: users/templates/users/profile.html:129
+msgid "Didn't inform institution"
+msgstr "Não informou a instituição"
+
+#: users/templates/users/profile.html:139
+msgid "Didn't upload any curriculum"
+msgstr "Não enviou nenhum currículo"
+
+#: users/templates/users/remove_account.html:28
+msgid "Are you sure you want delete this account?"
+msgstr "Voce tem certeza que deseja remover esta conta?"
+
+#: users/templates/users/remove_account.html:29
+msgid ""
+"All data will be lost and havent how recover it."
+msgstr "Todos os seus dados serão removidos e não haverá como recupera-los posteriormente."
+
+#: users/templates/users/remove_account.html:32
+msgid "Remove"
+msgstr "Remover"
 #: users/templates/users/view.html:21
 msgid "View User Account"
-msgstr ""
+msgstr "Visualizar perfil"
 #: users/templates/users/view.html:24
 msgid "Edit User Account"
-msgstr ""
+msgstr "Editar perfil"
+
+#: users/templates/users/view.html:43
+msgid "Mail:"
+msgstr "E-mail"
+
+#: users/templates/users/view.html:46
+msgid "Phone:"
+msgstr "Telefone"
 #: users/templates/users/view.html:49
 msgid "Cpf:"
-msgstr ""
+msgstr "CPF"
 #: users/templates/users/view.html:52
 msgid "Birth date:"
-msgstr ""
+msgstr "Data de nascimento:"
-#: users/views.py:54
+#: users/views.py:55
 msgid "User created successfully!"
-msgstr ""
+msgstr "Usuário criado com sucesso!"
-#: users/views.py:83
+#: users/views.py:84
 msgid "User edited successfully!"
-msgstr ""
+msgstr "Usuário editado com sucesso!"
-#: users/views.py:132 users/views.py:149
+#: users/views.py:101
+#, fuzzy
+#| msgid "User edited successfully!"
+msgid "User deleted Successfully!"
+msgstr "Usuário editado com sucesso!"
+
+#: users/views.py:126
 msgid "Profile edited successfully!"
-msgstr ""
+msgstr "Perfil editado com sucesso!"
+
+#~ msgid "New User"
+#~ msgstr "Novo usuário"
+
+#~ msgid "All fields are required"
+#~ msgstr "Todos os campos são obrigatórios"
+
+#~ msgid "Birth date"
+#~ msgstr "Data de nascimento"
+
+#~ msgid "Edit user"
+#~ msgstr "Editar usuário"
@@ -42,7 +42,7 @@
             </div>
             <div class="col-md-1 col-sm-1 col-xs-1">
                 <button type="submit" class="btn btn-fab btn-fab-mini">
-                    <i class="material-icons">Search</i>
+                    <i class="material-icons">{% trans 'Search' %}</i>
                 </button>
             </div>
         </div>
@@ -54,7 +54,7 @@
 									<td></td>
 								</tr>
 								<tr>
-									<td>{% trans "Nome" %}:</td>
+									<td>{% trans "Name" %}:</td>
 									<td>{{user}}</td>
 								</tr>
 								<tr>
@@ -74,7 +74,7 @@
 						<table class="table table-hover table-edited">
 							<tbody>
 								<tr>
-									<td>{% trans "Tipo de Usuário" %}:</td>
+									<td>{% trans "User role" %}:</td>
 									{% if user.type_profile == 1 %}
 										<td>{% trans "Teacher" %}</td>
 									{% else %}
@@ -25,8 +25,8 @@
     <div class="row">
      <div class="col-md-12">
       <div class="well well-lg">
-        <h2>{% trans 'Voce tem certeza que deseja remover esta conta?' %}</h2>
-        <p>{% trans 'Todos os seus dados serão removidos e não haverá como recupera-los posteriormente.' %}</p>
+        <h2>{% trans 'Are you sure you want delete this account?' %}</h2>
+        <p>{% trans 'All data will be lost and havent how recover it.' %}</p>
         <div class="row">
           <div class="col-md-3 col-sm-2 col-xs-2">
               <a href="#" class="btn btn-raised btn-block btn-success" >{% trans 'Remove' %}</a>
	@@ -1,178 +0,0 @@	@@ -1,178 +0,0 @@
1	-# SOME DESCRIPTIVE TITLE.
2	-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3	-# This file is distributed under the same license as the PACKAGE package.
4	-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5	-#
6	-#, fuzzy
7	-msgid ""
8	-msgstr ""
9	-"Project-Id-Version: PACKAGE VERSION\n"
10	-"Report-Msgid-Bugs-To: \n"
11	-"POT-Creation-Date: 2016-09-16 02:41-0300\n"
12	-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	-"Language-Team: LANGUAGE <LL@li.org>\n"
15	-"Language: \n"
16	-"MIME-Version: 1.0\n"
17	-"Content-Type: text/plain; charset=UTF-8\n"
18	-"Content-Transfer-Encoding: 8bit\n"
19	-
20	-#: app/templates/app/base.html:10
21	-msgid "The Project"
22	-msgstr ""
23	-
24	-#: app/templates/app/base.html:11
25	-msgid "CCTE Group"
26	-msgstr ""
27	-
28	-#: app/templates/app/base.html:14
29	-msgid "Hi"
30	-msgstr ""
31	-
32	-#: app/templates/app/base.html:16
33	-msgid "See Profile"
34	-msgstr ""
35	-
36	-#: app/templates/app/base.html:17
37	-msgid "Settings"
38	-msgstr ""
39	-
40	-#: app/templates/app/base.html:18
41	-msgid "Logout"
42	-msgstr ""
43	-
44	-#: app/templates/app/index.html:6
45	-msgid "You have:"
46	-msgstr ""
47	-
48	-#: app/templates/app/index.html:10 app/templates/home.html:88
49	-msgid "Pending Tasks"
50	-msgstr ""
51	-
52	-#: app/templates/app/index.html:14
53	-msgid "Users Online"
54	-msgstr ""
55	-
56	-#: app/templates/app/index.html:20
57	-msgid "You can:"
58	-msgstr ""
59	-
60	-#: app/templates/app/index.html:24 app/templates/home_professor.html:25
61	-msgid "Create Course"
62	-msgstr ""
63	-
64	-#: app/templates/app/index.html:29 app/templates/home.html:93
65	-msgid "Manage Users"
66	-msgstr ""
67	-
68	-#: app/templates/app/index.html:33 app/templates/home.html:96
69	-msgid "Manage Courses"
70	-msgstr ""
71	-
72	-#: app/templates/app/index.html:37
73	-msgid "Gerenciar Categorias"
74	-msgstr ""
75	-
76	-#: app/templates/app/index.html:45
77	-msgid "Your course(s):"
78	-msgstr ""
79	-
80	-#: app/templates/app/index.html:46
81	-msgid "No courses subscribed yet"
82	-msgstr ""
83	-
84	-#: app/templates/app/index.html:56
85	-msgid "Search course:"
86	-msgstr ""
87	-
88	-#: app/templates/app/index.html:62
89	-msgid "Search"
90	-msgstr ""
91	-
92	-#: app/templates/app/index.html:67
93	-msgid "Most popular keywords:"
94	-msgstr ""
95	-
96	-#: app/templates/home.html:86
97	-msgid "Home"
98	-msgstr ""
99	-
100	-#: app/templates/home.html:87 app/templates/home_student.html:25
101	-msgid "Profile"
102	-msgstr ""
103	-
104	-#: app/templates/home.html:90
105	-msgid "My courses"
106	-msgstr ""
107	-
108	-#: app/templates/home.html:105 app/templates/home_professor.html:33
109	-msgid "Courses"
110	-msgstr ""
111	-
112	-#: app/templates/home.html:131
113	-msgid "No pending tasks at the moment."
114	-msgstr ""
115	-
116	-#: app/templates/home_admin_content.html:10
117	-msgid "Students"
118	-msgstr ""
119	-
120	-#: app/templates/home_admin_content.html:11
121	-msgid "Beginning"
122	-msgstr ""
123	-
124	-#: app/templates/home_admin_content.html:12
125	-msgid "End"
126	-msgstr ""
127	-
128	-#: app/templates/home_admin_content.html:15
129	-msgid "Edit"
130	-msgstr ""
131	-
132	-#: app/templates/home_professor.html:20 app/templates/home_student.html:21
133	-msgid "Menu"
134	-msgstr ""
135	-
136	-#: app/templates/home_professor.html:24
137	-msgid "Pending tasks"
138	-msgstr ""
139	-
140	-#: app/templates/home_professor.html:26
141	-msgid "Manage Course"
142	-msgstr ""
143	-
144	-#: app/templates/home_professor.html:43
145	-msgid "Students:"
146	-msgstr ""
147	-
148	-#: app/templates/home_professor.html:44
149	-msgid "Beginning:"
150	-msgstr ""
151	-
152	-#: app/templates/home_professor.html:45
153	-msgid "End:"
154	-msgstr ""
155	-
156	-#: app/templates/home_professor.html:52
157	-msgid "You didn't create any course yet."
158	-msgstr ""
159	-
160	-#: app/templates/home_professor.html:58 app/templates/home_student.html:73
161	-msgid "Goals"
162	-msgstr ""
163	-
164	-#: app/templates/home_student.html:26
165	-msgid "My Courses"
166	-msgstr ""
167	-
168	-#: app/templates/home_student.html:27
169	-msgid "Google accounts"
170	-msgstr ""
171	-
172	-#: app/templates/home_student.html:34
173	-msgid "Notifications"
174	-msgstr ""
175	-
176	-#: app/templates/home_student.html:76
177	-msgid "Favorites"
178	-msgstr ""
	@@ -66,7 +66,7 @@		@@ -66,7 +66,7 @@
66	{% block sidebar %}	66	{% block sidebar %}
67	<div class="panel panel-primary">	67	<div class="panel panel-primary">
68	<div class="panel-heading">	68	<div class="panel-heading">
69	- <h4>Menu</h4>	69	+ <h4>{% trans 'Menu' %}</h4>
70	</div>	70	</div>
71	<div class="panel-body">	71	<div class="panel-body">
72	<ul class="nav nav-pills nav-stacked">	72	<ul class="nav nav-pills nav-stacked">
	@@ -45,26 +45,26 @@		@@ -45,26 +45,26 @@
45	{% endif %}	45	{% endif %}
46	<div class="panel panel-default">	46	<div class="panel panel-default">
47	<div class="panel-body">	47	<div class="panel-body">
48	- His course has notified a new activity!	48	+ {% trans 'His course has notified a new activity!' %}
49	</div>	49	</div>
50	<div class="panel-footer">	50	<div class="panel-footer">
51	- Go	51	+ {% trans 'Go' %}
52	</div>	52	</div>
53	</div>	53	</div>
54	<div class="panel panel-default">	54	<div class="panel panel-default">
55	<div class="panel-body">	55	<div class="panel-body">
56	- His teacher has notified a new material!	56	+ {% trans 'His teacher has notified a new material!' %}
57	</div>	57	</div>
58	<div class="panel-footer">	58	<div class="panel-footer">
59	- Go	59	+ {% trans 'Go' %}
60	</div>	60	</div>
61	</div>	61	</div>
62	<div class="panel panel-default">	62	<div class="panel panel-default">
63	<div class="panel-body">	63	<div class="panel-body">
64	- You have a new guardian!	64	+ {% trans 'You have a new guardian!' %}
65	</div>	65	</div>
66	<div class="panel-footer">	66	<div class="panel-footer">
67	- Go	67	+ {% trans 'Go' %}
68	</div>	68	</div>
69	</div>	69	</div>
70	{% endblock %}	70	{% endblock %}
	@@ -1,66 +0,0 @@	@@ -1,66 +0,0 @@
1	-# SOME DESCRIPTIVE TITLE.
2	-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3	-# This file is distributed under the same license as the PACKAGE package.
4	-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5	-#
6	-#, fuzzy
7	-msgid ""
8	-msgstr ""
9	-"Project-Id-Version: PACKAGE VERSION\n"
10	-"Report-Msgid-Bugs-To: \n"
11	-"POT-Creation-Date: 2016-09-16 02:41-0300\n"
12	-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	-"Language-Team: LANGUAGE <LL@li.org>\n"
15	-"Language: \n"
16	-"MIME-Version: 1.0\n"
17	-"Content-Type: text/plain; charset=UTF-8\n"
18	-"Content-Transfer-Encoding: 8bit\n"
19	-
20	-#: core/templates/base.html:97
21	-msgid "Log out"
22	-msgstr ""
23	-
24	-#: core/templates/index.html:38
25	-msgid "Username"
26	-msgstr ""
27	-
28	-#: core/templates/index.html:44
29	-msgid "Password"
30	-msgstr ""
31	-
32	-#: core/templates/index.html:52
33	-msgid "Remember Email"
34	-msgstr ""
35	-
36	-#: core/templates/index.html:61
37	-msgid "Guest"
38	-msgstr ""
39	-
40	-#: core/templates/index.html:64 core/templates/register_user.html:71
41	-msgid "Login"
42	-msgstr ""
43	-
44	-#: core/templates/index.html:73
45	-msgid "Sign Up"
46	-msgstr ""
47	-
48	-#: core/templates/register_user.html:29
49	-msgid "User Register"
50	-msgstr ""
51	-
52	-#: core/templates/register_user.html:68
53	-msgid "Save"
54	-msgstr ""
55	-
56	-#: core/templates/remember_password.html:27
57	-msgid "E-mail"
58	-msgstr ""
59	-
60	-#: core/templates/remember_password.html:31
61	-msgid "Registration"
62	-msgstr ""
63	-
64	-#: core/templates/remember_password.html:35
65	-msgid "Send"
66	-msgstr ""
	@@ -8,7 +8,7 @@ msgid ""		@@ -8,7 +8,7 @@ msgid ""
8	msgstr ""	8	msgstr ""
9	"Project-Id-Version: PACKAGE VERSION\n"	9	"Project-Id-Version: PACKAGE VERSION\n"
10	"Report-Msgid-Bugs-To: \n"	10	"Report-Msgid-Bugs-To: \n"
11	-"POT-Creation-Date: 2016-09-07 00:13-0300\n"	11	+"POT-Creation-Date: 2016-10-26 14:47-0300\n"
12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	"Language-Team: LANGUAGE <LL@li.org>\n"	14	"Language-Team: LANGUAGE <LL@li.org>\n"
	@@ -17,91 +17,391 @@ msgstr ""		@@ -17,91 +17,391 @@ msgstr ""
17	"Content-Type: text/plain; charset=UTF-8\n"	17	"Content-Type: text/plain; charset=UTF-8\n"
18	"Content-Transfer-Encoding: 8bit\n"	18	"Content-Transfer-Encoding: 8bit\n"
19	"Plural-Forms: nplurals=2; plural=(n > 1);\n"	19	"Plural-Forms: nplurals=2; plural=(n > 1);\n"
		20	+#: core/forms.py:12
		21	+msgid "Password"
		22	+msgstr "Senha"
		23	+
		24	+#: core/forms.py:13
		25	+msgid "Password confirmation"
		26	+msgstr "Confirmação de senha"
		27	+
		28	+#: core/forms.py:27
		29	+msgid "There is already a registered User with this e-mail"
		30	+msgstr "Já existe um usuário cadastrado com esse e-mail"
		31	+
		32	+#: core/forms.py:33
		33	+msgid "Please enter a valid date"
		34	+msgstr "Por favor, insira uma data válida"
		35	+
		36	+#: core/forms.py:40
		37	+msgid "There is already a registeres User with this CPF"
		38	+msgstr "Já existem usuários cadastrados com este CPF"
		39	+
		40	+#: core/forms.py:42
		41	+msgid "Please enter a valid CPF"
		42	+msgstr "Por favor, insira um CPF válido"
		43	+
		44	+#: core/forms.py:50
		45	+#, python-format
		46	+msgid "The password must contain at least % d characters."
		47	+msgstr "A senha deve conter pelo menos % d caracteres"
		48	+
		49	+#: core/forms.py:55
		50	+msgid ""
		51	+"The password must contain at least one letter and at least one digit or a "
		52	+"punctuation character."
		53	+msgstr "A senha deve conter pelo menos uma letra, um dígito ou caracter de pontuação."
		54	+
		55	+#: core/forms.py:65
		56	+msgid "The confirmation password is incorrect."
		57	+msgstr "A confirmação de senha está incorreta."
		58	+
		59	+#: core/models.py:8
		60	+msgid "Type"
		61	+msgstr "Tipo"
20		62
21	-#: core/models.py:15 core/models.py:36	63	+#: core/models.py:9
		64	+msgid "Icon"
		65	+msgstr ""
		66	+
		67	+#: core/models.py:12
		68	+msgid "Amadeus Mime Type"
		69	+msgstr ""
		70	+
		71	+#: core/models.py:13
		72	+msgid "Amadeus Mime Types"
		73	+msgstr ""
		74	+
		75	+#: core/models.py:27 core/models.py:51
22	msgid "Name"	76	msgid "Name"
23	msgstr "Nome"	77	msgstr "Nome"
24		78
25	-#: core/models.py:16 core/models.py:37
26	-msgid "Created Date"	79	+#: core/models.py:28 core/models.py:52
		80	+msgid "Slug"
27	msgstr ""	81	msgstr ""
28		82
29	-#: core/models.py:49	83	+#: core/models.py:29 core/models.py:53
		84	+msgid "Created Date"
		85	+msgstr "Data de criação"
		86	+
		87	+#: core/models.py:54
		88	+msgid "URL"
		89	+msgstr "URL"
		90	+
		91	+#: core/models.py:67
30	msgid "Action_Applied"	92	msgid "Action_Applied"
31	msgstr ""	93	msgstr ""
32		94
33	-#: core/models.py:50	95	+#: core/models.py:68
34	msgid "Resource"	96	msgid "Resource"
35	msgstr ""	97	msgstr ""
36		98
37	-#: core/models.py:61
38	-msgid "message"
39	-msgstr "mensagem"	99	+#: core/models.py:89
		100	+msgid "Message"
		101	+msgstr "Mensagem"
40		102
41	-#: core/models.py:62
42	-msgid "Actor"	103	+#: core/models.py:90
		104	+#, python-format
		105	+msgid "%(class)s_Actor"
43	msgstr ""	106	msgstr ""
44		107
45	-#: core/models.py:63	108	+#: core/models.py:90
		109	+msgid "User"
		110	+msgstr "Usuário"
		111	+
		112	+#: core/models.py:91
46	msgid "Read"	113	msgid "Read"
47	msgstr ""	114	msgstr ""
48		115
49	-#: core/models.py:64	116	+#: core/models.py:92 core/models.py:104
		117	+msgid "Date and Time of action"
		118	+msgstr "Data e hora da ação"
		119	+
		120	+#: core/models.py:93 core/models.py:106
50	msgid "Action_Resource"	121	msgid "Action_Resource"
51	msgstr ""	122	msgstr ""
52		123
53	-#: core/templates/base.html:56
54	-msgid "Log out"
55	-msgstr "Sair"	124	+#: core/models.py:94
		125	+#, python-format
		126	+msgid "%(class)s_Performer"
		127	+msgstr ""
		128	+
		129	+#: core/models.py:94
		130	+msgid "Perfomer"
		131	+msgstr "Ator"
		132	+
		133	+#: core/models.py:97
		134	+msgid "Notification"
		135	+msgstr "Notificação"
		136	+
		137	+#: core/models.py:98 core/templates/base.html:73 core/templates/guest.html:68
		138	+msgid "Notifications"
		139	+msgstr "Notificações"
		140	+
		141	+#: core/models.py:105
		142	+msgid "Actor"
		143	+msgstr "Ator"
		144	+
		145	+#: core/models.py:109
		146	+msgid "Log"
		147	+msgstr "Log"
		148	+
		149	+#: core/models.py:110
		150	+msgid "Logs"
		151	+msgstr "Logs"
		152	+
		153	+#: core/templates/base.html:80 core/templates/guest.html:75
		154	+msgid "See More"
		155	+msgstr "Ver Mais"
		156	+
		157	+#: core/templates/base.html:87 core/templates/guest.html:81
		158	+msgid "messages"
		159	+msgstr "Mensagens"
		160	+
		161	+#: core/templates/base.html:100 core/templates/guest.html:94
		162	+msgid "Menu"
		163	+msgstr "Menu"
		164	+
		165	+#: core/templates/base.html:104 core/templates/lembrar_senha.html:110
		166	+msgid "Home"
		167	+msgstr "Início"
		168	+
		169	+#: core/templates/base.html:105
		170	+msgid "Profile"
		171	+msgstr "Perfil"
		172	+
		173	+#: core/templates/base.html:107
		174	+msgid "My courses"
		175	+msgstr "Meus cursos"
		176	+
		177	+#: core/templates/base.html:108
		178	+msgid "All Courses"
		179	+msgstr "Cursos"
		180	+
		181	+#: core/templates/base.html:111
		182	+msgid "Manage Users"
		183	+msgstr "Gerenciar usuários"
		184	+
		185	+#: core/templates/base.html:115
		186	+msgid "Manage Courses"
		187	+msgstr "Gerenciar cursos"
		188	+
		189	+#: core/templates/base.html:133
		190	+msgid "Category"
		191	+msgstr "Categoria"
		192	+
		193	+#: core/templates/base.html:137
		194	+msgid "Create Category"
		195	+msgstr "Criar categorias"
		196	+
		197	+#: core/templates/base.html:138
		198	+msgid "List Category"
		199	+msgstr "Listar categoria"
		200	+
		201	+#: core/templates/guest.html:98
		202	+msgid "Register"
		203	+msgstr "Cadastrar"
56		204
57	-#: core/templates/index.html:30	205	+#: core/templates/guest.html:123
		206	+msgid "All"
		207	+msgstr "Todos"
		208	+
		209	+#: core/templates/guest.html:141
		210	+msgid "Are you sure you want to subscribe to this course?"
		211	+msgstr "Tem certeza que deseja se inscrever neste curso?"
		212	+
		213	+#: core/templates/guest.html:141
		214	+msgid "Subscribe"
		215	+msgstr "Inscrever"
		216	+
		217	+#: core/templates/guest.html:146
		218	+msgid "Course Name"
		219	+msgstr "Nome do curso"
		220	+
		221	+#: core/templates/guest.html:147
		222	+msgid "Begining"
		223	+msgstr "Início"
		224	+
		225	+#: core/templates/guest.html:148
		226	+msgid "End"
		227	+msgstr "Fim"
		228	+
		229	+#: core/templates/guest.html:149
		230	+msgid "Professor"
		231	+msgstr "Professor"
		232	+
		233	+#: core/templates/guest.html:151
		234	+msgid "Description"
		235	+msgstr "Descrição"
		236	+
		237	+#: core/templates/index.html:39
58	msgid "Username"	238	msgid "Username"
59	-msgstr "Usuário"	239	+msgstr "Login"
60		240
61	-#: core/templates/index.html:36
62	-msgid "Password"	241	+#: core/templates/index.html:45
		242	+msgid "password"
63	msgstr "Senha"	243	msgstr "Senha"
64		244
65	-#: core/templates/index.html:44	245	+#: core/templates/index.html:52
66	msgid "Remember Email"	246	msgid "Remember Email"
67	-msgstr "Lembrar Senha"	247	+msgstr "Lembrar E-mail"
		248	+
		249	+#: core/templates/index.html:58
		250	+msgid "Login"
		251	+msgstr ""
68		252
69	-#: core/templates/index.html:53	253	+#: core/templates/index.html:61
70	msgid "Guest"	254	msgid "Guest"
71	msgstr "Convidado"	255	msgstr "Convidado"
72		256
73	-#: core/templates/index.html:56
74	-msgid "Login"
75	-msgstr "Entrar"	257	+#: core/templates/index.html:64
		258	+msgid "Forgot your password?"
		259	+msgstr "Esqueceu a senha?"
76		260
77	-#: core/templates/index.html:65	261	+#: core/templates/index.html:68
78	msgid "Sign Up"	262	msgid "Sign Up"
79	msgstr "Cadastrar"	263	msgstr "Cadastrar"
80		264
81	-#: core/templates/register_user.html:29	265	+#: core/templates/lembrar_senha.html:40
		266	+msgid "Amadeus Project"
		267	+msgstr "Projeto Amadeus"
		268	+
		269	+#: core/templates/lembrar_senha.html:65
		270	+msgid "Enter"
		271	+msgstr "Entrar"
		272	+
		273	+#: core/templates/lembrar_senha.html:101
		274	+msgid "The Project"
		275	+msgstr "O Projeto"
		276	+
		277	+#: core/templates/lembrar_senha.html:103
		278	+msgid "CCTE Group"
		279	+msgstr "Grupo CCTE"
		280	+
		281	+#: core/templates/lembrar_senha.html:106 core/templates/lembrar_senha.html:111
		282	+msgid "Remember password"
		283	+msgstr "Lembrar senha"
		284	+
		285	+#: core/templates/lembrar_senha.html:117
		286	+msgid "New account"
		287	+msgstr "Nova conta"
		288	+
		289	+#: core/templates/lembrar_senha.html:126
		290	+msgid "Email"
		291	+msgstr "E-mail"
		292	+
		293	+#: core/templates/lembrar_senha.html:128
		294	+msgid "Your Email address (exemple@mail.com)"
		295	+msgstr "Seu endereço de e-mail (exemplo@mail.com)"
		296	+
		297	+#: core/templates/lembrar_senha.html:163
		298	+msgid "Copyright Amadeus. All rights reserved"
		299	+msgstr "Copyright Amadeus. Todos os direitos reservados"
		300	+
		301	+#: core/templates/register_user.html:36
82	msgid "User Register"	302	msgid "User Register"
83	-msgstr "Registrar Usuário"	303	+msgstr "Cadastro de usuário"
84		304
85	-#: core/templates/register_user.html:53	305	+#: core/templates/register_user.html:88
86	msgid "Save"	306	msgid "Save"
87	msgstr "Salvar"	307	msgstr "Salvar"
88		308
89	-#: core/templates/remember_password.html:18	309	+#: core/templates/register_user.html:91
		310	+msgid "Cancel"
		311	+msgstr "Cancelar"
		312	+
		313	+#: core/templates/registration/passwor_reset_complete.html:25
		314	+msgid "Your password has been set. You can go ahead and go now."
		315	+msgstr "Sua senha foi redefinida. Você pode prosseguir."
		316	+
		317	+#: core/templates/registration/passwor_reset_confirm.html:24
		318	+msgid ""
		319	+"Please enter your new password twice so we can verify you typed it in "
		320	+"correctly."
		321	+msgstr "Por favor, insira uma nova senha duas vezes para verificarmos que digitou corretamente."
		322	+
		323	+#: core/templates/registration/passwor_reset_confirm.html:28
		324	+msgid "New password:"
		325	+msgstr "Nova senha:"
		326	+
		327	+#: core/templates/registration/passwor_reset_confirm.html:30
		328	+msgid "Confirm password:"
		329	+msgstr "Confirmação de senha:"
		330	+
		331	+#: core/templates/registration/passwor_reset_confirm.html:31
		332	+msgid "Change my password"
		333	+msgstr "Mudar senha"
		334	+
		335	+#: core/templates/registration/passwor_reset_confirm.html:36
		336	+msgid ""
		337	+"The password reset link was invalid, possibly because it has already been "
		338	+"used. Please request a new password reset."
		339	+msgstr "O link de redefinição de senha está inválido, possivelmente porque ele já foi utilizado. Por favor, solicite uma nova redefinição de senha."
		340	+
		341	+#: core/templates/registration/passwor_reset_done.html:39
		342	+msgid ""
		343	+"We have sent instructions to set up your password, if an account exists with "
		344	+"the email entered. You should receive them soon."
		345	+msgstr "Foi enviado as instruções para redefinição de senha, se a conta existe com o e-mail informado. Você deve receber a mensagem em breve."
		346	+
		347	+#: core/templates/registration/passwor_reset_done.html:40
		348	+msgid ""
		349	+"If you do not receive an email, please make sure you entered the address you "
		350	+"registered, and check the spam folder."
		351	+msgstr "Se você não recebeu a mensagem, certifique que informou o e-mail corretamente e cheque sua caixa de spam"
		352	+
		353	+#: core/templates/registration/passwor_reset_done.html:43
		354	+#: core/templates/registration/passwor_reset_form.html:46
		355	+msgid "Back"
		356	+msgstr "Voltar"
		357	+
		358	+#: core/templates/registration/passwor_reset_form.html:39
90	msgid "E-mail"	359	msgid "E-mail"
91	msgstr "E-mail"	360	msgstr "E-mail"
92		361
93	-#: core/templates/remember_password.html:22
94	-msgid "Registration"
95	-msgstr "Registrar"
96	-
97	-#: core/templates/remember_password.html:26	362	+#: core/templates/registration/passwor_reset_form.html:43
98	msgid "Send"	363	msgid "Send"
99	msgstr "Enviar"	364	msgstr "Enviar"
100		365
101	-#: core/views.py:31	366	+#: core/templates/registration/password_reset_subject.txt:2
		367	+#, python-format
		368	+msgid "Password reset on %(site_name)s"
		369	+msgstr "Senha redefinida em %(site_name)s"
		370	+
		371	+#: core/tests.py:97
		372	+msgid "Enter a valid email address."
		373	+msgstr "Insira um e-mail válido."
		374	+
		375	+#: core/tests.py:111 core/tests.py:204
		376	+msgid "This field is required."
		377	+msgstr "Este campo é obrigatório."
		378	+
		379	+#: core/views.py:41
102	msgid "User successfully registered!"	380	msgid "User successfully registered!"
103	-msgstr "Usuario cadastrado com sucesso"	381	+msgstr "Usuário cadastrado com sucesso!"
		382	+
		383	+#: core/views.py:56
		384	+msgid "Recover your password"
		385	+msgstr "Redefina sua senha"
		386	+
		387	+#: core/views.py:57
		388	+#, python-brace-format
		389	+msgid ""
		390	+"Hello {0}, \n"
		391	+"Recover your password to use your account.\n"
		392	+"Number of registration: {1}\n"
		393	+"Link for recuver password.\n"
		394	+"\n"
		395	+"Respectfully,\n"
		396	+"Team Amadeus."
		397	+msgstr "Olá, {0} \n"
		398	+"Redefina a senha para utilizar sua conta.\n"
		399	+"Número de registro: {1}\n"
		400	+"Link para redefinição de senha.\n"
		401	+"\n"
		402	+"Atenciosamente,\n"
		403	+"Equipe Amadeus."
104		404
105	-#: core/views.py:54
106	-msgid "E-mail or password are incorrect!"
107	-msgstr "O E-mail e/ou a senha estão incorretos"	405	+#: core/views.py:83
		406	+msgid "E-mail or password are incorrect."
		407	+msgstr "E-mail ou senha incorretos."
	@@ -411,4 +411,9 @@ ul, li {		@@ -411,4 +411,9 @@ ul, li {
411	.cards-detail .panel .panel-heading{/background-color:;/}	411	.cards-detail .panel .panel-heading{/background-color:;/}
412	.cards-detail .panel .panel-heading h4{color:black;}	412	.cards-detail .panel .panel-heading h4{color:black;}
413	.course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }	413	.course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
414	-.course-detail{padding-top: 10px; padding-bottom: 10px;}
415	\ No newline at end of file	414	\ No newline at end of file
		415	+.course-detail{padding-top: 10px; padding-bottom: 10px;}
		416	+
		417	+/* Menu link remove radius */
		418	+.nav-pills > li > a {
		419	+ border-radius: 0px;
		420	+}
416	\ No newline at end of file	421	\ No newline at end of file
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	<title>{{ title }}</title>	9	<title>{{ title }}</title>
10		10
11	<meta http-equiv="Cache-Control" content="no-cache, no-store" />	11	<meta http-equiv="Cache-Control" content="no-cache, no-store" />
12	- <link href="{% static 'img/favicon.ico' %}" rel="shortcut icon" />	12	+ <link href="{% static 'img/topo-amadeus.png' %}" rel="shortcut icon" />
13	<!-- Roboto font -->	13	<!-- Roboto font -->
14	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">	14	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
15	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">	15	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
	@@ -42,7 +42,7 @@		@@ -42,7 +42,7 @@
42	</div>	42	</div>
43	<div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">	43	<div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">
44	<div class="form-group">	44	<div class="form-group">
45	- <label for="inputPassword" class="control-label"> {% trans 'Password' %}</label>	45	+ <label for="inputPassword" class="control-label"> {% trans 'password' %}</label>
46	<input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">	46	<input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
47	</div>	47	</div>
48	</div>	48	</div>
	@@ -61,7 +61,7 @@		@@ -61,7 +61,7 @@
61	<a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>	61	<a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
62	</div>	62	</div>
63	<div class="col-md-10 col-sm-10 col-xs-10 col-lg-6 col-lg-offset-7 forgotPassword">	63	<div class="col-md-10 col-sm-10 col-xs-10 col-lg-6 col-lg-offset-7 forgotPassword">
64	- <a href="{% url 'core:password_reset' %}">{% trans "Forgot your password?" %}</a>	64	+ <a href="{% url 'core:password_reset' %}">{% trans 'Forgot your password?' %}</a>
65	</div>	65	</div>
66	</div>	66	</div>
67	</div>	67	</div>
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	<div class="least-content "> {{ notification.datetime\|timesince }} </div>	14	<div class="least-content "> {{ notification.datetime\|timesince }} </div>
15	</div>	15	</div>
16	<div class="row-content">	16	<div class="row-content">
17	- <p class="list-group-item-text">{{ notification.message }}</p>	17	+ <p class="list-group-item-text">{{notification.actor.username}} {{ notification.message }}</p>
18	</div>	18	</div>
19	</div>	19	</div>
20	</a>	20	</a>
	@@ -30,7 +30,7 @@		@@ -30,7 +30,7 @@
30		30
31	<div class="least-content pull-right">{{ notification.datetime\|timesince }}</div>	31	<div class="least-content pull-right">{{ notification.datetime\|timesince }}</div>
32		32
33	- <p class="list-group-item-text">{{ notification.message }}</p>	33	+ <p class="list-group-item-text">{{notification.actor.username}} {{ notification.message }}</p>
34	</div>	34	</div>
35	</a>	35	</a>
36	</li>	36	</li>
		1	+{% load static i18n %}
		2	+
1	{% trans 'To initiate the password reset process for your {{ user.get_username }} TestSite Account,	3	{% trans 'To initiate the password reset process for your {{ user.get_username }} TestSite Account,
2	click the link below:' %}	4	click the link below:' %}
3		5