diff --git a/app/locale/pt_BR/LC_MESSAGES/django.po b/app/locale/pt_BR/LC_MESSAGES/django.po
index 7254c14..2b31809 100644
--- a/app/locale/pt_BR/LC_MESSAGES/django.po
+++ b/app/locale/pt_BR/LC_MESSAGES/django.po
@@ -20,15 +20,15 @@ msgstr ""
 
 #: app/templates/app/base.html:10
 msgid "The Project"
-msgstr ""
+msgstr "O projeto"
 
 #: app/templates/app/base.html:11
 msgid "CCTE Group"
-msgstr ""
+msgstr "Grupo CCTE"
 
 #: app/templates/app/base.html:14
 msgid "Hi"
-msgstr ""
+msgstr "Olá"
 
 #: app/templates/app/base.html:16
 #, fuzzy
@@ -46,7 +46,7 @@ msgstr "Sair"
 
 #: app/templates/app/index.html:6
 msgid "You have:"
-msgstr ""
+msgstr "Você tem:"
 
 #: app/templates/app/index.html:10
 #, fuzzy
@@ -60,7 +60,7 @@ msgstr "Usuários Online"
 
 #: app/templates/app/index.html:20
 msgid "You can:"
-msgstr ""
+msgstr "Você pode:"
 
 #: app/templates/app/index.html:24 app/templates/home_app.html:26
 #: app/templates/home_professor.html:23
@@ -80,28 +80,28 @@ msgid "Manage Courses"
 msgstr "Gerenciar Curso"
 
 #: app/templates/app/index.html:37
-msgid "Gerenciar Categorias"
-msgstr ""
+msgid "Manage Categories"
+msgstr "Gerenciar Categorias"
 
 #: app/templates/app/index.html:45
 msgid "Your course(s):"
-msgstr ""
+msgstr "Seus cursos:"
 
 #: app/templates/app/index.html:46
 msgid "No courses subscribed yet"
-msgstr ""
+msgstr "Nenhum curso inscrito ainda"
 
 #: app/templates/app/index.html:56
 msgid "Search course:"
-msgstr ""
+msgstr "Pesquisar curso"
 
 #: app/templates/app/index.html:62
 msgid "Search"
-msgstr ""
+msgstr "Pesquisar"
 
 #: app/templates/app/index.html:67
 msgid "Most popular keywords:"
-msgstr ""
+msgstr "Palavras mais populares:"
 
 #: app/templates/home_app.html:14 app/templates/home_professor.html:9
 #: app/templates/home_student.html:9
@@ -155,7 +155,7 @@ msgstr "Começo"
 
 #: app/templates/home_professor.html:42
 msgid "End:"
-msgstr "Fim"
+msgstr "Fim:"
 
 #: app/templates/home_student.html:22
 msgid "Profile"
diff --git a/app/templates/home.html b/app/templates/home.html
index 55af9b2..e15b5f4 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -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">
diff --git a/app/templates/home_student.html b/app/templates/home_student.html
index 65ecc3b..5d22aae 100644
--- a/app/templates/home_student.html
+++ b/app/templates/home_student.html
@@ -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 %}
diff --git a/core/locale/pt_BR/LC_MESSAGES/django.po b/core/locale/pt_BR/LC_MESSAGES/django.po
index 81566d9..2703cd5 100644
--- a/core/locale/pt_BR/LC_MESSAGES/django.po
+++ b/core/locale/pt_BR/LC_MESSAGES/django.po
@@ -24,7 +24,7 @@ msgstr "Nome"
 
 #: core/models.py:16 core/models.py:37
 msgid "Created Date"
-msgstr ""
+msgstr "Data de criação"
 
 #: core/models.py:49
 msgid "Action_Applied"
diff --git a/core/templates/guest.html b/core/templates/guest.html
index 7e1e456..5234870 100644
--- a/core/templates/guest.html
+++ b/core/templates/guest.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 
-{% load static i18n %}
+
 {% load i18n custom_filters %}
+{% load static i18n %}
 
 <html>
 <head>
@@ -64,14 +65,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 +91,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">
@@ -110,7 +111,7 @@
 							  <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
 							    <span class="input-group-btn input-group-sm">
 							      <button type="button" class="btn btn-fab btn-fab-mini">
-							        <i class="material-icons">search</i>
+							        <i class="material-icons">{% trans 'search' %}</i>
 							      </button>
 							    </span>
 							</div>
