From fdd2a50b7e5c44e1d1b5c402b4bc8172481f8b34 Mon Sep 17 00:00:00 2001
From: filipecmedeiros <fcma@cin.ufpe.br>
Date: Tue, 25 Oct 2016 19:26:18 -0300
Subject: [PATCH] Adding template tag trans where was supposed to be [Issue #223]

---
 app/templates/home.html                                |  2 +-
 app/templates/home_student.html                        |  8 ++++----
 app/templates/home_teacher_student_content.html        |  2 +-
 core/templates/base.html                               | 10 +++++-----
 core/templates/guest.html                              | 18 +++++++++---------
 core/templates/lembrar_senha.html                      | 22 +++++++++++-----------
 core/templates/registration/passwor_reset_email.html   |  8 ++++----
 core/templates/registration/password_reset_subject.txt |  2 +-
 courses/templates/category/create.html                 | 14 +++++++-------
 courses/templates/category/index.html                  | 14 +++++++-------
 courses/templates/category/update.html                 | 14 +++++++-------
 courses/templates/course/course_card.html              |  6 +++---
 courses/templates/course/create.html                   |  2 +-
 courses/templates/course/index.html                    |  2 +-
 courses/templates/course/replicate.html                | 42 +++++++++++++++++++++---------------------
 courses/templates/course/update.html                   |  2 +-
 courses/templates/course/view.html                     | 14 +++++++-------
 courses/templates/subject/form_view_teacher.html       | 56 ++++++++++++++++++++++++++++----------------------------
 courses/templates/subject/poll_item_actions.html       |  4 ++--
 courses/templates/topic/index.html                     | 18 +++++++++---------
 exam/templates/exam/gap_filling_question.html          |  2 +-
 exam/templates/exam/multiple_choice_question.html      |  6 +++---
 files/templates/files/create_file.html                 |  4 ++--
 files/templates/files/delete_file.html                 |  2 +-
 files/templates/files/update_file.html                 |  4 ++--
 forum/templates/forum/forum_list.html                  |  2 +-
 forum/templates/forum/forum_view.html                  |  2 +-
 forum/templates/post/post_list.html                    |  2 +-
 forum/templates/post/post_load_more_render.html        |  2 +-
 forum/templates/post/post_render.html                  |  2 +-
 forum/templates/post_answers/post_answer_form.html     |  2 +-
 links/templates/links/create_link.html                 |  6 +++---
 links/templates/links/delete_link.html                 |  6 +++---
 links/templates/links/update_link.html                 | 12 ++++++------
 links/templates/links/view_link.html                   |  4 ++--
 users/templates/list_users.html                        | 12 ++++++------
 users/templates/users/remove_account.html              |  4 ++--
 37 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/app/templates/home.html b/app/templates/home.html
index da580ef..8c8fd56 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -66,7 +66,7 @@
 {% block sidebar %}
     <div class="panel panel-primary navigation">
         <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 b5d0b15..53d3356 100644
--- a/app/templates/home_student.html
+++ b/app/templates/home_student.html
@@ -45,7 +45,7 @@
     {% 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
@@ -53,7 +53,7 @@
     </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
@@ -61,10 +61,10 @@
     </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/app/templates/home_teacher_student_content.html b/app/templates/home_teacher_student_content.html
index f3b0289..6f84162 100644
--- a/app/templates/home_teacher_student_content.html
+++ b/app/templates/home_teacher_student_content.html
@@ -11,7 +11,7 @@
         </div>
         <div class="col-xs-10 col-md-11">
             <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
-            <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id  %}">{{ notification.action_resource.resource.name }}</a></p>
+            <p class="resource_inline">{{notification.message}} {% trans 'at' %} : <a href="{% url 'core:notification_read' notification.id  %}">{{ notification.action_resource.resource.name }}</a></p>
             <p class="timePost"><i> {{ notification.datetime|timesince }} {% trans "ago" %}  </i></p>
         </div>
     </div>
diff --git a/core/templates/base.html b/core/templates/base.html
index 3ee67dc..56ad2f4 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -70,14 +70,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>
@@ -130,12 +130,12 @@
 
 						<div class="panel panel-primary navigation">
 						    <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>
diff --git a/core/templates/guest.html b/core/templates/guest.html
index a01abcf..cdfbeba 100644
--- a/core/templates/guest.html
+++ b/core/templates/guest.html
@@ -64,14 +64,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>
@@ -92,7 +92,7 @@
     			{% block sidebar %}
     				<div class="panel panel-primary navigation">
 				        <div class="panel-heading">
-				            <h4>Menu</h4>
+				            <h4>{% trans 'Menu' %}</h4>
 				        </div>
 				        <div class="panel-body">
 				            <ul class="nav nav-pills nav-stacked">
@@ -121,7 +121,7 @@
 
 				<div class="col-md-12">
 					<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 %}
