diff --git a/AUTHORS b/AUTHORS
index 20719b5af7..b58c1853c8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -87,4 +87,4 @@ Miles Steele <miles@milessteele.com>
 Kevin Luo <kevluo@edx.org>
 Akshay Jagadeesh <akjags@gmail.com>
 Marko Seric <marko.seric@math.uzh.ch>
-
+Felipe Montoya <felipe.montoya@edunext.co>
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 8de38022b7..88b911a745 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -21,6 +21,7 @@ from xmodule.exceptions import NotFoundError, ProcessingError
 from xblock.fields import Scope, String, Boolean, Dict, Integer, Float
 from .fields import Timedelta, Date
 from django.utils.timezone import UTC
+from django.utils.translation import ugettext as _
 
 log = logging.getLogger("mitx.courseware")
 
@@ -348,7 +349,7 @@ class CapaModule(CapaFields, XModule):
         else:
             final_check = False
 
-        return "Final Check" if final_check else "Check"
+        return _("Final Check") if final_check else _("Check")
 
     def should_show_check_button(self):
         """
diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem_content.html b/common/lib/xmodule/xmodule/js/fixtures/problem_content.html
index 5ccce952e7..2ca5d8d23f 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/problem_content.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/problem_content.html
@@ -1,10 +1,10 @@
-<h2 class="problem-header">Problem Header</h2>
+<h2 class="problem-header">${_("Problem Header")}</h2>
 
 <section class='problem-progress'>
 </section>
 
 <section class="problem">
-  <p>Problem Content</p>
+  <p>${_("Problem Content")}</p>
 
   <section class="action">
     <input type="hidden" name="problem_id" value="1">
@@ -13,11 +13,11 @@
     <span id="display_example_1"></span>
     <span id="input_example_1_dynamath"></span>
 
-    <input class="check" type="button" value="Check">
-    <input class="reset" type="button" value="Reset">
-    <input class="save" type="button" value="Save">
-    <button class="show"><span class="show-label">Show Answer(s)</span> <span class="sr">(for question(s) above - adjacent to each field)</span></button>
-    <a href="/courseware/6.002_Spring_2012/${ explain }" class="new-page">Explanation</a>
+    <input class="check" type="button" value="${_('Check')}">
+    <input class="reset" type="button" value="${_('Reset')}">
+    <input class="save" type="button" value="${_('Save')}">
+    <button class="show"><span class="show-label">${_("Show Answer(s)")}</span> <span class="sr">(for question(s) above - adjacent to each field)</span></button>
+    <a href="/courseware/6.002_Spring_2012/${ explain }" class="new-page">${_("Explanation")}</a>
     <section class="submission_feedback"></section>
   </section>
 </section>
diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index 749a7004aa..2efc7e1344 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -56,7 +56,7 @@ import track.views
 from mitxmako.shortcuts import render_to_string
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
-
+from django.utils.translation import ugettext as _u
 
 from bulk_email.models import CourseEmail
 from html_to_text import html_to_text
@@ -108,7 +108,7 @@ def instructor_dashboard(request, course_id):
     # assemble some course statistics for output to instructor
     def get_course_stats_table():
         datatable = {'header': ['Statistic', 'Value'],
-                     'title': 'Course Statistics At A Glance',
+                     'title': _u('Course Statistics At A Glance'),
                      }
         data = [['# Enrolled', CourseEnrollment.objects.filter(course_id=course_id, is_active=1).count()]]
         data += [['Date', timezone.now().isoformat()]]
diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html
index 799b10b36b..303a12f142 100644
--- a/lms/templates/courseware/course_navigation.html
+++ b/lms/templates/courseware/course_navigation.html
@@ -47,9 +47,9 @@ masq = (function(){
     var el = $('#staffstatus');
     var setstat = function(status){
         if (status=='student'){
-            el.html('<font color="green">Student view</font>');
+            el.html('<font color="green">${_("Student view")}</font>');
         }else{
-            el.html('<font color="red">Staff view</font>');
+            el.html('<font color="red">${_("Staff view")}</font>');
         }
     }
     setstat('${masquerade}');
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 34fce25644..0a5892e3ea 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -368,7 +368,7 @@
       <input name="course_id" id="email_settings_course_id" type="hidden" />
       <label>${_("Receive course emails")} <input type="checkbox" id="receive_emails" name="receive_emails" /></label>
       <div class="submit">
-        <input type="submit" id="submit" value="Save Settings" />
+        <input type="submit" id="submit" value="${_('Save Settings')}" />
       </div>
     </form>
     
@@ -389,7 +389,7 @@
       <input name="course_id" id="unenroll_course_id" type="hidden" />
       <input name="enrollment_action" type="hidden" value="unenroll" />
       <div class="submit">
-        <input name="submit" type="submit" value="Unregister" />
+        <input name="submit" type="submit" value="${_('Unregister')}" />
       </div>
     </form>
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html
index d2651d689f..9b4114d95c 100644
--- a/lms/templates/instructor/instructor_dashboard_2/course_info.html
+++ b/lms/templates/instructor/instructor_dashboard_2/course_info.html
@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%page args="section_data"/>
 
-<h2>Course Information</h2>
+<h2>${_("Course Information")}</h2>
 
 <div class="basic-data">
   ${_("Course Name")}:
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index d3fc66d5c6..aeb8608543 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -29,7 +29,7 @@
 
 <section class="container">
 <div class="instructor-dashboard-wrapper-2">
-<div class="olddash-button-wrapper"><a href="${ old_dashboard_url }"> Back to Standard Dashboard </a></div>
+<div class="olddash-button-wrapper"><a href="${ old_dashboard_url }"> ${_("Back to Standard Dashboard")} </a></div>
 <section class="instructor-dashboard-content-2">
 
   ## <h1>Instructor Dashboard</h1>
diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
index 2ccef2164c..6b6da617f6 100644
--- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html
+++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -19,7 +19,7 @@
   ##   <option>Getting problems...</option>
   ## </select>
 
-  <p> Specify a particular problem in the course here by its url: </p>
+  <p> ${_('Specify a particular problem in the course here by its url:')} </p>
   <input type="text" name="problem-select-single" placeholder="${_("Problem urlname")}">
   <p>
     ${_('You may use just the "urlname" if a problem, or "modulename/urlname" if not. (For example, if the location is {location1}, then just provide the {urlname1}. If the location is {location2}, then provide {urlname2}.)').format(
@@ -32,7 +32,7 @@
   <input type="button" name="reset-attempts-single" value="${_("Reset Student Attempts")}" data-endpoint="${ section_data['reset_student_attempts_url'] }">
 
   %if section_data['access']['instructor']:
-    <p> You may also delete the entire state of a student for the specified module: </p>
+    <p> ${_('You may also delete the entire state of a student for the specified module:')} </p>
     <input type="button" class="molly-guard" name="delete-state-single" value="${_("Delete Student State for Module")}" data-endpoint="${ section_data['reset_student_attempts_url'] }">
   %endif
 
@@ -54,7 +54,7 @@
 
 %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']:
   <div class="course-specific-container action-type-container">
-    <H2>Course-specific grade adjustment</h2>
+    <H2>${_('Course-specific grade adjustment')}</h2>
     <div class="request-response-error"></div>
 
     <p>