@@ -119,7 +120,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 'Todos' %}</a>
 						{% for category in categories %}
 							<a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
 						{% endfor %}
@@ -142,12 +143,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>
diff --git a/core/templates/index.html b/core/templates/index.html
index 0691929..4341c21 100644
--- a/core/templates/index.html
+++ b/core/templates/index.html
@@ -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>
diff --git a/core/templates/registration/passwor_reset_email.html b/core/templates/registration/passwor_reset_email.html
index 336d504..73774c3 100644
--- a/core/templates/registration/passwor_reset_email.html
+++ b/core/templates/registration/passwor_reset_email.html
@@ -1,3 +1,5 @@
+{% load static i18n %}
+
 {% trans 'To initiate the password reset process for your {{ user.get_username }} TestSite Account,
 click the link below:' %}
 
diff --git a/core/templates/registration/password_reset_subject.txt b/core/templates/registration/password_reset_subject.txt
index 40ef3f2..36292d6 100644
--- a/core/templates/registration/password_reset_subject.txt
+++ b/core/templates/registration/password_reset_subject.txt
@@ -1,3 +1,3 @@
 {% load i18n %}{% autoescape off %}
-{% blocktrans %}{% trans 'Password reset on' %} {{ site_name }}{% endblocktrans %}
+{% blocktrans %}Password reset on {{ site_name }}{% endblocktrans %}
 {% endautoescape %}
diff --git a/core/views.py b/core/views.py
index 28bb7ce..255182d 100644
--- a/core/views.py
+++ b/core/views.py
@@ -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'
diff --git a/courses/locale/pt_BR/LC_MESSAGES/django.po b/courses/locale/pt_BR/LC_MESSAGES/django.po
index a29320f..e8c9979 100644
--- a/courses/locale/pt_BR/LC_MESSAGES/django.po
+++ b/courses/locale/pt_BR/LC_MESSAGES/django.po
@@ -26,7 +26,7 @@ msgstr "Nome"
 
 #: courses/forms.py:14
 msgid "Category name"
-msgstr ""
+msgstr "Nome da categoria"
 
 #: courses/forms.py:26
 msgid "Objectives"
@@ -122,7 +122,7 @@ msgstr "descrição do módulo"
 
 #: courses/forms.py:65
 msgid "Is the module visible?"
-msgstr ""
+msgstr "O módulo é visível?"
 
 #: courses/models.py:8 courses/models.py:21 courses/models.py:45
 #: courses/templates/category/index.html:39
@@ -131,7 +131,7 @@ msgstr ""
 
 #: courses/models.py:9 courses/models.py:25 courses/models.py:48
 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
@@ -143,7 +143,7 @@ msgstr "Categorias"
 
 #: courses/models.py:22
 msgid "Objectivies"
-msgstr ""
+msgstr "Objetivos"
 
 #: courses/models.py:24
 msgid "Maximum Students"
@@ -151,23 +151,23 @@ msgstr "Quantidade máximo de estudantes"
 
 #: courses/models.py:26
 msgid "Register Date (Begin)"
-msgstr ""
+msgstr "Data de inscrição (Início)"
 
 #: courses/models.py:27
 msgid "Register Date (End)"
-msgstr ""
+msgstr "Data de inscrição (término)"
 
 #: courses/models.py:28
 msgid "Begin of Course Date"
-msgstr ""
+msgstr "Início do curso"
 
 #: courses/models.py:29
 msgid "End of Course Date"
-msgstr ""
+msgstr "Término do curso"
 
 #: courses/models.py:32
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #: courses/models.py:36 courses/models.py:49
 msgid "Course"
@@ -240,11 +240,11 @@ msgstr "Salvar"
 #: courses/templates/category/delete.html:8
 #: courses/templates/category/index.html:8
 msgid "Manage Categories"
-msgstr ""
+msgstr "Gerenciar categorias"
 
 #: courses/templates/category/delete.html:26
 msgid "Are you sure you want to delete the category"
-msgstr ""
+msgstr "Você tem certeza que deseja deletar a categoria"
 
 #: courses/templates/category/delete.html:27
 #: courses/templates/course/delete.html:28
@@ -260,24 +260,24 @@ msgstr "Não"
 
 #: courses/templates/category/index.html:40
 msgid "Actions"
-msgstr ""
+msgstr "Ações"
 
 #: courses/templates/category/index.html:59
 msgid "No categories found"
-msgstr ""
+msgstr "Nenhuma categoria encontrada"
 
 #: courses/templates/category/update.html:9
 #: courses/templates/category/view.html:21
 msgid "Edit Category"
-msgstr ""
+msgstr "Editar categoria"
 
 #: courses/templates/category/view.html:24
 msgid "Remove Category"
-msgstr ""
+msgstr "Remover categoria"
 
 #: courses/templates/category/view.html:32
 msgid "Name:"
-msgstr ""
+msgstr "Nome:"
 
 #: courses/templates/category/view.html:33
 msgid "Slug:"
@@ -292,16 +292,16 @@ msgstr ""
 #: courses/templates/module/index.html:26
 #: courses/templates/module/update.html:20
 msgid "Create Course"
-msgstr ""
+msgstr "Criar curso"
 
 #: courses/templates/course/delete.html:27
 msgid "Are you sure you want to delete the couse"
-msgstr ""
+msgstr "Você tem certeza que deseja deletar o curso"
 
 #: courses/templates/course/filtered.html:19
 #: courses/templates/course/index.html:26
 msgid "Categories:"
-msgstr ""
+msgstr "Categorias:"
 
 #: courses/templates/course/home.html:9
 #, fuzzy
@@ -311,24 +311,24 @@ msgstr "Curso"
 
 #: courses/templates/course/index.html:8
 msgid "Manage Courses"
-msgstr ""
+msgstr "Gerenciar cursos"
 
 #: courses/templates/course/index.html:80
 msgid "students tops"
-msgstr ""
+msgstr "Melhores estudantes"
 
 #: courses/templates/course/index.html:86
 msgid "Subscribe Period:"
-msgstr ""
+msgstr "Inscrever período:"
 
 #: courses/templates/course/index.html:88 courses/templates/course/view.html:59
 #: courses/templates/module/index.html:83
 msgid "Period:"
-msgstr ""
+msgstr "Período:"
 
 #: 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
@@ -336,7 +336,7 @@ msgstr ""
 #: courses/templates/module/index.html:29
 #: courses/templates/module/update.html:26
 msgid "Edit Course"
-msgstr ""
+msgstr "Editar curso"
 
 #: courses/templates/course/update.html:19
 #: courses/templates/course/view.html:21
@@ -346,7 +346,7 @@ msgstr ""
 #: courses/templates/module/index.html:9 courses/templates/module/index.html:22
 #: courses/templates/module/update.html:29
 msgid "Manage Modules"
-msgstr ""
+msgstr "Gerenciar módulos"
 
 #: courses/templates/course/update.html:22
 #: courses/templates/course/view.html:31
@@ -355,7 +355,7 @@ msgstr ""
 #: courses/templates/module/index.html:32
 #: courses/templates/module/update.html:32
 msgid "Participants"
-msgstr ""
+msgstr "Participantes"
 
 #: courses/templates/course/view.html:18
 #: courses/templates/module/create.html:23
@@ -363,7 +363,7 @@ msgstr ""
 #: courses/templates/module/index.html:19
 #: courses/templates/module/update.html:23
 msgid "Course Info"
-msgstr ""
+msgstr "Informações do curso"
 
 #: courses/templates/course/view.html:34
 #: courses/templates/module/create.html:35
@@ -371,7 +371,7 @@ msgstr ""
 #: courses/templates/module/index.html:35
 #: courses/templates/module/update.html:35
 msgid "Course avaliations"
-msgstr ""
+msgstr "Avaliações do curso"
 
 #: courses/templates/course/view.html:37
 #: courses/templates/module/create.html:38
@@ -379,7 +379,7 @@ msgstr ""
 #: courses/templates/module/index.html:38
 #: courses/templates/module/update.html:38
 msgid "Duplicate Course"
-msgstr ""
+msgstr "Duplicar curso"
 
 #: courses/templates/course/view.html:40
 #: courses/templates/module/create.html:41
@@ -387,77 +387,77 @@ msgstr ""
 #: courses/templates/module/index.html:41
 #: courses/templates/module/update.html:41
 msgid "Delete Course"
-msgstr ""
+msgstr "Deletar curso"
 
 #: courses/templates/course/view.html:56
 msgid "Subscribes:"
-msgstr ""
+msgstr "Inscrições:"
 
 #: courses/templates/course/view.html:66
 msgid "Objectives:"
-msgstr ""
+msgstr "Objetivos:"
 
 #: courses/templates/course/view.html:69
 msgid "Work Plan:"
-msgstr ""
+msgstr "Plano de trabalho:"
 
 #: courses/templates/module/create.html:10
 #: courses/templates/module/index.html:70
 msgid "Create Module"
-msgstr ""
+msgstr "Criar módulos"
 
 #: courses/templates/module/delete.html:49
 msgid "Are you sure you want to delete the module"
-msgstr ""
+msgstr "Você tem certeza que deseja deletar o módulo"
 
 #: courses/templates/module/index.html:80
 msgid "students maximum"
-msgstr ""
+msgstr "Capacidade de estudantes"
 
 #: courses/templates/module/index.html:109
 msgid "Invisible"
-msgstr ""
+msgstr "Invisível"
 
 #: courses/templates/module/index.html:125
 msgid "No modules found"
-msgstr ""
+msgstr "Nenhum módulo encontrado"
 
 #: courses/templates/module/update.html:10
 msgid "Edit Module"
-msgstr ""
+msgstr "Editar módulo"
 
 #: courses/views.py:48
 msgid "Course created successfully!"
-msgstr ""
+msgstr "Curso criado com sucesso!"
 
 #: courses/views.py:70
 msgid "Course edited successfully!"
-msgstr ""
+msgstr "Curso editado com sucesso!"
 
 #: courses/views.py:92
 msgid "Course deleted successfully!"
-msgstr ""
+msgstr "Curso deletado com sucesso!"
 
 #: courses/views.py:142
 msgid "Category created successfully!"
-msgstr ""
+msgstr "Categoria criada com sucesso!"
 
 #: courses/views.py:164
 msgid "Category edited successfully!"
-msgstr ""
+msgstr "Categoria editada com sucesso!"
 
 #: courses/views.py:185
 msgid "Category deleted successfully!"
-msgstr ""
+msgstr "Categoria deletada com sucesso!"
 
 #: courses/views.py:237
 msgid "Module created successfully!"
-msgstr ""
+msgstr "Módulo criado com sucesso!"
 
 #: courses/views.py:268
 msgid "Module edited successfully!"
-msgstr ""
+msgstr "Módulo editado com sucesso!"
 
 #: courses/views.py:291
 msgid "Module deleted successfully!"
-msgstr ""
+msgstr "Módulo deletado com sucesso!"
diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html
index f0935b0..af3fadd 100644
--- a/courses/templates/course/course_card.html
+++ b/courses/templates/course/course_card.html
@@ -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>
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index d3bb74f..39082ed 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -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>
@@ -77,7 +77,7 @@
           <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
             <span class="input-group-btn input-group-sm">
               <button type="button" class="btn btn-fab btn-fab-mini">
-                <i class="material-icons">search</i>
+                <i class="material-icons">{% trans 'Search' %}</i>
               </button>
             </span>
         </div>
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index 6825163..1dd7a44 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -63,10 +63,10 @@
       </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>{{course.professors}}</p>
       <p>
-        <b>Description:</b>
+        <b>{% trans 'Description' %}:</b>
         <i>
           {{course.description}}
         </i>
@@ -142,8 +142,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>
@@ -199,8 +199,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>
diff --git a/courses/templates/subject/form_view_student.html b/courses/templates/subject/form_view_student.html
index 37356e7..c57cb56 100644
--- a/courses/templates/subject/form_view_student.html
+++ b/courses/templates/subject/form_view_student.html
@@ -32,7 +32,7 @@
           <div class="row">
             <div class="col-xs-6 col-md-6">
               <div class="resource_inline">
-                <h4>Material</h4>
+                <h4>{% trans 'Material' %}</h4>
               </div>
               <ul id="list-materials">
                   {% list_topic_file request topic %}
@@ -42,7 +42,7 @@
             </div>
             <div class="col-xs-4 col-md-4">
               <div class="resource_inline">
-                <h4>Activities</h4>
+                <h4>{% trans 'Activities' %}</h4>
               </div>
               <ul>
 
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index bd6a2cf..4dfe151 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -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">
@@ -114,23 +114,23 @@
             </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 +150,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 +170,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>
diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html
index c6e2b69..2fcf278 100644
--- a/courses/templates/subject/index.html
+++ b/courses/templates/subject/index.html
@@ -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">
diff --git a/exam/templates/exam/create.html.py b/exam/templates/exam/create.html.py
index 60ac122..6c97ee2 100644
--- a/exam/templates/exam/create.html.py
+++ b/exam/templates/exam/create.html.py
@@ -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
diff --git a/exam/templates/exam/gap_filling_question.html.py b/exam/templates/exam/gap_filling_question.html.py
index c22e21c..a3117c9 100644
--- a/exam/templates/exam/gap_filling_question.html.py
+++ b/exam/templates/exam/gap_filling_question.html.py
@@ -1,3 +1,3 @@
 XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX
-  XXXXXX XXXXXXX XXXXXXXXXXXX
+  XXX gettext(u'Gap Filling Question') XXXX
 XXXXXX
diff --git a/exam/templates/exam/multiple_choice_question.html b/exam/templates/exam/multiple_choice_question.html
index bb5fb5f..c742760 100644
--- a/exam/templates/exam/multiple_choice_question.html
+++ b/exam/templates/exam/multiple_choice_question.html
@@ -1,3 +1,5 @@
+{% load i18n %}
+
 <div class="form-group" id="multipleChoice">
 
   <label for="questionName" class="col-md-2 control-label">{% trans 'Question' %}</label>
diff --git a/exam/templates/exam/multiple_choice_question.html.py b/exam/templates/exam/multiple_choice_question.html.py
index d7e0202..d351ca3 100644
--- a/exam/templates/exam/multiple_choice_question.html.py
+++ b/exam/templates/exam/multiple_choice_question.html.py
@@ -1,6 +1,8 @@
+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
diff --git a/files/templates/files/create_file.html.py b/files/templates/files/create_file.html.py
index 67a4216..4ac1575 100644
--- a/files/templates/files/create_file.html.py
+++ b/files/templates/files/create_file.html.py
@@ -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
diff --git a/files/templates/files/delete_file.html.py b/files/templates/files/delete_file.html.py
index 13c8791..2a32acb 100644
--- a/files/templates/files/delete_file.html.py
+++ b/files/templates/files/delete_file.html.py
@@ -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
diff --git a/files/templates/files/update_file.html.py b/files/templates/files/update_file.html.py
index fdef8cb..6ad3af1 100644
--- a/files/templates/files/update_file.html.py
+++ b/files/templates/files/update_file.html.py
@@ -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
diff --git a/forum/templates/forum/forum_list.html.py b/forum/templates/forum/forum_list.html.py
index ee264e0..36e9c6a 100644
--- a/forum/templates/forum/forum_list.html.py
+++ b/forum/templates/forum/forum_list.html.py
@@ -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
diff --git a/forum/templates/forum/forum_view.html.py b/forum/templates/forum/forum_view.html.py
index ecf4249..a18b624 100644
--- a/forum/templates/forum/forum_view.html.py
+++ b/forum/templates/forum/forum_view.html.py
@@ -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
diff --git a/forum/templates/post/post_list.html.py b/forum/templates/post/post_list.html.py
index 6af9caf..696bf21 100644
--- a/forum/templates/post/post_list.html.py
+++ b/forum/templates/post/post_list.html.py
@@ -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
diff --git a/forum/templates/post/post_load_more_render.html.py b/forum/templates/post/post_load_more_render.html.py
new file mode 100644
index 0000000..124425b
--- /dev/null
+++ b/forum/templates/post/post_load_more_render.html.py
@@ -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
diff --git a/forum/templates/post/post_render.html.py b/forum/templates/post/post_render.html.py
index 48facc2..f77371e 100644
--- a/forum/templates/post/post_render.html.py
+++ b/forum/templates/post/post_render.html.py
@@ -1,12 +1,12 @@
 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
diff --git a/forum/templates/post_answers/post_answer_form.html.py b/forum/templates/post_answers/post_answer_form.html.py
index 88db871..53c095f 100644
--- a/forum/templates/post_answers/post_answer_form.html.py
+++ b/forum/templates/post_answers/post_answer_form.html.py
@@ -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
diff --git a/forum/templates/post_answers/post_answer_load_more_render.html.py b/forum/templates/post_answers/post_answer_load_more_render.html.py
new file mode 100644
index 0000000..01fdf6f
--- /dev/null
+++ b/forum/templates/post_answers/post_answer_load_more_render.html.py
@@ -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
diff --git a/forum/templates/post_answers/post_answer_render.html.py b/forum/templates/post_answers/post_answer_render.html.py
index b8648ef..0e4a540 100644
--- a/forum/templates/post_answers/post_answer_render.html.py
+++ b/forum/templates/post_answers/post_answer_render.html.py
@@ -1,6 +1,6 @@
 BBBB BBBB BBBBBBBBBBBBBBB
 
-XXXXX
+XXXX XXXXXXXXXXXXXXXXXXX
     XXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
         XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
             XXX XXXXXXXXXXXXXXXXXX
diff --git a/links/templates/links/create_link.html.py b/links/templates/links/create_link.html.py
index 2a18a9b..4c77678 100644
--- a/links/templates/links/create_link.html.py
+++ b/links/templates/links/create_link.html.py
@@ -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
diff --git a/links/templates/links/delete_link.html.py b/links/templates/links/delete_link.html.py
index 0de359e..98652fb 100644
--- a/links/templates/links/delete_link.html.py
+++ b/links/templates/links/delete_link.html.py
@@ -1,3 +1,4 @@
+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
diff --git a/links/templates/links/update_link.html.py b/links/templates/links/update_link.html.py
index 58c7d89..d5d106a 100644
--- a/links/templates/links/update_link.html.py
+++ b/links/templates/links/update_link.html.py
@@ -1,28 +1,29 @@
+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
diff --git a/links/templates/links/view_link.html.py b/links/templates/links/view_link.html.py
index acec0a4..72ff5a8 100644
--- a/links/templates/links/view_link.html.py
+++ b/links/templates/links/view_link.html.py
@@ -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
diff --git a/users/locale/pt_BR/LC_MESSAGES/django.po b/users/locale/pt_BR/LC_MESSAGES/django.po
index 5dd9fbd..fe8dcc5 100644
--- a/users/locale/pt_BR/LC_MESSAGES/django.po
+++ b/users/locale/pt_BR/LC_MESSAGES/django.po
@@ -24,7 +24,7 @@ msgstr "Senha"
 
 #: users/models.py:10
 msgid "Login"
-msgstr "Entrar"
+msgstr "Login"
 
 #: users/models.py:13
 msgid ""
@@ -38,7 +38,7 @@ msgstr ""
 msgid ""
 "A short name that will be used to identify you in the platform and to access "
 "it"
-msgstr ""
+msgstr "Um nome curto que será usado para se identificar no acesso à plataforma"
 
 #: users/models.py:17
 msgid "Mail"
@@ -181,76 +181,76 @@ 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
 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
 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 ""
+msgstr "Todos os campos são obrigatórios"
 
 #: users/templates/users/create.html:57
 #: users/templates/users/edit_profile.html:64
 #: users/templates/users/update.html:57
 msgid "Save"
-msgstr ""
+msgstr "Salvar"
 
 #: users/templates/users/edit_profile.html:9
 #: users/templates/users/edit_profile.html:19
 #: users/templates/users/profile.html:19
 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 ""
+msgstr "Administrador"
 
 #: users/templates/users/profile.html:36 users/templates/users/view.html:43
 msgid "Mail:"
-msgstr ""
+msgstr "E-mail"
 
 #: users/templates/users/profile.html:39 users/templates/users/view.html:46
 msgid "Phone:"
-msgstr ""
+msgstr "Telefone"
 
 #: users/templates/users/profile.html:45
 msgid "Birth date"
-msgstr ""
+msgstr "Data de nascimento"
 
 #: users/templates/users/update.html:9
 msgid "Edit user"
-msgstr ""
+msgstr "Editar usuário"
 
 #: 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:49
 msgid "Cpf:"
-msgstr ""
+msgstr "Cpf"
 
 #: users/templates/users/view.html:52
 msgid "Birth date:"
-msgstr ""
+msgstr "Data de nascimento:"
 
 #: users/views.py:54
 msgid "User created successfully!"
-msgstr ""
+msgstr "Usuário criado com sucesso!"
 
 #: users/views.py:83
 msgid "User edited successfully!"
-msgstr ""
+msgstr "Usuário editado com sucesso!"
 
 #: users/views.py:132 users/views.py:149
 msgid "Profile edited successfully!"
-msgstr ""
+msgstr "Perfil editado com sucesso!"
diff --git a/users/templates/list_users.html b/users/templates/list_users.html
index 5651136..c821b14 100644
--- a/users/templates/list_users.html
+++ b/users/templates/list_users.html
@@ -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>
--
libgit2 0.21.2