@@ -144,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>
diff --git a/core/templates/lembrar_senha.html b/core/templates/lembrar_senha.html
index 3cf49cf..eaa598f 100644
--- a/core/templates/lembrar_senha.html
+++ b/core/templates/lembrar_senha.html
@@ -37,7 +37,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 
 
 
-	<title>Projeto Amadeus</title>
+	<title>{% trans 'Amadeus Project' %}</title>
 
 	<meta http-equiv="Cache-Control" content="no-cache, no-store" />
 
@@ -62,7 +62,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 					<form name="logonForm" method="post" action="/amadeuslms/validateLogin.do">
 			  		<dt><input type="text" name="login" maxlength="15" size="15" value="" class="inputlogin"> </dt>
 	      			<dt><input type="password" name="password" maxlength="15" size="15" value="" class="inputlogin">&nbsp;
-						<br /><a href="{% url 'index' %}" name="logonForm" class="button">Entrar</a></dt>
+						<br /><a href="{% url 'index' %}" name="logonForm" class="button">{% trans 'Enter' %}</a></dt>
 		            </form>
 <script type="text/javascript" language="JavaScript">
   <!--
@@ -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">O Projeto</a></span>
+	<span><a href="/amadeuslms/fProject.do" target="_blank">{% trans 'O Projeto' %}</a></span>
 	<span>&nbsp;|&nbsp;</span>
-	<span><a href="/amadeuslms/fCCTE.do" target="_blank">Grupo CCTE</a></span>
+	<span><a href="/amadeuslms/fCCTE.do" target="_blank">{% trans 'Grupo CCTE' %}</a></span>
 </div>
 		<div id="pTitle" class="pTitle">
-			<h2>Lembrar senha</h2>
+			<h2>{% trans 'Lembrar senha' %}</h2>
 		</div>
 		<div id="pBreadCrumbs" class="pBreadCrumbs">
 			<ul id="breadcrumb">
-				<li><a href="{% url 'home' %}">Página Inicial</a></li>
-				<li>Lembrar senha</li>
+				<li><a href="{% url 'home' %}">{% trans 'Página Inicial' %}</a></li>
+				<li>{%trans 'Lembrar senha' %}</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">Nova conta</a></li>
+					<li><a href="{% url 'create_account' %}" class="insert">{% trans 'Nova conta' %}</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>Endereço de e-mail</dt>
+				<dt>{% trans 'Endereço de e-mail' %}</dt>
 					<dd><input type="text" name="email" value="" class="formfield2" id="username"></dd>
-					<dd class="description">Seu endereço de e-mail (exemplo@mail.com)</dd>
+					<dd class="description">{% trans 'Seu endereço de e-mail (exemplo@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>Copyright Amadeus. Todos os direitos reservados<dd></dl>
+	<dl><dd>{% trans 'Copyright Amadeus. Todos os direitos reservados' %}<dd></dl>
 </div>
 
 	</div>
diff --git a/core/templates/registration/passwor_reset_email.html b/core/templates/registration/passwor_reset_email.html
index ca9e5bd..336d504 100644
--- a/core/templates/registration/passwor_reset_email.html
+++ b/core/templates/registration/passwor_reset_email.html
@@ -1,14 +1,14 @@
-To initiate the password reset process for your {{ user.get_username }} TestSite Account,
-click the link below:
+{% trans 'To initiate the password reset process for your {{ user.get_username }} TestSite Account,
+click the link below:' %}
 
 {% block reset_link %}
 {{ protocol }}://{{ domain }}{% url 'core:password_reset_confirm' uidb64=uid token=token %}
 
 {% endblock %}
 
-If clicking the link above doesn't work, please copy and paste the URL in a new browser
+{% trans 'If clicking the link above doesnt work, please copy and paste the URL in a new browser
 window instead.
 
 
 Sincerely,
-Amadeus.
+Amadeus.' %}
diff --git a/core/templates/registration/password_reset_subject.txt b/core/templates/registration/password_reset_subject.txt
index 36292d6..40ef3f2 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 %}Password reset on {{ site_name }}{% endblocktrans %}
+{% blocktrans %}{% trans 'Password reset on' %} {{ site_name }}{% endblocktrans %}
 {% endautoescape %}
diff --git a/courses/templates/category/create.html b/courses/templates/category/create.html
index 994f926..15502b8 100644
--- a/courses/templates/category/create.html
+++ b/courses/templates/category/create.html
@@ -27,25 +27,25 @@
 
     <div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
+	        <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)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
+	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
+	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
 
 	<div class="panel panel-primary navigation">
 	    <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>
diff --git a/courses/templates/category/index.html b/courses/templates/category/index.html
index 4b0dfcd..e4e7491 100644
--- a/courses/templates/category/index.html
+++ b/courses/templates/category/index.html
@@ -28,25 +28,25 @@
 
     <div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
+	        <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)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
+	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
+	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
 
 	<div class="panel panel-primary navigation">
 	    <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>
diff --git a/courses/templates/category/update.html b/courses/templates/category/update.html
index 7a243ba..e16b558 100644
--- a/courses/templates/category/update.html
+++ b/courses/templates/category/update.html
@@ -28,24 +28,24 @@
 
     <div class="panel panel-primary navigation">
 	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
+	        <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)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
+	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
+	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
+	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
 	<div class="panel panel-primary navigation">
 	    <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>
diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html
index 1fb31f1..376f4e6 100644
--- a/courses/templates/course/course_card.html
+++ b/courses/templates/course/course_card.html
@@ -28,10 +28,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/create.html b/courses/templates/course/create.html
index f934558..ee4f215 100644
--- a/courses/templates/course/create.html
+++ b/courses/templates/course/create.html
@@ -26,7 +26,7 @@
 										<input type="text" readonly="" class="form-control" placeholder="Choose your photo..."/>
 										<span class="input-group-btn input-group-sm">
 												<button type="button" class="btn btn-fab btn-fab-mini">
-														<i class="material-icons">attach_file</i>
+														<i class="material-icons">{% trans 'attach_file' %}</i>
 												</button>
 										</span>
 									</div>
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 0746002..587b249 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -33,7 +33,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/replicate.html b/courses/templates/course/replicate.html
index ec64011..25c7505 100644
--- a/courses/templates/course/replicate.html
+++ b/courses/templates/course/replicate.html
@@ -15,86 +15,86 @@
         <div class="card-body">
 					<form method="post" action="" enctype="multipart/form-data">{% csrf_token %}						
 							<div class="form-group  is-fileinput">
-								<label for="id_name">Name</label>
+								<label for="id_name">{% trans 'Name' %}</label>
 								
 								
 									<input class="form-control" id="id_name" maxlength="100" name="name" type="text" required="" value="{{course.name}}">
 								
-								<span class="help-block">Course name</span>
+								<span class="help-block">{% trans 'Course name' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_objectivies">Objectives</label>
+								<label for="id_objectivies">{% trans 'Objectives' %}</label>
 								
 									<textarea class="form-control" cols="80" id="id_objectivies" name="objectivies" rows="5">{{course.objectivies}}</textarea>
 								
-								<span class="help-block">Course objective</span>
+								<span class="help-block">{% trans 'Course objective' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_content">Content</label>
+								<label for="id_content">{% trans 'Content' %}</label>
 								
 								
 									<textarea class="form-control" cols="80" id="id_content" name="content" rows="5">{{course.content}}</textarea>
 								
-								<span class="help-block">Course modules</span>
+								<span class="help-block">{% trans 'Course modules' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_max_students">Number of studets maximum</label>
+								<label for="id_max_students">{% trans 'Number of studets maximum' %}</label>
 								
 								
 									<input class="form-control" id="id_max_students" min="0" name="max_students" type="number" value="{{course.max_students}}">
 								
-								<span class="help-block">Max number of students that a class can have</span>
+								<span class="help-block">{% trans 'Max number of students that a class can have' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_init_register_date">Course registration start date</label>
+								<label for="id_init_register_date">{% trans 'Course registration start date' %}</label>
 								
 								
 									<input type="date" class="form-control" name="init_register_date" value="None" min="2016-10-24">
 								
-								<span class="help-block">Date that starts the registration period of the course (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that starts the registration period of the course (dd/mm/yyyy)' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_end_register_date">Course registration end date</label>
+								<label for="id_end_register_date">{% trans 'Course registration end date' %}</label>
 								
 								
 									<input type="date" class="form-control" name="end_register_date" value="None" min="2016-10-24">
 								
-								<span class="help-block">Date that ends the registration period of the course (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that ends the registration period of the course (dd/mm/yyyy)' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_init_date">Course start date</label>
+								<label for="id_init_date">{% trans 'Course start date' %}</label>
 								
 								
 									<input type="date" class="form-control" name="init_date" value="None" min="2016-10-24">
 								
-								<span class="help-block">Date that the course starts (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that the course starts (dd/mm/yyyy)' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_end_date">Course end date</label>
+								<label for="id_end_date">{% trans 'Course end date' %}</label>
 								
 								
 									<input type="date" class="form-control" name="end_date" value="None" min="2016-10-24">
 								
-								<span class="help-block">Date that the course ends (dd/mm/yyyy)</span>
+								<span class="help-block">{% trans 'Date that the course ends (dd/mm/yyyy)' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_image">Imagem</label>
+								<label for="id_image">{% trans 'Imagem' %}</label>
 								
 								
 									<input class="form-control" id="id_image" name="image" type="file">
@@ -102,17 +102,17 @@
 										<input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
 										<span class="input-group-btn input-group-sm">
 												<button type="button" class="btn btn-fab btn-fab-mini">
-														<i class="material-icons">attach_file</i>
+														<i class="material-icons">{% trans 'attach_file' %}</i>
 												</button>
 										</span>
 									</div>
 								
-								<span class="help-block">Representative image of the course</span>
+								<span class="help-block">{% trans 'Representative image of the course' %}</span>
 								
 							</div>
 						
 							<div class="form-group  is-fileinput">
-								<label for="id_category">CourseCategory</label>
+								<label for="id_category">{% trans 'CourseCategory' %}</label>
 								
 								
 									<select class="form-control" id="id_category" name="category" required="">
@@ -121,7 +121,7 @@
 										{% endfor %}
 									</select>
 								
-								<span class="help-block">CourseCategory which the course belongs</span>
+								<span class="help-block">{% trans 'CourseCategory which the course belongs' %}</span>
 								
 							</div>
 						
diff --git a/courses/templates/course/update.html b/courses/templates/course/update.html
index 8071a36..7a34228 100644
--- a/courses/templates/course/update.html
+++ b/courses/templates/course/update.html
@@ -25,7 +25,7 @@
 							<input type="text" readonly="" class="form-control" placeholder="Choose your photo..."/>
 							<span class="input-group-btn input-group-sm">
 									<button type="button" class="btn btn-fab btn-fab-mini">
-											<i class="material-icons">attach_file</i>
+											<i class="material-icons">{% trans 'attach_file' %}</i>
 									</button>
 							</span>
 						</div>
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index dcc5d26..844412d 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -50,10 +50,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>
@@ -126,8 +126,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>
@@ -179,8 +179,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_teacher.html b/courses/templates/subject/form_view_teacher.html
index fdffa4c..c87d806 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -49,13 +49,13 @@
             <div class="row">
               <div class="col-xs-6 col-md-6">
                 <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<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
+                        <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
                         <li>
                             <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
                                 {% trans "Create a file" %}
@@ -76,7 +76,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">
@@ -100,23 +100,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" %}
@@ -136,13 +136,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>
@@ -156,8 +156,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>
@@ -174,11 +174,11 @@
             <h4 class="modal-title"></h4>
           </div>
           <div class="modal-body">
-            <p>Delete your Topic?</p>
+            <p>{% trans 'Delete your Topic?' %}</p>
           </div>
           <div class="modal-footer">
 
-            <a href="" target="_self"><button type="button" class="btn btn-primary">Confirm</button></a>
+            <a href="" target="_self"><button type="button" class="btn btn-primary">{% trans 'Confirm' %}</button></a>
 
           </div>
         </div>
@@ -197,32 +197,32 @@
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-            <h4 class="modal-title" id="myModalLabel">Material EMBED</h4>
+            <h4 class="modal-title" id="myModalLabel">{% trans 'Material EMBED' %}</h4>
           </div>
           <div class="modal-body">
             <div class="form-group is-empty">
-              <label for="inputEmail" class="col-md-2 control-label">Name:</label>
+              <label for="inputEmail" class="col-md-2 control-label">{% trans 'Name' %}:</label>
               <div class="col-md-10">
                 <input type="text" class="form-control" id="inputEmail" placeholder="Name">
               </div>
             </div>
             <form class="form-horizontal">
               <div class="form-group is-empty">
-                <label for="textArea" class="col-md-2 control-label">Code:</label>
+                <label for="textArea" class="col-md-2 control-label">{% trans 'Code' %}:</label>
 
                 <div class="col-md-10">
                     <textarea class="form-control" rows="2" id="textArea"></textarea>
-                    <span class="help-block">Material description</span>
+                    <span class="help-block">{% trans 'Material description' %}</span>
                 </div>
               </div>
               <div class="form-group is-empty">
-              <label for="number" class="col-md-2 control-label">Height</label>
+              <label for="number" class="col-md-2 control-label">{% trans '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">Weight</label>
+              <label for="number" class="col-md-2 control-label">{% trans 'Weight' %}</label>
                 <div class="col-md-4">
                   <input type="number" class="form-control" id="inputNumber" placeholder="Weight">
                 </div>
@@ -235,7 +235,7 @@
             <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">Close</button>-->
 
             <!-- Put curtom buttons here!!!  -->
-            <button type="button" class="btn btn-primary btn-raised">Confirm</button>
+            <button type="button" class="btn btn-primary btn-raised">{% trans 'Confirm' %}</button>
           </div>
         </div>
       </div>
@@ -254,27 +254,27 @@
             <form class="form-horizontal">
 
           <fieldset>
-            <legend>Atividade Proposta</legend>
+            <legend>{% trans 'Atividade Proposta' %}</legend>
             <div class="form-group is-empty">
-              <label for="NameIn" class="col-md-2 control-label">Name:</label>
+              <label for="NameIn" class="col-md-2 control-label">{% trans 'Name' %}:</label>
               <div class="col-md-10">
                 <input type="text" id="NameIn" class="form-control">
               </div>
             </div>
             <div class="form-group is-empty">
-              <label for="DescIn" class="col-md-2 control-label">Describe:</label>
+              <label for="DescIn" class="col-md-2 control-label">{% trans 'Describe' %}:</label>
               <div class="col-md-10">
                 <textarea class="form-control" id="DescIn" rows="2"></textarea>
               </div>
             </div>
             <div class="form-group is-empty">
-              <label for="DateIn" class="col-md-2 control-label">Opening: </label>
+              <label for="DateIn" class="col-md-2 control-label">{% trans 'Opening' %}: </label>
               <div class="col-md-10">
                 <input type="text" id="DateIn" class="form-control date-picker" requerid="">
               </div>
             </div>
             <div class="form-group is-empty">
-              <label for="DateIn" class="col-md-2 control-label">Ending: </label>
+              <label for="DateIn" class="col-md-2 control-label">{% trans 'Ending' %}: </label>
               <div class="col-md-10">
                 <input type="text" id="DateIn" class="form-control date-picker" requerid="">
               </div>
@@ -283,15 +283,15 @@
               <div class="col-md-offset-2 col-md-10">
                 <div class="checkbox">
                   <label>
-                    <input type="checkbox"><span class="checkbox-material"><span class="check"></span></span> Send Later
+                    <input type="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Send Later' %}
                   </label>
                 </div>
               </div>
             </div>
             <div class="form-group">
               <div class="col-md-10 col-md-offset-2">
-                <button type="button" class="btn btn-default">Cancel</button>
-                <button type="submit" class="btn btn-primary">Submit</button>
+                <button type="button" class="btn btn-default">{% trans 'Cancel' %}</button>
+                <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
               </div>
             </div>
 
diff --git a/courses/templates/subject/poll_item_actions.html b/courses/templates/subject/poll_item_actions.html
index 5aa87b8..a5942f2 100644
--- a/courses/templates/subject/poll_item_actions.html
+++ b/courses/templates/subject/poll_item_actions.html
@@ -6,9 +6,9 @@
 {% for poll in polls %}
   {% professor_subject poll.topic.subject request.user as permission%}
   {% if permission %}
-    <li id="poll_{{poll.slug}}"><i class="material-icons">poll</i> <a href="javascript:modal.get('{% url 'course:poll:update_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a><a href="javascript:modal.get('{% url 'course:poll:delete_poll' poll.slug %}','#poll','#modal_poll');"><span class="glyphicon glyphicon-remove"></span></a></li>
+    <li id="poll_{{poll.slug}}"><i class="material-icons">{% trans 'poll' %}</i> <a href="javascript:modal.get('{% url 'course:poll:update_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a><a href="javascript:modal.get('{% url 'course:poll:delete_poll' poll.slug %}','#poll','#modal_poll');"><span class="glyphicon glyphicon-remove"></span></a></li>
   {% else %}
-    <li id="poll_{{poll.slug}}"><i class="material-icons">poll</i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a></li>
+    <li id="poll_{{poll.slug}}"><i class="material-icons">{% trans 'poll' %}</i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a></li>
   {% endif %}
   {% endfor %}
 {# <button class="btn btn-primary btn-raised" onclick="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans '+ Create Poll' %}</button> #}
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index 41f599c..014980c 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -34,15 +34,15 @@
     {% if user|has_role:'professor' %}
       <div class="panel panel-primary navigation">
       <div class="panel-heading">
-          <h3 class="panel-title">Actions</h3>
+          <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)">Participants</a></li>
-              <li><a href="javascript:void(0)">Replicate subject</a></li>
-              <li><a href="javascript:void(0)">Create subject</a></li>
-              <li><a href="javascript:void(0)">Edit subject</a></li>
-              <li><a href="javascript:void(0)">Remove subject</a></li>
+              <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>
@@ -109,12 +109,12 @@
                     <div class="panel-body">
                      <div class="row">
                       <div class="col-md-4">
-                       <i class="fa fa-file-archive-o fa-lg" aria-hidden="true">Atividade.doc</i>
+                       <i class="fa fa-file-archive-o fa-lg" aria-hidden="true">{% trans 'Atividade.doc' %}</i>
                      </div>
 										 {% professor_subject subject user as permi_test%}
                      {% if permi_test %}
                         <div class="col-md-4">
-                          <label> Nota:</label>
+                          <label> {% trans 'Nota' %}:</label>
                           <input type="number" step="0.01">
                         </div>
                       {% else %}
@@ -124,7 +124,7 @@
                         <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">Enviar</button>
+                        <button type="submit" class="btn btn-success" id="send_button">{% trans 'Enviar' %}</button>
                       </div>
                      {% endif %}
                   </div>
diff --git a/exam/templates/exam/gap_filling_question.html b/exam/templates/exam/gap_filling_question.html
index 1021842..2c76175 100644
--- a/exam/templates/exam/gap_filling_question.html
+++ b/exam/templates/exam/gap_filling_question.html
@@ -1,3 +1,3 @@
 <div class="form-group" id="gapFilling" style="display: none;">
-  <p>Gap Filling Question</p>
+  <p>{% trans 'Gap Filling Question' %}</p>
 </div>
diff --git a/exam/templates/exam/multiple_choice_question.html b/exam/templates/exam/multiple_choice_question.html
index d6e8c7c..bb5fb5f 100644
--- a/exam/templates/exam/multiple_choice_question.html
+++ b/exam/templates/exam/multiple_choice_question.html
@@ -1,6 +1,6 @@
 <div class="form-group" id="multipleChoice">
 
-  <label for="questionName" class="col-md-2 control-label">Question</label>
+  <label for="questionName" class="col-md-2 control-label">{% trans 'Question' %}</label>
 
 
   <div class="col-md-10">
@@ -10,7 +10,7 @@
 
 </div>
 <div class="form-group">
-  <label for="alternative" class="col-md-2 control-label">Alternatives</label>
+  <label for="alternative" class="col-md-2 control-label">{% trans 'Alternatives' %}</label>
   <div class="col-md-10" id="radios">
     <div class="radio radio-primary">
       <label>
@@ -29,7 +29,7 @@
 <!-- new alternative button -->
 <div class="form-group">
   <div class="col-md-12 col-md-offset-2">
-  <button type="button" class="btn btn-primary" id="newAlternative">New Alternative</button>
+  <button type="button" class="btn btn-primary" id="newAlternative">{% trans 'New Alternative' %]</button>
   </div>
 </div>
 <div class="form-group">
diff --git a/files/templates/files/create_file.html b/files/templates/files/create_file.html
index 71a3c66..d44aae4 100644
--- a/files/templates/files/create_file.html
+++ b/files/templates/files/create_file.html
@@ -65,14 +65,14 @@
 
                             <div class="form-group">
                                 <div class="col-md-12 text-center">
-                                    <p><b>The file size shouldn't exceed 10MB</b></p>
+                                    <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
                                 </div>
                             </div>
 
                             <div class="form-group">
                                 <div class="col-md-12">
                                      <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">Submit</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
                                 </div>
                             </div>
                         </fieldset>
diff --git a/files/templates/files/delete_file.html b/files/templates/files/delete_file.html
index f9a2b77..e882825 100644
--- a/files/templates/files/delete_file.html
+++ b/files/templates/files/delete_file.html
@@ -32,7 +32,7 @@
                             <div class="form-group">
                                 <div class="col-md-12">
                                      <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">Delete</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
                                 </div>
                             </div>
                         </fieldset>
diff --git a/files/templates/files/update_file.html b/files/templates/files/update_file.html
index 8777431..1cc6aed 100644
--- a/files/templates/files/update_file.html
+++ b/files/templates/files/update_file.html
@@ -70,14 +70,14 @@
 
                             <div class="form-group">
                                 <div class="col-md-12 text-center">
-                                    <p><b>The file size shouldn't exceed 10MB</b></p>
+                                    <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
                                 </div>
                             </div>
 
                             <div class="form-group">
                                 <div class="col-md-12">
                                      <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">Submit</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
                                 </div>
                             </div>
                         </fieldset>
diff --git a/forum/templates/forum/forum_list.html b/forum/templates/forum/forum_list.html
index 17ea290..c604acf 100644
--- a/forum/templates/forum/forum_list.html
+++ b/forum/templates/forum/forum_list.html
@@ -56,7 +56,7 @@
                     {% endif %}
                     <span class="input-group-btn">
                         <button type="submit" class="btn btn-fab btn-fab-mini">
-                            <i class="material-icons">send</i>
+                            <i class="material-icons">{% trans 'send' %}</i>
                         </button>
                     </span>
                 </div>
diff --git a/forum/templates/forum/forum_view.html b/forum/templates/forum/forum_view.html
index f19b088..71d2119 100644
--- a/forum/templates/forum/forum_view.html
+++ b/forum/templates/forum/forum_view.html
@@ -88,7 +88,7 @@
                                     {% endif %}
                                     <span class="input-group-btn">
                                         <button type="submit" class="btn btn-fab btn-fab-mini">
-                                            <i class="material-icons">send</i>
+                                            <i class="material-icons">{% trans 'send' %}</i>
                                         </button>
                                     </span>
                                 </div>
diff --git a/forum/templates/post/post_list.html b/forum/templates/post/post_list.html
index d448b01..7a1cdaf 100644
--- a/forum/templates/post/post_list.html
+++ b/forum/templates/post/post_list.html
@@ -8,7 +8,7 @@
                     {{ post.user }}
                     <div class="pull-right">
                         <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
-                            <i class="material-icons">reply</i>
+                            <i class="material-icons">{% trans 'reply' %}</i>
                         </a>
                         {% if request.user|has_role:'system_admin' or request.user == post.user %}
                             {% csrf_token %}
diff --git a/forum/templates/post/post_load_more_render.html b/forum/templates/post/post_load_more_render.html
index 0757a8d..11e5d74 100644
--- a/forum/templates/post/post_load_more_render.html
+++ b/forum/templates/post/post_load_more_render.html
@@ -8,7 +8,7 @@
                     {{ post.user }}
                     <div class="pull-right">
                         <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
-                            <i class="material-icons">reply</i>
+                            <i class="material-icons">{% trans 'reply' %}</i>
                         </a>
                         {% if request.user|has_role:'system_admin' or request.user == post.user %}
                             {% csrf_token %}
diff --git a/forum/templates/post/post_render.html b/forum/templates/post/post_render.html
index bf0f1f1..cf677ca 100644
--- a/forum/templates/post/post_render.html
+++ b/forum/templates/post/post_render.html
@@ -6,7 +6,7 @@
             {{ post.user }}
             <div class="pull-right">
                 <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
-                    <i class="material-icons">reply</i>
+                    <i class="material-icons">{% trans 'reply' %}</i>
                 </a>
                 {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user == post.user %}
                     {% csrf_token %}
diff --git a/forum/templates/post_answers/post_answer_form.html b/forum/templates/post_answers/post_answer_form.html
index 9e0b7ed..caa1ce2 100644
--- a/forum/templates/post_answers/post_answer_form.html
+++ b/forum/templates/post_answers/post_answer_form.html
@@ -35,7 +35,7 @@
 					{% else %}
 						<span class="input-group-btn">
 					        <button type="submit" class="btn btn-fab btn-fab-mini">
-					            <i class="material-icons">send</i>
+					            <i class="material-icons">{% trans 'send' %}</i>
 					        </button>
 					    </span>
 					{% endif %}
diff --git a/links/templates/links/create_link.html b/links/templates/links/create_link.html
index 67d63fa..5cac325 100644
--- a/links/templates/links/create_link.html
+++ b/links/templates/links/create_link.html
@@ -6,7 +6,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-        <h4 class="modal-title" id="createLink">Create a New Link</h4>
+        <h4 class="modal-title" id="createLink">{% trans 'Create a New Link' %}</h4>
       </div>
       <div class="modal-body">
         <!-- Card -->
@@ -31,8 +31,8 @@
             {% render_field field class='form-control' %}
         {% endfor %}
         <div class="form-group">
-          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">Cancel</a>
-          <button class="btn btn-raised btn-primary" type="submit">Submit</button>
+          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
+          <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %]</button>
         </div>
         <!-- .end Card -->
       </div>
diff --git a/links/templates/links/delete_link.html b/links/templates/links/delete_link.html
index 492f3c3..2d58d77 100644
--- a/links/templates/links/delete_link.html
+++ b/links/templates/links/delete_link.html
@@ -7,12 +7,12 @@
         <h4 class="modal-title"></h4>
       </div>
       <div class="modal-body">
-        <p>Do you really want to delete this link?</p>
+        <p>{% trans 'Do you really want to delete this link?' %}</p>
       </div>
       <div class="modal-footer">
         <!--  -->
-        <button type="button" class="btn btn-primary btn-default" data-dismiss="modal">Cancel</button>
-        <a href="http://www.google.com" target="_self"><button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Confirm</button></a>
+        <button type="button" class="btn btn-primary btn-default" data-dismiss="modal">{% trans 'Cancel' %}</button>
+        <a href="http://www.google.com" target="_self"><button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">{% trans 'Confirm' %}</button></a>
 
       </div>
     </div>
diff --git a/links/templates/links/update_link.html b/links/templates/links/update_link.html
index 094245b..4181778 100644
--- a/links/templates/links/update_link.html
+++ b/links/templates/links/update_link.html
@@ -4,25 +4,25 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-        <h4 class="modal-title" id="myModalLabel">Links</h4>
+        <h4 class="modal-title" id="myModalLabel">{% trans 'Links' %}</h4>
       </div>
       <div class="modal-body">
         <!-- Card -->
         <div class="form-group">
-          <label class="control-label" for="inputDefault">Name</label>
+          <label class="control-label" for="inputDefault">{% trans 'Name' %}</label>
           <input value="Python" type="text" class="form-control" id="inputDefault">
         </div>
         <div class="form-group">
-          <label class="control-label" for="inputDefault">Url</label>
+          <label class="control-label" for="inputDefault">{% trans 'URL' %}</label>
           <input value="https://www.python.org/" type="text" class="form-control" id="inputDefault">
         </div>
         <div class="form-group is-empty">
-          <label class="control-label" for="inputDefault">Descrição</label>
+          <label class="control-label" for="inputDefault">{% trans 'Descrição' %}</label>
           <textarea class="form-control" rows="3"></textarea>
         </div>
         <div class="form-group">
-          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">Cancel</a>
-          <a href="javascript:void(0)" class="btn btn-raised btn-primary">Submit</a>
+          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
+          <a href="javascript:void(0)" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
       </div>
         <!-- .end Card -->
       </div>
diff --git a/links/templates/links/view_link.html b/links/templates/links/view_link.html
index 5f1e4d1..049fe9c 100644
--- a/links/templates/links/view_link.html
+++ b/links/templates/links/view_link.html
@@ -5,7 +5,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-        <h4 class="modal-title" id="myModalLabel">Link</h4>
+        <h4 class="modal-title" id="myModalLabel">{% trans 'Link' %}</h4>
       </div>
       <div class="modal-body">
         <!-- Card -->
@@ -14,7 +14,7 @@
            <div class="card-block">
               <b class="card-title">{{link.name}}</b><p></p>
               <p class="card-text"> </p><p>{{link.link_description}}</p>
-              <a href="{{ link.link_url }}" class="btn btn-primary">Read more</a>
+              <a href="{{ link.link_url }}" class="btn btn-primary">{% trans 'Read more' %}</a>
            </div>
         </article>
         <!-- .end Card -->
diff --git a/users/templates/list_users.html b/users/templates/list_users.html
index c66ae6a..5651136 100644
--- a/users/templates/list_users.html
+++ b/users/templates/list_users.html
@@ -12,7 +12,7 @@
 {% block sidebar %}
     <div class="panel panel-primary navigation">
         <div class="panel-heading">
-            <h5>Menu</h5>
+            <h5>{% trans 'Menu' %}</h5>
         </div>
         <div class="panel-body">
             <ul class="nav nav-pills nav-stacked">
@@ -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">Search</i>
                 </button>
             </div>
         </div>
@@ -81,14 +81,14 @@
                         <div class="modal-content">
                           <div class="modal-header">
                             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                            <h4 class="modal-title" id="DeleteModalLabel">Confirm delete</h4>
+                            <h4 class="modal-title" id="DeleteModalLabel">{% trans 'Confirm delete' %}</h4>
                           </div>
                           <div class="modal-body">
-                            Are you sure you want to delete the user <b>{{acc.name}}</b>?                          
+                            {% trans 'Are you sure you want to delete the user' %} <b>{{acc.name}}</b>?                          
                           </div>
                           <div class="modal-footer">
-                            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>                         
-                            <button type="button" class="btn btn-primary"> <a href="{% url 'users:delete' acc.username %}">Delete</a></button>
+                            <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Cancel' %}</button>                         
+                            <button type="button" class="btn btn-primary"> <a href="{% url 'users:delete' acc.username %}">{% trans 'Delete' %}</a></button>
                           </div>
                         </div>
                       </div>
diff --git a/users/templates/users/remove_account.html b/users/templates/users/remove_account.html
index 22d762f..b1c4c2e 100644
--- a/users/templates/users/remove_account.html
+++ b/users/templates/users/remove_account.html
@@ -25,8 +25,8 @@
     <div class="row">
      <div class="col-md-12">
       <div class="well well-lg">
-        <h2>Voce tem certeza que deseja remover esta conta?</h2>
-        <p>Todos os seus dados serão removidos e não haverá como recupera-los posteriormente.</p>
+        <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>
         <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>
--
libgit2 0.21.2