diff --git a/cms/djangoapps/contentstore/management/commands/generate_courses.py b/cms/djangoapps/contentstore/management/commands/generate_courses.py
new file mode 100644
index 0000000000..475e22801d
--- /dev/null
+++ b/cms/djangoapps/contentstore/management/commands/generate_courses.py
@@ -0,0 +1,160 @@
+"""
+Django management command to generate a test course from a course config json
+"""
+import json
+import logging
+
+from django.contrib.auth.models import User
+from django.core.management.base import BaseCommand, CommandError
+
+from contentstore.management.commands.utils import user_from_str
+from contentstore.views.course import create_new_course_in_store
+from openedx.core.djangoapps.credit.models import CreditProvider
+from xmodule.course_module import CourseFields
+from xmodule.fields import Date
+from xmodule.modulestore.exceptions import DuplicateCourseError
+from xmodule.tabs import CourseTabList
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+    """ Generate a basic course """
+    help = 'Generate courses on studio from a json list of courses'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            'courses_json',
+        )
+
+    def handle(self, *args, **options):
+        try:
+            courses = json.loads(options["courses_json"])["courses"]
+        except ValueError:
+            raise CommandError("Invalid JSON object")
+        except KeyError:
+            raise CommandError("JSON object is missing courses list")
+
+        for course_settings in courses:
+            # Validate course
+            if not self._course_is_valid(course_settings):
+                logger.warning("Can't create course, proceeding to next course")
+                continue
+
+            # Retrieve settings
+            org = course_settings["organization"]
+            num = course_settings["number"]
+            run = course_settings["run"]
+            user_email = course_settings["user"]
+            try:
+                user = user_from_str(user_email)
+            except User.DoesNotExist:
+                logger.warning(user_email + " user does not exist")
+                logger.warning("Can't create course, proceeding to next course")
+                continue
+            fields = self._process_course_fields(course_settings["fields"])
+
+            # Create the course
+            try:
+                new_course = create_new_course_in_store("split", user, org, num, run, fields)
+                logger.info("Created {}".format(unicode(new_course.id)))
+            except DuplicateCourseError:
+                logger.warning("Course already exists for %s, %s, %s", org, num, run)
+
+            # Configure credit provider
+            if ("enrollment" in course_settings) and ("credit_provider" in course_settings["enrollment"]):
+                credit_provider = course_settings["enrollment"]["credit_provider"]
+                if credit_provider is not None:
+                    CreditProvider.objects.get_or_create(
+                        provider_id=credit_provider,
+                        display_name=credit_provider
+                    )
+
+    def _process_course_fields(self, fields):
+        """ Returns a validated list of course fields """
+        all_fields = CourseFields.__dict__.keys()
+        non_course_fields = [
+            "__doc__",
+            "__module__",
+            "__weakref__",
+            "__dict__"
+        ]
+        for field in non_course_fields:
+            all_fields.remove(field)
+
+        # Non-primitive course fields
+        date_fields = [
+            "certificate_available_date",
+            "announcement",
+            "enrollment_start",
+            "enrollment_end",
+            "start",
+            "end"
+        ]
+        course_tab_list_fields = [
+            "tabs"
+        ]
+
+        for field in dict(fields):
+            if field not in all_fields:
+                # field does not exist as a CourseField
+                del fields[field]
+                logger.info(field + "is not a valid CourseField")
+            elif fields[field] is None:
+                # field is unset
+                del fields[field]
+            elif field in date_fields:
+                # Generate Date object from the json value
+                try:
+                    date_json = fields[field]
+                    fields[field] = Date().from_json(date_json)
+                    logger.info(field + " has been set to " + date_json)
+                except Exception:  # pylint: disable=broad-except
+                    logger.info("The date string could not be parsed for " + field)
+                    del fields[field]
+            elif field in course_tab_list_fields:
+                # Generate CourseTabList object from the json value
+                try:
+                    course_tab_list_json = fields[field]
+                    fields[field] = CourseTabList().from_json(course_tab_list_json)
+                    logger.info(field + " has been set to " + course_tab_list_json)
+                except Exception:  # pylint: disable=broad-except
+                    logger.info("The course tab list string could not be parsed for " + field)
+                    del fields[field]
+            else:
+                # CourseField is valid and has been set
+                logger.info(field + " has been set to " + str(fields[field]))
+
+        for field in all_fields:
+            if field not in fields:
+                logger.info(field + " has not been set")
+        return fields
+
+    def _course_is_valid(self, course):
+        """ Returns true if the course contains required settings """
+        is_valid = True
+
+        # Check course settings
+        required_course_settings = [
+            "organization",
+            "number",
+            "run",
+            "fields",
+            "user"
+        ]
+        for setting in required_course_settings:
+            if setting not in course:
+                logger.warning("Course json is missing " + setting)
+                is_valid = False
+
+        # Check fields settings
+        required_field_settings = [
+            "display_name"
+        ]
+        if "fields" in course:
+            for setting in required_field_settings:
+                if setting not in course["fields"]:
+                    logger.warning("Fields json is missing " + setting)
+                    is_valid = False
+
+        return is_valid
diff --git a/cms/djangoapps/contentstore/management/commands/generate_test_course.py b/cms/djangoapps/contentstore/management/commands/generate_test_course.py
deleted file mode 100644
index cd386aa24e..0000000000
--- a/cms/djangoapps/contentstore/management/commands/generate_test_course.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-Django management command to generate a test course in a specific modulestore
-"""
-import json
-
-from django.contrib.auth.models import User
-from django.core.management.base import BaseCommand, CommandError
-
-from contentstore.management.commands.utils import user_from_str
-from contentstore.views.course import create_new_course_in_store
-from xmodule.modulestore import ModuleStoreEnum
-from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
-
-
-class Command(BaseCommand):
-    """ Generate a basic course """
-    help = 'Generate a course with settings on studio'
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            'json',
-            help='JSON object with values for store, user, name, organization, number, fields'
-        )
-
-    def handle(self, *args, **options):
-
-        if options["json"] is None:
-            raise CommandError("Must pass in JSON object")
-
-        try:
-            settings = json.loads(options["json"])
-        except ValueError:
-            raise CommandError("Invalid JSON")
-
-        if not(all(key in settings for key in ("store", "user", "organization", "number", "run", "fields"))):
-            raise CommandError("JSON object is missing required fields")
-
-        if settings["store"] in [ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split]:
-            store = settings["store"]
-        else:
-            raise CommandError("Modulestore invalid_store is not valid")
-
-        try:
-            user = user_from_str(settings["user"])
-        except User.DoesNotExist:
-            raise CommandError("User {user} not found".format(user=settings["user"]))
-
-        org = settings["organization"]
-        num = settings["number"]
-        run = settings["run"]
-        fields = settings["fields"]
-
-        # Create the course
-        new_course = create_new_course_in_store(store, user, org, num, run, fields)
-        self.stdout.write(u"Created {}".format(unicode(new_course.id)))
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py b/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py
index 4fd4004fbb..4824779dab 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py
@@ -4,7 +4,7 @@ or with filename which starts with "._")
 """
 from django.core.management import call_command
 
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from xmodule.contentstore.content import XASSET_LOCATION_TAG
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
@@ -44,7 +44,7 @@ class ExportAllCourses(ModuleStoreTestCase):
             verbose=True
         )
 
-        course = self.module_store.get_course(SlashSeparatedCourseKey('edX', 'dot-underscore', '2014_Fall'))
+        course = self.module_store.get_course(CourseKey.from_string('/'.join(['edX', 'dot-underscore', '2014_Fall'])))
         self.assertIsNotNone(course)
 
         # check that there are two assets ['example.txt', '.example.txt'] in contentstore for imported course
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_delete_course.py b/cms/djangoapps/contentstore/management/commands/tests/test_delete_course.py
index 28a26b41ed..c4ad14c8e9 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_delete_course.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_delete_course.py
@@ -4,7 +4,7 @@ Unittests for deleting a course in an chosen modulestore
 
 import mock
 
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from django.core.management import call_command, CommandError
 from django.contrib.auth.models import User
 from contentstore.tests.utils import CourseTestCase
@@ -54,14 +54,14 @@ class DeleteCourseTest(CourseTestCase):
         """
         Testing if the entered course was deleted
         """
-
+        course_key = CourseKey.from_string('/'.join(["TestX", "TS01", "2015_Q1"]))
         #Test if the course that is about to be deleted exists
-        self.assertIsNotNone(modulestore().get_course(SlashSeparatedCourseKey("TestX", "TS01", "2015_Q1")))
+        self.assertIsNotNone(modulestore().get_course(course_key))
 
         with mock.patch(self.YESNO_PATCH_LOCATION) as patched_yes_no:
             patched_yes_no.return_value = True
             call_command('delete_course', 'TestX/TS01/2015_Q1')
-            self.assertIsNone(modulestore().get_course(SlashSeparatedCourseKey("TestX", "TS01", "2015_Q1")))
+            self.assertIsNone(modulestore().get_course(course_key))
 
     def test_course_deletion_with_keep_instructors(self):
         """
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_generate_courses.py b/cms/djangoapps/contentstore/management/commands/tests/test_generate_courses.py
new file mode 100644
index 0000000000..aa83b9d7ce
--- /dev/null
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_generate_courses.py
@@ -0,0 +1,170 @@
+"""
+Unittest for generate a test course in an given modulestore
+"""
+import json
+
+import ddt
+import mock
+from django.core.management import CommandError, call_command
+
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+
+
+@ddt.ddt
+class TestGenerateCourses(ModuleStoreTestCase):
+    """
+    Unit tests for creating a course in split store via command line
+    """
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    def test_generate_course_in_stores(self, mock_logger):
+        """
+        Test that a course is created successfully
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": str(self.user.email),
+            "fields": {"display_name": "test-course", "announcement": "2010-04-20T20:08:21.634121"}
+        }]}
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        key = modulestore().make_course_key("test-course-generator", "1", "1")
+        self.assertTrue(modulestore().has_course(key))
+        mock_logger.info.assert_any_call("Created course-v1:test-course-generator+1+1")
+        mock_logger.info.assert_any_call("announcement has been set to 2010-04-20T20:08:21.634121")
+        mock_logger.info.assert_any_call("display_name has been set to test-course")
+
+    def test_invalid_json(self):
+        """
+        Test that providing an invalid JSON object will result in the appropriate command error
+        """
+        with self.assertRaisesRegexp(CommandError, "Invalid JSON object"):
+            arg = "invalid_json"
+            call_command("generate_courses", arg)
+
+    def test_missing_courses_list(self):
+        """
+        Test that a missing list of courses in json will result in the appropriate command error
+        """
+        with self.assertRaisesRegexp(CommandError, "JSON object is missing courses list"):
+            settings = {}
+            arg = json.dumps(settings)
+            call_command("generate_courses", arg)
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    @ddt.data("organization", "number", "run", "fields")
+    def test_missing_course_settings(self, setting, mock_logger):
+        """
+        Test that missing required settings in JSON object will result in the appropriate error message
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": str(self.user.email),
+            "fields": {"display_name": "test-course"}
+        }]}
+        del settings["courses"][0][setting]
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        mock_logger.warning.assert_any_call("Course json is missing " + setting)
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    def test_invalid_user(self, mock_logger):
+        """
+        Test that providing an invalid user in the course JSON will result in the appropriate error message
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": "invalid_user",
+            "fields": {"display_name": "test-course"}
+        }]}
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        mock_logger.warning.assert_any_call("invalid_user user does not exist")
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    def test_missing_display_name(self, mock_logger):
+        """
+        Test that missing required display_name in JSON object will result in the appropriate error message
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": str(self.user.email),
+            "fields": {}
+        }]}
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        mock_logger.warning.assert_any_call("Fields json is missing display_name")
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    def test_invalid_course_field(self, mock_logger):
+        """
+        Test that an invalid course field will result in the appropriate message
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": str(self.user.email),
+            "fields": {"display_name": "test-course", "invalid_field": "invalid_value"}
+        }]}
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        mock_logger.info.assert_any_call((u'invalid_field') + "is not a valid CourseField")
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    def test_invalid_date_setting(self, mock_logger):
+        """
+        Test that an invalid date json will result in the appropriate message
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": str(self.user.email),
+            "fields": {"display_name": "test-course", "announcement": "invalid_date"}
+        }]}
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        mock_logger.info.assert_any_call("The date string could not be parsed for announcement")
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    def test_invalid_course_tab_list_setting(self, mock_logger):
+        """
+        Test that an invalid course tab list json will result in the appropriate message
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": str(self.user.email),
+            "fields": {"display_name": "test-course", "tabs": "invalid_tabs"}
+        }]}
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        mock_logger.info.assert_any_call("The course tab list string could not be parsed for tabs")
+
+    @mock.patch('contentstore.management.commands.generate_courses.logger')
+    @ddt.data("mobile_available", "enable_proctored_exams")
+    def test_missing_course_fields(self, field, mock_logger):
+        """
+        Test that missing course fields in fields json will result in the appropriate message
+        """
+        settings = {"courses": [{
+            "organization": "test-course-generator",
+            "number": "1",
+            "run": "1",
+            "user": str(self.user.email),
+            "fields": {"display_name": "test-course"}
+        }]}
+        arg = json.dumps(settings)
+        call_command("generate_courses", arg)
+        mock_logger.info.assert_any_call(field + " has not been set")
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_generate_test_course.py b/cms/djangoapps/contentstore/management/commands/tests/test_generate_test_course.py
deleted file mode 100644
index 67dd8a1de4..0000000000
--- a/cms/djangoapps/contentstore/management/commands/tests/test_generate_test_course.py
+++ /dev/null
@@ -1,89 +0,0 @@
-"""
-Unittest for generate a test course in an given modulestore
-"""
-import unittest
-import ddt
-from django.core.management import CommandError, call_command
-
-from contentstore.management.commands.generate_test_course import Command
-from xmodule.modulestore import ModuleStoreEnum
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.django import modulestore
-
-
-@ddt.ddt
-class TestGenerateTestCourse(ModuleStoreTestCase):
-    """
-    Unit tests for creating a course in either old mongo or split mongo via command line
-    """
-
-    @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split)
-    def test_generate_course_in_stores(self, store):
-        """
-        Test that courses are created successfully for both ModuleStores
-        """
-        arg = (
-            '{"store":"' + store + '",' +
-            '"user":"' + self.user.email + '",' +
-            '"organization":"test-course-generator",' +
-            '"number":"1",' +
-            '"run":"1",' +
-            '"fields":{"display_name":"test-course"}}'
-        )
-        call_command("generate_test_course", arg)
-        key = modulestore().make_course_key("test-course-generator", "1", "1")
-        self.assertTrue(modulestore().has_course(key))
-
-    def test_invalid_json(self):
-        """
-        Test that providing an invalid JSON object will result in the appropriate command error
-        """
-        error_msg = "Invalid JSON"
-        with self.assertRaisesRegexp(CommandError, error_msg):
-            arg = "invalid_json"
-            call_command("generate_test_course", arg)
-
-    def test_missing_fields(self):
-        """
-        Test that missing required fields in JSON object will result in the appropriate command error
-        """
-        error_msg = "JSON object is missing required fields"
-        with self.assertRaisesRegexp(CommandError, error_msg):
-            arg = (
-                '{"store":"invalid_store",' +
-                '"user":"user@example.com",' +
-                '"organization":"test-course-generator"}'
-            )
-            call_command("generate_test_course", arg)
-
-    def test_invalid_store(self):
-        """
-        Test that providing an invalid store option will result in the appropriate command error
-        """
-        error_msg = "Modulestore invalid_store is not valid"
-        with self.assertRaisesRegexp(CommandError, error_msg):
-            arg = (
-                '{"store":"invalid_store",' +
-                '"user":"user@example.com",' +
-                '"organization":"test-course-generator",' +
-                '"number":"1",' +
-                '"run":"1",' +
-                '"fields":{"display_name":"test-course"}}'
-            )
-            call_command("generate_test_course", arg)
-
-    def test_invalid_user(self):
-        """
-        Test that providing an invalid user will result in the appropriate command error
-        """
-        error_msg = "User invalid_user not found"
-        with self.assertRaisesRegexp(CommandError, error_msg):
-            arg = (
-                '{"store":"split",' +
-                '"user":"invalid_user",' +
-                '"organization":"test-course-generator",' +
-                '"number":"1",' +
-                '"run":"1",' +
-                '"fields":{"display_name":"test-course"}}'
-            )
-            call_command("generate_test_course", arg)
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py b/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py
index a8dfe03cd0..14c36448c2 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py
@@ -18,7 +18,7 @@ from django.test.utils import override_settings
 from contentstore.tests.utils import CourseTestCase
 import contentstore.git_export_utils as git_export_utils
 from contentstore.git_export_utils import GitExportError
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 FEATURES_WITH_EXPORT_GIT = settings.FEATURES.copy()
 FEATURES_WITH_EXPORT_GIT['ENABLE_EXPORT_GIT'] = True
@@ -88,7 +88,7 @@ class TestGitExport(CourseTestCase):
         """
         Test several bad URLs for validation
         """
-        course_key = SlashSeparatedCourseKey('org', 'course', 'run')
+        course_key = CourseLocator('org', 'course', 'run')
         with self.assertRaisesRegexp(GitExportError, unicode(GitExportError.URL_BAD)):
             git_export_utils.export_to_git(course_key, 'Sillyness')
 
@@ -105,7 +105,7 @@ class TestGitExport(CourseTestCase):
         """
         test_repo_path = '{}/test_repo'.format(git_export_utils.GIT_REPO_EXPORT_DIR)
         self.assertFalse(os.path.isdir(test_repo_path))
-        course_key = SlashSeparatedCourseKey('foo', 'blah', '100-')
+        course_key = CourseLocator('foo', 'blah', '100-')
         # Test bad clones
         with self.assertRaisesRegexp(GitExportError,
                                      unicode(GitExportError.CANNOT_PULL)):
diff --git a/cms/djangoapps/contentstore/tests/test_clone_course.py b/cms/djangoapps/contentstore/tests/test_clone_course.py
index 82b931a54f..9ef484c91b 100644
--- a/cms/djangoapps/contentstore/tests/test_clone_course.py
+++ b/cms/djangoapps/contentstore/tests/test_clone_course.py
@@ -28,15 +28,6 @@ class CloneCourseTest(CourseTestCase):
         """Tests cloning of a course as follows: XML -> Mongo (+ data) -> Mongo -> Split -> Split"""
         # 1. import and populate test toy course
         mongo_course1_id = self.import_and_populate_course()
-
-        # 2. clone course (mongo -> mongo)
-        # TODO - This is currently failing since clone_course doesn't handle Private content - fails on Publish
-        # mongo_course2_id = SlashSeparatedCourseKey('edX2', 'toy2', '2013_Fall')
-        # self.store.clone_course(mongo_course1_id, mongo_course2_id, self.user.id)
-        # self.assertCoursesEqual(mongo_course1_id, mongo_course2_id)
-        # self.check_populated_course(mongo_course2_id)
-
-        # NOTE: When the code above is uncommented this can be removed.
         mongo_course2_id = mongo_course1_id
 
         # 3. clone course (mongo -> split)
diff --git a/cms/djangoapps/contentstore/tests/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py
index a2e137f3b4..0d5d640c78 100644
--- a/cms/djangoapps/contentstore/tests/test_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_utils.py
@@ -3,7 +3,7 @@ import collections
 from datetime import datetime, timedelta
 
 from django.test import TestCase
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from pytz import UTC
 
 from contentstore import utils
@@ -21,26 +21,26 @@ class LMSLinksTestCase(TestCase):
 
     def lms_link_test(self):
         """ Tests get_lms_link_for_item. """
-        course_key = SlashSeparatedCourseKey('mitX', '101', 'test')
+        course_key = CourseLocator('mitX', '101', 'test')
         location = course_key.make_usage_key('vertical', 'contacting_us')
         link = utils.get_lms_link_for_item(location, False)
-        self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/jump_to/i4x://mitX/101/vertical/contacting_us")
+        self.assertEquals(link, "//localhost:8000/courses/course-v1:mitX+101+test/jump_to/block-v1:mitX+101+test+type@vertical+block@contacting_us")
 
         # test preview
         link = utils.get_lms_link_for_item(location, True)
         self.assertEquals(
             link,
-            "//preview.localhost/courses/mitX/101/test/jump_to/i4x://mitX/101/vertical/contacting_us"
+            "//preview.localhost/courses/course-v1:mitX+101+test/jump_to/block-v1:mitX+101+test+type@vertical+block@contacting_us"
         )
 
         # now test with the course' location
         location = course_key.make_usage_key('course', 'test')
         link = utils.get_lms_link_for_item(location)
-        self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/jump_to/i4x://mitX/101/course/test")
+        self.assertEquals(link, "//localhost:8000/courses/course-v1:mitX+101+test/jump_to/block-v1:mitX+101+test+type@course+block@test")
 
     def lms_link_for_certificate_web_view_test(self):
         """ Tests get_lms_link_for_certificate_web_view. """
-        course_key = SlashSeparatedCourseKey('mitX', '101', 'test')
+        course_key = CourseLocator('mitX', '101', 'test')
         dummy_user = ModuleStoreEnum.UserID.test
         mode = 'professional'
 
diff --git a/cms/djangoapps/contentstore/tests/utils.py b/cms/djangoapps/contentstore/tests/utils.py
index 0c62bddbc9..87975ce395 100644
--- a/cms/djangoapps/contentstore/tests/utils.py
+++ b/cms/djangoapps/contentstore/tests/utils.py
@@ -8,7 +8,8 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.test.client import Client
 from mock import Mock
-from opaque_keys.edx.locations import AssetLocation, SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locations import AssetLocation
 
 from contentstore.utils import reverse_url
 from student.models import Registration
@@ -129,7 +130,7 @@ class CourseTestCase(ProceduralCourseTestMixin, ModuleStoreTestCase):
         """
         content_store = contentstore()
         import_course_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'], static_content_store=content_store)
-        course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        course_id = CourseKey.from_string('/'.join(['edX', 'toy', '2012_Fall']))
 
         # create an Orphan
         # We had a bug where orphaned draft nodes caused export to fail. This is here to cover that case.
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 413a6ba390..deaf7a8d8a 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -524,11 +524,13 @@ def course_listing(request):
             u'can_edit': has_studio_write_access(request.user, library.location.library_key),
         }
 
-    courses_iter = _remove_in_process_courses(courses_iter, in_process_course_actions)
+    split_archived = settings.FEATURES.get(u'ENABLE_SEPARATE_ARCHIVED_COURSES', False)
+    active_courses, archived_courses = _process_courses_list(courses_iter, in_process_course_actions, split_archived)
     in_process_course_actions = [format_in_process_course_view(uca) for uca in in_process_course_actions]
 
     return render_to_response(u'index.html', {
-        u'courses': list(courses_iter),
+        u'courses': active_courses,
+        u'archived_courses': archived_courses,
         u'in_process_course_actions': in_process_course_actions,
         u'libraries_enabled': LIBRARIES_ENABLED,
         u'libraries': [format_library_for_view(lib) for lib in libraries],
@@ -645,7 +647,6 @@ def get_courses_accessible_to_user(request, org=None):
             the courses returned. A value of None will have no effect (all courses
             returned), an empty string will result in no courses, and otherwise only courses with the
             specified org will be returned. The default value is None.
-
     """
     if GlobalStaff().has_user(request.user):
         # user has global access so no need to get courses from django groups
@@ -660,10 +661,15 @@ def get_courses_accessible_to_user(request, org=None):
     return courses, in_process_course_actions
 
 
-def _remove_in_process_courses(courses_iter, in_process_course_actions):
+def _process_courses_list(courses_iter, in_process_course_actions, split_archived=False):
     """
-    removes any in-process courses in courses list. in-process actually refers to courses
-    that are in the process of being generated for re-run
+    Iterates over the list of courses to be displayed to the user, and:
+
+    * Removes any in-process courses from the courses list. "In-process" refers to courses
+      that are in the process of being generated for re-run.
+    * If split_archived=True, removes any archived courses and returns them in a separate list.
+      Archived courses have has_ended() == True.
+    * Formats the returned courses (in both lists) to prepare them for rendering to the view.
     """
     def format_course_for_view(course):
         """
@@ -681,11 +687,20 @@ def _remove_in_process_courses(courses_iter, in_process_course_actions):
         }
 
     in_process_action_course_keys = {uca.course_key for uca in in_process_course_actions}
-    return (
-        format_course_for_view(course)
-        for course in courses_iter
-        if not isinstance(course, ErrorDescriptor) and (course.id not in in_process_action_course_keys)
-    )
+    active_courses = []
+    archived_courses = []
+
+    for course in courses_iter:
+        if isinstance(course, ErrorDescriptor) or (course.id in in_process_action_course_keys):
+            continue
+
+        formatted_course = format_course_for_view(course)
+        if split_archived and course.has_ended():
+            archived_courses.append(formatted_course)
+        else:
+            active_courses.append(formatted_course)
+
+    return active_courses, archived_courses
 
 
 def course_outline_initial_state(locator_to_show, course_structure):
@@ -1041,7 +1056,7 @@ def settings_handler(request, course_key_string):
                 # exclude current course from the list of available courses
                 courses = (course for course in courses if course.id != course_key)
                 if courses:
-                    courses = _remove_in_process_courses(courses, in_process_course_actions)
+                    courses, __ = _process_courses_list(courses, in_process_course_actions)
                 settings_context.update({'possible_pre_requisite_courses': list(courses)})
 
             if credit_eligibility_enabled:
diff --git a/cms/djangoapps/contentstore/views/tests/test_access.py b/cms/djangoapps/contentstore/views/tests/test_access.py
index 235193b980..a9aefbd4c4 100644
--- a/cms/djangoapps/contentstore/views/tests/test_access.py
+++ b/cms/djangoapps/contentstore/views/tests/test_access.py
@@ -3,7 +3,7 @@ Tests access.py
 """
 from django.contrib.auth.models import User
 from django.test import TestCase
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from contentstore.views.access import get_user_role
 from student.auth import add_users
@@ -22,7 +22,7 @@ class RolesTest(TestCase):
         self.global_admin = AdminFactory()
         self.instructor = User.objects.create_user('testinstructor', 'testinstructor+courses@edx.org', 'foo')
         self.staff = User.objects.create_user('teststaff', 'teststaff+courses@edx.org', 'foo')
-        self.course_key = SlashSeparatedCourseKey('mitX', '101', 'test')
+        self.course_key = CourseLocator('mitX', '101', 'test')
 
     def test_get_user_role_instructor(self):
         """
diff --git a/cms/djangoapps/contentstore/views/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py
index 57fe05d064..4275c33cf6 100644
--- a/cms/djangoapps/contentstore/views/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/views/tests/test_assets.py
@@ -10,7 +10,8 @@ from ddt import data, ddt
 from django.conf import settings
 from django.test.utils import override_settings
 from mock import patch
-from opaque_keys.edx.locations import AssetLocation, SlashSeparatedCourseKey
+from opaque_keys.edx.locations import AssetLocation
+from opaque_keys.edx.locator import CourseLocator
 from PIL import Image
 from pytz import UTC
 
@@ -80,7 +81,7 @@ class BasicAssetsTestCase(AssetsTestCase):
 
     def test_static_url_generation(self):
 
-        course_key = SlashSeparatedCourseKey('org', 'class', 'run')
+        course_key = CourseLocator('org', 'class', 'run')
         location = course_key.make_asset_key('asset', 'my_file_name.jpg')
         path = StaticContent.get_static_path_from_location(location)
         self.assertEquals(path, '/static/my_file_name.jpg')
@@ -348,7 +349,7 @@ class AssetToJsonTestCase(AssetsTestCase):
     def test_basic(self):
         upload_date = datetime(2013, 6, 1, 10, 30, tzinfo=UTC)
         content_type = 'image/jpg'
-        course_key = SlashSeparatedCourseKey('org', 'class', 'run')
+        course_key = CourseLocator('org', 'class', 'run')
         location = course_key.make_asset_key('asset', 'my_file_name.jpg')
         thumbnail_location = course_key.make_asset_key('thumbnail', 'my_file_name_thumb.jpg')
 
@@ -357,10 +358,10 @@ class AssetToJsonTestCase(AssetsTestCase):
 
         self.assertEquals(output["display_name"], "my_file")
         self.assertEquals(output["date_added"], "Jun 01, 2013 at 10:30 UTC")
-        self.assertEquals(output["url"], "/c4x/org/class/asset/my_file_name.jpg")
-        self.assertEquals(output["external_url"], "lms_base_url/c4x/org/class/asset/my_file_name.jpg")
+        self.assertEquals(output["url"], "/asset-v1:org+class+run+type@asset+block@my_file_name.jpg")
+        self.assertEquals(output["external_url"], "lms_base_url/asset-v1:org+class+run+type@asset+block@my_file_name.jpg")
         self.assertEquals(output["portable_url"], "/static/my_file_name.jpg")
-        self.assertEquals(output["thumbnail"], "/c4x/org/class/thumbnail/my_file_name_thumb.jpg")
+        self.assertEquals(output["thumbnail"], "/asset-v1:org+class+run+type@thumbnail+block@my_file_name_thumb.jpg")
         self.assertEquals(output["id"], unicode(location))
         self.assertEquals(output['locked'], True)
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py
index 83636e0e6b..14221e030e 100644
--- a/cms/djangoapps/contentstore/views/tests/test_course_index.py
+++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py
@@ -10,6 +10,7 @@ import mock
 import pytz
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
+from django.test.utils import override_settings
 from django.utils.translation import ugettext as _
 from opaque_keys.edx.locator import CourseLocator
 from search.api import perform_search
@@ -26,13 +27,13 @@ from contentstore.views.item import VisibilityState, create_xblock_info
 from course_action_state.managers import CourseRerunUIStateManager
 from course_action_state.models import CourseRerunState
 from student.auth import has_course_author_access
-from student.roles import LibraryUserRole
+from student.roles import CourseStaffRole, GlobalStaff, LibraryUserRole
 from student.tests.factories import UserFactory
 from util.date_utils import get_default_time_display
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
-from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, LibraryFactory
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, LibraryFactory, check_mongo_calls
 
 
 class TestCourseIndex(CourseTestCase):
@@ -328,6 +329,136 @@ class TestCourseIndex(CourseTestCase):
         self.assertIn('display_course_number: ""', response.content)
 
 
+@ddt.ddt
+class TestCourseIndexArchived(CourseTestCase):
+    """
+    Unit tests for testing the course index list when there are archived courses.
+    """
+    NOW = datetime.datetime.now(pytz.utc)
+    DAY = datetime.timedelta(days=1)
+    YESTERDAY = NOW - DAY
+    TOMORROW = NOW + DAY
+
+    ORG = 'MyOrg'
+
+    ENABLE_SEPARATE_ARCHIVED_COURSES = settings.FEATURES.copy()
+    ENABLE_SEPARATE_ARCHIVED_COURSES['ENABLE_SEPARATE_ARCHIVED_COURSES'] = True
+    DISABLE_SEPARATE_ARCHIVED_COURSES = settings.FEATURES.copy()
+    DISABLE_SEPARATE_ARCHIVED_COURSES['ENABLE_SEPARATE_ARCHIVED_COURSES'] = False
+
+    def setUp(self):
+        """
+        Add courses with the end date set to various values
+        """
+        super(TestCourseIndexArchived, self).setUp()
+
+        # Base course has no end date (so is active)
+        self.course.end = None
+        self.course.display_name = 'Active Course 1'
+        self.ORG = self.course.location.org
+        self.save_course()
+
+        # Active course has end date set to tomorrow
+        self.active_course = CourseFactory.create(
+            display_name='Active Course 2',
+            org=self.ORG,
+            end=self.TOMORROW,
+        )
+
+        # Archived course has end date set to yesterday
+        self.archived_course = CourseFactory.create(
+            display_name='Archived Course',
+            org=self.ORG,
+            end=self.YESTERDAY,
+        )
+
+        # Base user has global staff access
+        self.assertTrue(GlobalStaff().has_user(self.user))
+
+        # Staff user just has course staff access
+        self.staff, self.staff_password = self.create_non_staff_user()
+        for course in (self.course, self.active_course, self.archived_course):
+            CourseStaffRole(course.id).add_users(self.staff)
+
+    def check_index_page_with_query_count(self, separate_archived_courses, org, mongo_queries, sql_queries):
+        """
+        Checks the index page, and ensures the number of database queries is as expected.
+        """
+        with self.assertNumQueries(sql_queries):
+            with check_mongo_calls(mongo_queries):
+                self.check_index_page(separate_archived_courses=separate_archived_courses, org=org)
+
+    def check_index_page(self, separate_archived_courses, org):
+        """
+        Ensure that the index page displays the archived courses as expected.
+        """
+        index_url = '/home/'
+        index_params = {}
+        if org is not None:
+            index_params['org'] = org
+        index_response = self.client.get(index_url, index_params, HTTP_ACCEPT='text/html')
+        self.assertEquals(index_response.status_code, 200)
+
+        parsed_html = lxml.html.fromstring(index_response.content)
+        course_tab = parsed_html.find_class('courses')
+        self.assertEqual(len(course_tab), 1)
+        course_links = course_tab[0].find_class('course-link')
+        course_titles = course_tab[0].find_class('course-title')
+        archived_course_tab = parsed_html.find_class('archived-courses')
+
+        if separate_archived_courses:
+            # Archived courses should be separated from the main course list
+            self.assertEqual(len(archived_course_tab), 1)
+            archived_course_links = archived_course_tab[0].find_class('course-link')
+            archived_course_titles = archived_course_tab[0].find_class('course-title')
+            self.assertEqual(len(archived_course_links), 1)
+            self.assertEqual(len(archived_course_titles), 1)
+            self.assertEqual(archived_course_titles[0].text, 'Archived Course')
+
+            self.assertEqual(len(course_links), 2)
+            self.assertEqual(len(course_titles), 2)
+            self.assertEqual(course_titles[0].text, 'Active Course 1')
+            self.assertEqual(course_titles[1].text, 'Active Course 2')
+        else:
+            # Archived courses should be included in the main course list
+            self.assertEqual(len(archived_course_tab), 0)
+            self.assertEqual(len(course_links), 3)
+            self.assertEqual(len(course_titles), 3)
+            self.assertEqual(course_titles[0].text, 'Active Course 1')
+            self.assertEqual(course_titles[1].text, 'Active Course 2')
+            self.assertEqual(course_titles[2].text, 'Archived Course')
+
+    @ddt.data(
+        # Staff user has course staff access
+        (True, 'staff', None, 4, 21),
+        (False, 'staff', None, 4, 21),
+        # Base user has global staff access
+        (True, 'user', ORG, 3, 17),
+        (False, 'user', ORG, 3, 17),
+        (True, 'user', None, 3, 17),
+        (False, 'user', None, 3, 17),
+    )
+    @ddt.unpack
+    def test_separate_archived_courses(self, separate_archived_courses, username, org, mongo_queries, sql_queries):
+        """
+        Ensure that archived courses are shown as expected for all user types, when the feature is enabled/disabled.
+        Also ensure that enabling the feature does not adversely affect the database query count.
+        """
+        # Authenticate the requested user
+        user = getattr(self, username)
+        password = getattr(self, username + '_password')
+        self.client.login(username=user, password=password)
+
+        # Enable/disable the feature before viewing the index page.
+        features = settings.FEATURES.copy()
+        features['ENABLE_SEPARATE_ARCHIVED_COURSES'] = separate_archived_courses
+        with override_settings(FEATURES=features):
+            self.check_index_page_with_query_count(separate_archived_courses=separate_archived_courses,
+                                                   org=org,
+                                                   mongo_queries=mongo_queries,
+                                                   sql_queries=sql_queries)
+
+
 @ddt.ddt
 class TestCourseOutline(CourseTestCase):
     """
diff --git a/cms/djangoapps/course_creators/admin.py b/cms/djangoapps/course_creators/admin.py
index 5a018ab049..52d983c725 100644
--- a/cms/djangoapps/course_creators/admin.py
+++ b/cms/djangoapps/course_creators/admin.py
@@ -6,9 +6,9 @@ import logging
 from smtplib import SMTPException
 
 from django.conf import settings
+from django.contrib import admin
 from django.core.mail import send_mail
 from django.dispatch import receiver
-from ratelimitbackend import admin
 
 from course_creators.models import CourseCreator, send_admin_notification, send_user_notification, update_creator_state
 from course_creators.views import update_course_creator_group
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index e64dbbf08a..4484aca24d 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -514,9 +514,11 @@ HELP_TOKENS_BOOKS = ENV_TOKENS.get('HELP_TOKENS_BOOKS', HELP_TOKENS_BOOKS)
 ############## Settings for CourseGraph ############################
 COURSEGRAPH_JOB_QUEUE = ENV_TOKENS.get('COURSEGRAPH_JOB_QUEUE', LOW_PRIORITY_QUEUE)
 
-############## Settings for Profile Image Size ######################
+########################## Parental controls config  #######################
 
-PROFILE_IMAGE_SIZES_MAP = ENV_TOKENS.get(
-    'PROFILE_IMAGE_SIZES_MAP',
-    PROFILE_IMAGE_SIZES_MAP
+# The age at which a learner no longer requires parental consent, or None
+# if parental consent is never required.
+PARENTAL_CONSENT_AGE_LIMIT = ENV_TOKENS.get(
+    'PARENTAL_CONSENT_AGE_LIMIT',
+    PARENTAL_CONSENT_AGE_LIMIT
 )
diff --git a/cms/envs/bok_choy_docker.env.json b/cms/envs/bok_choy_docker.env.json
index 905ca64104..77cd2e4318 100644
--- a/cms/envs/bok_choy_docker.env.json
+++ b/cms/envs/bok_choy_docker.env.json
@@ -56,7 +56,7 @@
         }
     },
     "COMMENTS_SERVICE_KEY": "password",
-    "COMMENTS_SERVICE_URL": "http://localhost:4567",
+    "COMMENTS_SERVICE_URL": "http://edx.devstack.forum:4567",
     "CONTACT_EMAIL": "info@example.com",
     "DEFAULT_FEEDBACK_EMAIL": "feedback@example.com",
     "DEFAULT_FROM_EMAIL": "registration@example.com",
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 59d6c9328d..b9ca6546bf 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -55,7 +55,7 @@ from lms.envs.common import (
     # indirectly accessed through the email opt-in API, which is
     # technically accessible through the CMS via legacy URLs.
     PROFILE_IMAGE_BACKEND, PROFILE_IMAGE_DEFAULT_FILENAME, PROFILE_IMAGE_DEFAULT_FILE_EXTENSION,
-    PROFILE_IMAGE_SECRET_KEY, PROFILE_IMAGE_MIN_BYTES, PROFILE_IMAGE_MAX_BYTES,
+    PROFILE_IMAGE_SECRET_KEY, PROFILE_IMAGE_MIN_BYTES, PROFILE_IMAGE_MAX_BYTES, PROFILE_IMAGE_SIZES_MAP,
     # The following setting is included as it is used to check whether to
     # display credit eligibility table on the CMS or not.
     ENABLE_CREDIT_ELIGIBILITY, YOUTUBE_API_KEY,
@@ -1364,15 +1364,6 @@ POLICY_CHANGE_GRADES_ROUTING_KEY = LOW_PRIORITY_QUEUE
 ############## Settings for CourseGraph ############################
 COURSEGRAPH_JOB_QUEUE = LOW_PRIORITY_QUEUE
 
-############## Settings for Profile Image Size ######################
-
-PROFILE_IMAGE_SIZES_MAP = {
-    'full': 500,
-    'large': 120,
-    'medium': 50,
-    'small': 30
-}
-
 ###################### VIDEO IMAGE STORAGE ######################
 
 VIDEO_IMAGE_DEFAULT_FILENAME = 'images/video-images/default_video_image.png'
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 46103bab4b..1292ef4ff4 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -86,7 +86,6 @@ DEBUG_TOOLBAR_CONFIG = {
         'debug_toolbar.panels.profiling.ProfilingPanel',
     ),
     'SHOW_TOOLBAR_CALLBACK': 'cms.envs.devstack.should_show_debug_toolbar',
-    'JQUERY_URL': None,
 }
 
 
@@ -94,9 +93,6 @@ def should_show_debug_toolbar(request):
     # We always want the toolbar on devstack unless running tests from another Docker container
     if request.get_host().startswith('edx.devstack.studio:'):
         return False
-    # Only display for non-ajax requests.
-    if request.is_ajax():
-        return False
     return True
 
 
diff --git a/cms/static/js/i18n/ar/djangojs.js b/cms/static/js/i18n/ar/djangojs.js
index a78d5f919e..e7b40d6342 100644
--- a/cms/static/js/i18n/ar/djangojs.js
+++ b/cms/static/js/i18n/ar/djangojs.js
@@ -193,15 +193,10 @@
     "A valid email address is required": "\u064a\u062c\u0628 \u0625\u062f\u062e\u0627\u0644 \u0639\u0646\u0648\u0627\u0646 \u0635\u062d\u064a\u062d \u0644\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a.", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "\u0623 \u0628 \u062a \u062b \u062c \u062d \u062e \u062f \u0630 \u0631 \u0632 \u0633 \u0634 \u0635 \u0636 \u0637 \u0638 \u0639 \u063a \u0641 \u0642 \u0643 \u0644 \u0645 \u0646 \u0647\u0640 \u0648 \u064a", 
     "Abbreviation": "\u0627\u0644\u0627\u062e\u062a\u0635\u0627\u0631", 
-    "About Me": "\u0646\u0628\u0630\u0629 \u0639\u0646\u0651\u064a", 
     "About You": "\u0646\u0628\u0630\u0629 \u0639\u0646\u0643", 
-    "About me": "\u0646\u0628\u0630\u0629 \u0639\u0646\u064a", 
-    "Accomplishments": "\u0627\u0644\u0625\u0646\u062c\u0627\u0632\u0627\u062a", 
-    "Accomplishments Pagination": "\u062a\u0631\u0642\u064a\u0645 \u0635\u0641\u062d\u0627\u062a \u0627\u0644\u0625\u0646\u062c\u0627\u0632\u0627\u062a", 
     "Account Information": "\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628", 
     "Account Not Activated": "\u0627\u0644\u062d\u0633\u0627\u0628 \u063a\u064a\u0631 \u0645\u0641\u0639\u0651\u0644", 
     "Account Settings": "\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628", 
-    "Account Settings page.": "\u0635\u0641\u062d\u0629 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628", 
     "Action": "\u0627\u0644\u0625\u062c\u0631\u0627\u0621", 
     "Action required: Enter a valid date.": "\u0625\u062c\u0631\u0627\u0621 \u0644\u0627\u0632\u0645: \u0623\u062f\u062e\u0644 \u062a\u0627\u0631\u064a\u062e\u0627\u064b \u0635\u0627\u0644\u062d\u0627\u064b.", 
     "Actions": "\u0627\u0644\u0625\u062c\u0631\u0627\u0621\u0627\u062a", 
@@ -213,7 +208,6 @@
     "Add Additional Signatory": "\u0625\u0636\u0627\u0641\u0629 \u0645\u064f\u0648\u064e\u0642\u0651\u0639 \u0625\u0636\u0627\u0641\u064a", 
     "Add Cohort": "\u0625\u0636\u0627\u0641\u0629 \u0634\u0639\u0628\u0629", 
     "Add Component:": "\u0625\u0636\u0627\u0641\u0629 \u0645\u0643\u0648\u0651\u0650\u0646:", 
-    "Add Country": "\u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0628\u0644\u062f", 
     "Add New Component": "\u0625\u0636\u0627\u0641\u0629 \u0645\u0643\u0648\u0651\u0650\u0646 \u062c\u062f\u064a\u062f", 
     "Add URLs for additional versions": "\u0625\u0636\u0627\u0641\u0629 \u0631\u0648\u0627\u0628\u0637 \u0644\u0644\u0646\u0633\u062e\u0627\u062a \u0627\u0644\u0625\u0636\u0627\u0641\u064a\u0629", 
     "Add a Chapter": "\u0625\u0636\u0627\u0641\u0629 \u0641\u0635\u0644", 
@@ -224,7 +218,6 @@
     "Add a learning outcome here": "\u0625\u0636\u0627\u0641\u0629 \u0646\u062a\u064a\u062c\u0629 \u062a\u0639\u0644\u064a\u0645\u064a\u0629 \u0647\u0646\u0627", 
     "Add a response:": "\u0623\u0636\u0641 \u0631\u062f\u0627\u064b:", 
     "Add another group": "\u0625\u0636\u0627\u0641\u0629 \u0645\u062c\u0645\u0648\u0639\u0629 \u0623\u062e\u0631\u0649", 
-    "Add language": "\u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0644\u063a\u0629", 
     "Add notes about this learner": "\u0623\u0636\u0641 \u0645\u0644\u0627\u062d\u0638\u0627\u062a \u062a\u062e\u0635\u0651 \u0647\u0630\u0627 \u0627\u0644\u0645\u062a\u0639\u0644\u0651\u0645", 
     "Add to Dictionary": "\u0623\u0636\u0641 \u0625\u0644\u0649 \u0627\u0644\u0642\u0627\u0645\u0648\u0633", 
     "Add to Exception List": "\u0625\u0636\u0641 \u0625\u0644\u0649 \u0644\u0627\u0626\u062d\u0629 \u0627\u0644\u0627\u0633\u062a\u062b\u0646\u0627\u0621\u0627\u062a", 
@@ -376,7 +369,6 @@
     "Change Manually": "\u0627\u0644\u062a\u063a\u064a\u064a\u0631 \u064a\u062f\u0648\u064a\u0651\u064b\u0627 ", 
     "Change My Email Address": "\u062a\u063a\u064a\u064a\u0631 \u0639\u0646\u0648\u0627\u0646 \u0628\u0631\u064a\u062f\u064a \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a", 
     "Change image": "\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0635\u0648\u0631\u0629", 
-    "Change the settings for {display_name}": "\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0644\u0640  {display_name}", 
     "Chapter Asset": "\u0645\u0627\u062f\u0629 \u0645\u0644\u062d\u0642\u0629 \u0628\u0641\u0635\u0644", 
     "Chapter Name": "\u0627\u0633\u0645 \u0627\u0644\u0641\u0635\u0644", 
     "Chapter information": "\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0639\u0646 \u0627\u0644\u0641\u0635\u0644", 
@@ -606,7 +598,6 @@
     "Edit Membership": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0639\u0636\u0648\u064a\u0651\u0629", 
     "Edit Team": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0641\u0631\u064a\u0642", 
     "Edit Your Name": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0633\u0645\u0643 ", 
-    "Edit the name": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0627\u0633\u0645", 
     "Edit this certificate?": "\u0647\u0644 \u062a\u0631\u064a\u062f \u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0634\u0647\u0627\u062f\u0629\u061f", 
     "Edit your post below.": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 \u0623\u062f\u0646\u0627\u0647.", 
     "Editable": "\u0642\u0627\u0628\u0644 \u0644\u0644\u062a\u0639\u062f\u064a\u0644", 
@@ -736,7 +727,6 @@
     "Free text notes": "\u0645\u0644\u0627\u062d\u0638\u0627\u062a \u0645\u0643\u062a\u0648\u0628\u0629 \u062d\u0631\u0629", 
     "Frequently Asked Questions": "\u0627\u0644\u0623\u0633\u0626\u0644\u0629 \u0627\u0644\u0634\u0627\u0626\u0639\u0629", 
     "Full Name": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0643\u0627\u0645\u0644", 
-    "Full Profile": "\u0643\u0627\u0645\u0644 \u0645\u0644\u0641\u0651\u064a \u0627\u0644\u0634\u062e\u0635\u064a", 
     "Fullscreen": "\u0639\u0631\u0636 \u0628\u0634\u0627\u0634\u0629 \u0643\u0627\u0645\u0644\u0629", 
     "Fully Supported": "\u0645\u062f\u0639\u0648\u0645 \u062a\u0645\u0627\u0645\u0627\u064b", 
     "Gender": "\u0627\u0644\u062c\u0646\u0633", 
@@ -898,7 +888,6 @@
     "License Display": "\u0639\u0631\u0636 \u0627\u0644\u0625\u062c\u0627\u0632\u0629", 
     "License Type": "\u0646\u0648\u0639 \u0627\u0644\u0625\u062c\u0627\u0632\u0629", 
     "Limit Access": "\u0627\u0644\u062d\u062f\u0651 \u0645\u0646 \u0635\u0644\u0627\u062d\u064a\u0629 \u0627\u0644\u0648\u0635\u0648\u0644", 
-    "Limited Profile": "\u0645\u0644\u0641\u0651\u064a \u0627\u0644\u0634\u062e\u0635\u064a \u0627\u0644\u0645\u062d\u062f\u0648\u062f", 
     "Link Description": "\u0648\u0635\u0641 \u0627\u0644\u0631\u0627\u0628\u0637", 
     "Link Your Account": "\u0627\u0631\u0628\u0637 \u062d\u0633\u0627\u0628\u0643", 
     "Link types should be unique.": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u0643\u0648\u0646 \u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0631\u0648\u0627\u0628\u0637 \u0641\u0631\u064a\u062f\u0629.", 
@@ -1134,9 +1123,6 @@
     "Professional Certificate for {courseName}": "\u0634\u0647\u0627\u062f\u0629 \u0627\u062d\u062a\u0631\u0627\u0641\u064a\u0629 \u0644\u0640 {courseName}", 
     "Professional Education": "\u0627\u0644\u062a\u0639\u0644\u064a\u0645 \u0627\u0644\u0645\u0647\u0646\u064a", 
     "Professional Education Verified Certificate": "\u0634\u0647\u0627\u062f\u0629 \u0645\u0648\u062b\u0651\u0642\u0629 \u0644\u0644\u062a\u0639\u0644\u064a\u0645 \u0627\u0644\u0645\u0647\u0646\u064a", 
-    "Profile": "\u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0634\u062e\u0635\u064a", 
-    "Profile Image": "\u0635\u0648\u0631\u0629 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0634\u062e\u0635\u064a", 
-    "Profile image for {username}": "\u0635\u0648\u0631\u0629 \u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645 {username}", 
     "Promote another member to Admin to remove your admin rights": "\u064a\u064f\u0631\u062c\u0649 \u062a\u0631\u0642\u064a\u0629 \u0639\u0636\u0648 \u0622\u062e\u0631 \u0625\u0644\u0649 \u062f\u0631\u062c\u0629 \u0645\u0634\u0631\u0650\u0641 \u0644\u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0625\u0644\u063a\u0627\u0621 \u062d\u0642\u0648\u0642\u0643 \u0643\u0645\u0634\u0631\u0650\u0641.", 
     "Provisional": "\u0645\u0624\u0642\u062a", 
     "Provisionally Supported": "\u0645\u062f\u0639\u0648\u0645 \u0645\u0624\u0642\u062a\u0627\u064b", 
@@ -1400,7 +1386,6 @@
     "Team name cannot have more than 255 characters.": "\u064a\u062c\u0628 \u0623\u0644\u0627 \u064a\u062a\u062c\u0627\u0648\u0632 \u0627\u0633\u0645 \u0627\u0644\u0641\u0631\u064a\u0642 255 \u062d\u0631\u0641\u064b\u0627.", 
     "Teams": "\u0627\u0644\u0641\u0650\u0631\u064e\u0642", 
     "Teams Pagination": "\u062a\u0631\u0642\u064a\u0645 \u0635\u0641\u062d\u0627\u062a \u0627\u0644\u0641\u0650\u0631\u0642", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u062a\u0641\u0636\u0651\u0644 \u0628\u0625\u0639\u0637\u0627\u0621 \u0627\u0644\u0645\u062a\u0639\u0644\u0651\u0645\u064a\u0646 \u0627\u0644\u0622\u062e\u0631\u064a\u0646 \u0641\u0643\u0631\u0629 \u0639\u0627\u0645\u0629 \u0639\u0646\u0643: \u0645\u0643\u0627\u0646 \u0633\u0643\u0646\u0643\u060c \u0627\u0647\u062a\u0645\u0627\u0645\u0627\u062a\u0643\u060c \u0633\u0628\u0628 \u0627\u0644\u062a\u062d\u0627\u0642\u0643 \u0628\u0647\u0630\u0647 \u0627\u0644\u0645\u0633\u0627\u0642\u0627\u062a\u060c \u0623\u0648 \u0645\u0627 \u062a\u0631\u063a\u0628 \u0641\u064a \u062a\u0639\u0644\u0651\u0645\u0647.", 
     "Templates": "\u0646\u0645\u0627\u0630\u062c", 
     "Text": "\u0646\u0635\u0651", 
     "Text color": "\u0644\u0648\u0646 \u0627\u0644\u0646\u0635", 
@@ -1640,14 +1625,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "\u064a\u064f\u0631\u062c\u0649 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0643\u0627\u0645\u064a\u0631\u062a\u0643 \u0644\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u0629 \u0644\u0648\u062c\u0647\u0643. \u062b\u0645\u0651 \u0633\u0646\u0637\u0627\u0628\u0642 \u0647\u0630\u0647 \u0627\u0644\u0635\u0648\u0631\u0629 \u0645\u0639 \u0635\u0648\u0631\u0629 \u0648\u062c\u0647\u0643 \u0648\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0645\u0648\u062c\u0648\u062f\u064a\u0646 \u0641\u064a \u062d\u0633\u0627\u0628\u0643.  ", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "\u0627\u0633\u062a\u062e\u062f\u0645 \u0643\u0627\u0645\u064a\u0631\u062a\u0643 \u0644\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u0629 \u0644\u0648\u062c\u0647\u0643. \u062b\u0645\u0651 \u0633\u0646\u0637\u0627\u0628\u0642 \u0647\u0630\u0647 \u0627\u0644\u0635\u0648\u0631\u0629 \u0645\u0639 \u0627\u0644\u0635\u0648\u0631\u0629 \u0627\u0644\u0645\u0648\u062c\u0648\u062f\u0629 \u0639\u0644\u0649 \u0628\u0637\u0627\u0642\u062a\u0643 \u0627\u0644\u0634\u062e\u0635\u064a\u0629.  ", 
     "Used": "\u0645\u0633\u062a\u062e\u062f\u064e\u0645", 
-    "Used in {count} unit": [
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629"
-    ], 
     "User": "\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645", 
     "User Email": "\u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0627\u0644\u062e\u0627\u0635 \u0628\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645", 
     "Username": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645", 
@@ -1772,12 +1749,10 @@
     "You haven't added any assets to this course yet.": "\u0644\u0645 \u062a\u064f\u0636\u0650\u0641 \u0623\u064a \u0645\u0648\u0627\u062f \u0645\u0644\u062d\u0642\u0629 \u0628\u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u0627\u0642 \u0628\u0639\u062f. ", 
     "You haven't added any content to this course yet.": "\u0644\u0645 \u062a\u064f\u0636\u0650\u0641 \u0623\u064a \u0645\u062d\u062a\u0648\u0649 \u0625\u0644\u0649 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u0627\u0642 \u0628\u0639\u062f.", 
     "You haven't added any textbooks to this course yet.": "\u0644\u0645 \u062a\u064f\u0636\u0650\u0641 \u0628\u0639\u062f \u0623\u064a \u0643\u062a\u0628 \u0625\u0644\u0649 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u0627\u0642.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\u064a\u062c\u0628 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0639\u0645\u0631\u0643 \u0645\u0627 \u0641\u0648\u0642 13 \u0633\u0646\u0629 \u0644\u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0645\u0634\u0627\u0631\u0643\u0629 \u0635\u0641\u062d\u062a\u0643 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0628\u0623\u0643\u0645\u0644\u0647\u0627. \u0641\u0625\u0630\u0627 \u0643\u0627\u0646 \u0639\u0645\u0631\u0643 \u0645\u0627 \u0641\u0648\u0642 13 \u0633\u0646\u0629\u060c \u064a\u064f\u0631\u062c\u0649 \u0627\u0644\u062a\u0623\u0643\u0651\u062f \u0645\u0646 \u0623\u0646\u0651\u0643 \u062d\u062f\u0651\u062f\u062a \u0633\u0646\u0629 \u0645\u064a\u0644\u0627\u062f\u0643 \u0641\u064a \u0635\u0641\u062d\u0629 \u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a {account_settings_page_link}.", 
     "You must enter a valid email address in order to add a new team member": "\u064a\u062c\u0628 \u0639\u0644\u064a\u0643 \u0623\u0646 \u062a\u064f\u062f\u062e\u0650\u0644 \u0639\u0646\u0648\u0627\u0646 \u0635\u062d\u064a\u062d \u0644\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0644\u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0625\u0636\u0627\u0641\u0629 \u0639\u0636\u0648 \u062c\u062f\u064a\u062f \u0625\u0644\u0649 \u0627\u0644\u0641\u0631\u064a\u0642.", 
     "You must sign out and sign back in before your language changes take effect.": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u0633\u062c\u0651\u0644 \u062e\u0631\u0648\u062c\u0643 \u062b\u0645\u0651 \u062a\u064f\u0639\u064a\u062f \u062a\u0633\u062c\u064a\u0644 \u062f\u062e\u0648\u0644\u0643 \u0644\u064a\u062c\u0631\u064a \u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u062a\u063a\u064a\u064a\u0631\u0627\u062a \u0627\u0644\u062a\u064a \u0623\u062f\u062e\u0644\u062a\u0647\u0627 \u0639\u0644\u0649 \u0627\u0644\u0644\u063a\u0629.", 
     "You must specify a name": "\u0639\u0644\u064a\u0643 \u0623\u0646 \u062a\u062d\u062f\u0651\u062f \u0627\u0633\u0645\u064b\u0627.", 
     "You must specify a name for the cohort": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u062d\u062f\u0651\u062f \u0627\u0633\u0645\u064b\u0627 \u0644\u0644\u0634\u0639\u0628\u0629.", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u062d\u062f\u0651\u062f \u0633\u0646\u0629 \u0645\u064a\u0644\u0627\u062f\u0643 \u0642\u0628\u0644 \u0623\u0646 \u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0645\u0634\u0627\u0631\u0643\u0629 \u0635\u0641\u062d\u062a\u0643 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0628\u0623\u0643\u0645\u0644\u0647\u0627. \u0648\u0644\u062a\u062d\u062f\u0651\u062f \u0633\u0646\u0629 \u0645\u064a\u0644\u0627\u062f\u0643\u060c \u064a\u064f\u0631\u062c\u0649 \u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0635\u0641\u062d\u0629 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628 {account_settings_page_link}.", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u062c\u0647\u0627\u0632 \u0643\u0648\u0645\u0628\u064a\u0648\u062a\u0631 \u0645\u0632\u0648\u0651\u064e\u062f \u0628\u0643\u0627\u0645\u064a\u0631\u0627. \u0648\u0639\u0646\u062f \u0627\u0633\u062a\u0644\u0627\u0645\u0643 \u0644\u0639\u0644\u0627\u0645\u0629 \u0627\u0633\u062a\u0639\u062f\u0627\u062f \u0645\u0646 \u0627\u0644\u0645\u062a\u0635\u0641\u0651\u062d\u060c \u064a\u064f\u0631\u062c\u0649 \u0627\u0644\u062a\u0623\u0643\u0651\u062f \u0645\u0646 \u0627\u0644\u0633\u0645\u0627\u062d \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0631\u062e\u0635\u0629 \u0642\u064a\u0627\u062f\u0629 \u0623\u0648 \u062c\u0648\u0627\u0632 \u0633\u0641\u0631 \u0623\u0648 \u063a\u064a\u0631\u0647\u0627 \u0645\u0646 \u0627\u0644\u0645\u0633\u062a\u0646\u062f\u0627\u062a \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0627\u0644\u0635\u0627\u062f\u0631\u0629 \u0639\u0646 \u0627\u0644\u062d\u0643\u0648\u0645\u0629 \u0648\u0627\u0644\u062a\u064a \u062a\u062d\u0645\u0644 \u0627\u0633\u0645\u0643 \u0648\u0635\u0648\u0631\u062a\u0643.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0628\u0637\u0627\u0642\u0629 \u0634\u062e\u0635\u064a\u0629 \u062a\u062d\u0645\u0644 \u0627\u0633\u0645\u0643 \u0648\u0635\u0648\u0631\u062a\u0643. \u0648\u064a\u0645\u0643\u0646 \u062a\u0642\u062f\u064a\u0645 \u0631\u062e\u0635\u0629 \u0627\u0644\u0642\u064a\u0627\u062f\u0629\u060c \u0623\u0648 \u062c\u0648\u0627\u0632 \u0627\u0644\u0633\u0641\u0631\u060c \u0623\u0648 \u0628\u0637\u0627\u0642\u0629 \u0634\u062e\u0635\u064a\u0629 \u0623\u062e\u0631\u0649 \u0635\u0627\u062f\u0631\u0629 \u0639\u0646 \u0627\u0644\u062d\u0643\u0648\u0645\u0629\u060c \u0641\u062c\u0645\u064a\u0639 \u0647\u0630\u0647 \u0627\u0644\u0648\u062b\u0627\u0626\u0642 \u0645\u0642\u0628\u0648\u0644\u0629.  ", 
@@ -1944,7 +1919,6 @@
       "{numVotes} \u0635\u0648\u062a"
     ], 
     "{organization}\\'s logo": "\u0634\u0639\u0627\u0631 \u0627\u0644{organization}", 
-    "{platform_name} learners can see my:": "\u064a\u0645\u0643\u0646 \u0644\u0644\u0645\u062a\u0639\u0644\u0651\u0645\u064a\u0646 \u0641\u064a \u0645\u0646\u0635\u0651\u0629 {platform_name} \u0631\u0624\u064a\u0629:", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u062a\u062d\u0630\u064a\u0631:{screen_reader_end}  \u062a\u0639\u0630\u0651\u0631 \u0625\u064a\u062c\u0627\u062f \u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0645\u062d\u062a\u0648\u0649.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u062a\u062d\u0630\u064a\u0631:{screen_reader_end} \u062d\u0651\u0630\u0641\u062a \u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u062d\u062a\u0648\u0649 \u0627\u0644\u0645\u062d\u062f\u0651\u062f\u0629 \u0633\u0627\u0628\u0642\u064b\u0627. \u064a\u064f\u0631\u062c\u0649 \u0627\u062e\u062a\u064a\u0627\u0631 \u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u062d\u062a\u0648\u0649 \u0623\u062e\u0631\u0649.", 
     "{start_strong}{total}{end_strong} words submitted in total.": "\u0625\u062c\u0645\u0627\u0644\u064a \u0639\u062f\u062f \u0627\u0644\u0643\u0644\u0645\u0627\u062a \u0627\u0644\u062a\u064a \u062a\u0645 \u0627\u0631\u0633\u0627\u0644\u0647\u0627 {start_strong}{total}{end_strong}.", 
diff --git a/cms/static/js/i18n/eo/djangojs.js b/cms/static/js/i18n/eo/djangojs.js
index ef58f0bf45..964edd9576 100644
--- a/cms/static/js/i18n/eo/djangojs.js
+++ b/cms/static/js/i18n/eo/djangojs.js
@@ -1451,6 +1451,7 @@
     "Thanks for returning to verify your ID in: {courseName}": "Th\u00e4nks f\u00f6r r\u00e9t\u00fcrn\u00efng t\u00f6 v\u00e9r\u00eff\u00fd \u00fd\u00f6\u00fcr \u00ccD \u00efn: {courseName} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#", 
     "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Th\u00e9 \u00dbRL \u00fd\u00f6\u00fc \u00e9nt\u00e9r\u00e9d s\u00e9\u00e9ms t\u00f6 \u00df\u00e9 \u00e4n \u00e9m\u00e4\u00efl \u00e4ddr\u00e9ss. D\u00f6 \u00fd\u00f6\u00fc w\u00e4nt t\u00f6 \u00e4dd th\u00e9 r\u00e9q\u00fc\u00efr\u00e9d m\u00e4\u00eflt\u00f6: pr\u00e9f\u00efx? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "Th\u00e9 \u00dbRL \u00fd\u00f6\u00fc \u00e9nt\u00e9r\u00e9d s\u00e9\u00e9ms t\u00f6 \u00df\u00e9 \u00e4n \u00e9xt\u00e9rn\u00e4l l\u00efnk. D\u00f6 \u00fd\u00f6\u00fc w\u00e4nt t\u00f6 \u00e4dd th\u00e9 r\u00e9q\u00fc\u00efr\u00e9d http:// pr\u00e9f\u00efx? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
+    "The certificate available date must be later than the enrollment start date.": "Th\u00e9 \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 \u00e4v\u00e4\u00efl\u00e4\u00dfl\u00e9 d\u00e4t\u00e9 m\u00fcst \u00df\u00e9 l\u00e4t\u00e9r th\u00e4n th\u00e9 \u00e9nr\u00f6llm\u00e9nt st\u00e4rt d\u00e4t\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#", 
     "The certificate for this learner has been re-validated and the system is re-running the grade for this learner.": "Th\u00e9 \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 f\u00f6r th\u00efs l\u00e9\u00e4rn\u00e9r h\u00e4s \u00df\u00e9\u00e9n r\u00e9-v\u00e4l\u00efd\u00e4t\u00e9d \u00e4nd th\u00e9 s\u00fdst\u00e9m \u00efs r\u00e9-r\u00fcnn\u00efng th\u00e9 gr\u00e4d\u00e9 f\u00f6r th\u00efs l\u00e9\u00e4rn\u00e9r. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #", 
     "The cohort cannot be added": "Th\u00e9 \u00e7\u00f6h\u00f6rt \u00e7\u00e4nn\u00f6t \u00df\u00e9 \u00e4dd\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#", 
     "The cohort cannot be saved": "Th\u00e9 \u00e7\u00f6h\u00f6rt \u00e7\u00e4nn\u00f6t \u00df\u00e9 s\u00e4v\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#", 
@@ -1586,6 +1587,7 @@
     "This team does not have any members.": "Th\u00efs t\u00e9\u00e4m d\u00f6\u00e9s n\u00f6t h\u00e4v\u00e9 \u00e4n\u00fd m\u00e9m\u00df\u00e9rs. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#", 
     "This team is full.": "Th\u00efs t\u00e9\u00e4m \u00efs f\u00fcll. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442#", 
     "This thread is closed.": "Th\u00efs thr\u00e9\u00e4d \u00efs \u00e7l\u00f6s\u00e9d. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#", 
+    "This unit has validation issues.": "Th\u00efs \u00fcn\u00eft h\u00e4s v\u00e4l\u00efd\u00e4t\u00ef\u00f6n \u00efss\u00fc\u00e9s. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#", 
     "This vote could not be processed. Refresh the page and try again.": "Th\u00efs v\u00f6t\u00e9 \u00e7\u00f6\u00fcld n\u00f6t \u00df\u00e9 pr\u00f6\u00e7\u00e9ss\u00e9d. R\u00e9fr\u00e9sh th\u00e9 p\u00e4g\u00e9 \u00e4nd tr\u00fd \u00e4g\u00e4\u00efn. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#", 
     "This {parentCategory} has no {childCategory}": "Th\u00efs {parentCategory} h\u00e4s n\u00f6 {childCategory} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442,#", 
     "Thumbnail": "Th\u00fcm\u00dfn\u00e4\u00efl \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#", 
diff --git a/cms/static/js/i18n/es-419/djangojs.js b/cms/static/js/i18n/es-419/djangojs.js
index 8d2568f239..8823e143ac 100644
--- a/cms/static/js/i18n/es-419/djangojs.js
+++ b/cms/static/js/i18n/es-419/djangojs.js
@@ -137,15 +137,10 @@
     "A valid email address is required": "Un email correcto es requerido.", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "ABCDEFGHIJKLMN\u00d1OPQRSTUVWXYZ", 
     "Abbreviation": "Abreviatura", 
-    "About Me": "Sobre M\u00ed", 
     "About You": "Acerca de usted", 
-    "About me": "Sobre m\u00ed", 
-    "Accomplishments": "Logros", 
-    "Accomplishments Pagination": "Paginaci\u00f3n de Logros", 
     "Account Information": "Informaci\u00f3n de la cuenta", 
     "Account Not Activated": "Cuenta no activada", 
     "Account Settings": "Configuraci\u00f3n de cuenta", 
-    "Account Settings page.": "P\u00e1gina de configuraci\u00f3n de cuenta.", 
     "Action": "Acci\u00f3n", 
     "Action required: Enter a valid date.": "Acci\u00f3n requerida: Introduzca una fecha v\u00e1lida.", 
     "Actions": "Acciones", 
@@ -157,7 +152,6 @@
     "Add Additional Signatory": "A\u00f1adir signatario adicional", 
     "Add Cohort": "A\u00f1adir cohorte", 
     "Add Component:": "A\u00f1adir Componente:", 
-    "Add Country": "A\u00f1adir pa\u00eds", 
     "Add New Component": "A\u00f1adir nuevo Componente", 
     "Add URLs for additional versions": "A\u00f1ada URLs para las versiones adicionales", 
     "Add a Chapter": "A\u00f1adir cap\u00edtulo", 
@@ -168,7 +162,6 @@
     "Add a learning outcome here": "Agregar Resultado de aprendizaje", 
     "Add a response:": "A\u00f1ada su respuesta:", 
     "Add another group": "A\u00f1adir nuevo grupo", 
-    "Add language": "A\u00f1adir idioma", 
     "Add notes about this learner": "A\u00f1ada una nota sobre este estudiante", 
     "Add to Dictionary": "Agregar al diccionario", 
     "Add to Exception List": "Agregar a lista de excepciones", 
@@ -324,7 +317,6 @@
     "Change Manually": "Cambiar Manualmente", 
     "Change My Email Address": "Cambiar mi direcci\u00f3n de correo electr\u00f3nico", 
     "Change image": "Cambiar imagen", 
-    "Change the settings for {display_name}": "Cambiar los ajustes para {display_name}", 
     "Chapter Asset": "Recursos del cap\u00edtulo", 
     "Chapter Name": "Nombre del cap\u00edtulo", 
     "Chapter information": "Informaci\u00f3n del cap\u00edtulo", 
@@ -547,7 +539,6 @@
     "Edit Membership": "Editar membres\u00eda", 
     "Edit Team": "Editar Equipo", 
     "Edit Your Name": "Edite su nombre", 
-    "Edit the name": "Editar el nombre", 
     "Edit this certificate?": "\u00bfEditar este certificado?", 
     "Edit your post below.": "Edite su publicaci\u00f3n a continuaci\u00f3n.", 
     "Editable": "Editable", 
@@ -682,7 +673,6 @@
     "Free text notes": "Notas libres", 
     "Frequently Asked Questions": "Preguntas frecuentes", 
     "Full Name": "Nombre completo", 
-    "Full Profile": "Perfil completo", 
     "Fullscreen": "Pantalla completa", 
     "Fully Supported": "Completamente soportado", 
     "Gender": "G\u00e9nero", 
@@ -845,7 +835,6 @@
     "License Display": "Muestra de la Licencia", 
     "License Type": "Tipo de Licencia", 
     "Limit Access": "Restrinja permisos", 
-    "Limited Profile": "Perfil limitado", 
     "Link Description": "Descripci\u00f3n del v\u00ednculo", 
     "Link Your Account": "Vincular tu cuenta", 
     "Link types should be unique.": "Los tipos de v\u00ednculos deben ser \u00fanicos.", 
@@ -1084,9 +1073,6 @@
     "Professional Certificate for {courseName}": "Certificado Profesional para {courseName}", 
     "Professional Education": "Educaci\u00f3n profesional", 
     "Professional Education Verified Certificate": "Certificado Verificado de Educaci\u00f3n Profesional", 
-    "Profile": "Perfil", 
-    "Profile Image": "Foto de perfil", 
-    "Profile image for {username}": "Foto de perfil para {username}", 
     "Promote another member to Admin to remove your admin rights": "Promueva a otro miembro del equipo a administrador si quiere quitar sus propios privilegios de administrador", 
     "Provisional": "Provisional", 
     "Provisionally Supported": "Soportado de forma provisional", 
@@ -1347,7 +1333,6 @@
     "Team name cannot have more than 255 characters.": "El nombre del equipo no puede tener m\u00e1s de 255 caracteres.", 
     "Teams": "Equipos", 
     "Teams Pagination": "Paginaci\u00f3n de Equipos", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "Comparte con otros usuarios algo sobre ti: donde vives, cuales son tus intereses, porque est\u00e1s tomando estos cursos, o cuales son tus expectativas de aprendizaje.", 
     "Templates": "Plantillas", 
     "Terms of Service and Honor Code": "T\u00e9rminos del servicio y c\u00f3digo de honor", 
     "Text": "Texto", 
@@ -1609,10 +1594,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "Use su c\u00e1mara web para tomar una fotograf\u00eda de su documento de identidad. Usaremos esta foto para verificarla contra la fotograf\u00eda de su cara y el nombre de su cuenta.", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "Use su c\u00e1mara web para tomar una fotograf\u00eda de su cara. Usaremos esta foto para verificarla contra la fotograf\u00eda de su documento de identificaci\u00f3n.", 
     "Used": "Utilizado", 
-    "Used in {count} unit": [
-      "Usado en {count} unidades", 
-      "Usado en {count} unidades"
-    ], 
     "User": "Usuario", 
     "User Email": "Correo electr\u00f3nico del usuario", 
     "Username": "Nombre de usuario", 
@@ -1740,12 +1721,10 @@
     "You haven't added any assets to this course yet.": "No ha a\u00f1adido a\u00fan ning\u00fan recurso a este curso.", 
     "You haven't added any content to this course yet.": "Todav\u00eda no ha a\u00f1adido ning\u00fan contenido a este curso.", 
     "You haven't added any textbooks to this course yet.": "No ha a\u00f1adido a\u00fan ning\u00fan libro de texto a este curso.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "Debes tener 13 a\u00f1os o m\u00e1s para compartir un perfil completo.  Si tienes m\u00e1s de esta edad, aseg\u00farate que has especificado un a\u00f1o de nacimiento en {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "Se debe introducir un email valido para adicionar un nuevo miembro en el equipo. ", 
     "You must sign out and sign back in before your language changes take effect.": "Debes cerrar sesi\u00f3n y volver a iniciar para que se aplique el cambio de idioma", 
     "You must specify a name": "Debe especificar un nombre", 
     "You must specify a name for the cohort": "Debes especificar un nombre para el cohorte", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "Debes especificar un a\u00f1o de nacimiento antes de poder compartir tu perfil completo. Para definir un a\u00f1o de nacimiento, visita {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "Necesita un equipo que tenga una webcam. Cuando reciba un mensaje desde su navegador web, aseg\u00farese de permitir el acceso a su webcam.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "Necesita el documento de identidad, licencia de conducir, pasaporte u otra identificaci\u00f3n certificada por el gobierno, que contenga su foto y nombre.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "Necesitas un ID con tu nombre y foto. Licencia, pasaporte, c\u00e9dula todos son aceptados.", 
@@ -1916,7 +1895,6 @@
     ], 
     "{organization}\\'s logo": "Logo de la {organization}", 
     "{paragraphStart}You entered {boldStart}{email}{boldEnd}. If this email address is associated with your {platform_name} account, we will send a message with password reset instructions to this email address.{paragraphEnd}{paragraphStart}If you do not receive a password reset message, verify that you entered the correct email address, or check your spam folder.{paragraphEnd}{paragraphStart}If you need further assistance, {anchorStart}contact technical support{anchorEnd}.{paragraphEnd}": "{paragraphStart}Tu ingresaste {boldStart}{email}{boldEnd}. Si esta direcci\u00f3n de email est\u00e1 asociada con tu cuenta en {platform_name}, enviaremos un mensaje a esta direcci\u00f3n con instrucciones para restablecer tu contrase\u00f1a.{paragraphEnd}{paragraphStart}Si no recibes ning\u00fan mensaje, verifica que ingresaste la direcci\u00f3n correctamente y revisa tu carpeta de spam.{paragraphEnd}{paragraphStart}Si necesitas asistencia adicional, {anchorStart}contacta al equipo de soporte{anchorEnd}.{paragraphEnd}", 
-    "{platform_name} learners can see my:": "Los usuarios de {platform_name} pueden ver mi:", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}Advertencia:{screen_reader_end} No existe ning\u00fan grupo de contenido.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}Advertencia:{screen_reader_end} El grupo de contenido previamente seleccionado ha sido borrado. Seleccione otro grupo de contenido.", 
     "{start_strong}{total}{end_strong} words submitted in total.": "{start_strong}{total}{end_strong} palabras enviadas en total.", 
diff --git a/cms/static/js/i18n/fake2/djangojs.js b/cms/static/js/i18n/fake2/djangojs.js
index ec40ea0c90..71b910f28d 100644
--- a/cms/static/js/i18n/fake2/djangojs.js
+++ b/cms/static/js/i18n/fake2/djangojs.js
@@ -1451,6 +1451,7 @@
     "Thanks for returning to verify your ID in: {courseName}": "\u0166\u0265\u0250n\u029es \u025f\u00f8\u0279 \u0279\u01dd\u0287n\u0279n\u1d09n\u0183 \u0287\u00f8 \u028c\u01dd\u0279\u1d09\u025f\u028e \u028e\u00f8n\u0279 \u0197\u0110 \u1d09n: {courseName}", 
     "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0166\u0265\u01dd \u0244\u024c\u0141 \u028e\u00f8n \u01ddn\u0287\u01dd\u0279\u01ddd s\u01dd\u01dd\u026fs \u0287\u00f8 b\u01dd \u0250n \u01dd\u026f\u0250\u1d09l \u0250dd\u0279\u01ddss. \u0110\u00f8 \u028e\u00f8n \u028d\u0250n\u0287 \u0287\u00f8 \u0250dd \u0287\u0265\u01dd \u0279\u01ddbn\u1d09\u0279\u01ddd \u026f\u0250\u1d09l\u0287\u00f8: d\u0279\u01dd\u025f\u1d09x?", 
     "The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "\u0166\u0265\u01dd \u0244\u024c\u0141 \u028e\u00f8n \u01ddn\u0287\u01dd\u0279\u01ddd s\u01dd\u01dd\u026fs \u0287\u00f8 b\u01dd \u0250n \u01ddx\u0287\u01dd\u0279n\u0250l l\u1d09n\u029e. \u0110\u00f8 \u028e\u00f8n \u028d\u0250n\u0287 \u0287\u00f8 \u0250dd \u0287\u0265\u01dd \u0279\u01ddbn\u1d09\u0279\u01ddd \u0265\u0287\u0287d:// d\u0279\u01dd\u025f\u1d09x?", 
+    "The certificate available date must be later than the enrollment start date.": "\u0166\u0265\u01dd \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u0250\u028c\u0250\u1d09l\u0250bl\u01dd d\u0250\u0287\u01dd \u026fns\u0287 b\u01dd l\u0250\u0287\u01dd\u0279 \u0287\u0265\u0250n \u0287\u0265\u01dd \u01ddn\u0279\u00f8ll\u026f\u01ddn\u0287 s\u0287\u0250\u0279\u0287 d\u0250\u0287\u01dd.", 
     "The certificate for this learner has been re-validated and the system is re-running the grade for this learner.": "\u0166\u0265\u01dd \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u025f\u00f8\u0279 \u0287\u0265\u1d09s l\u01dd\u0250\u0279n\u01dd\u0279 \u0265\u0250s b\u01dd\u01ddn \u0279\u01dd-\u028c\u0250l\u1d09d\u0250\u0287\u01ddd \u0250nd \u0287\u0265\u01dd s\u028es\u0287\u01dd\u026f \u1d09s \u0279\u01dd-\u0279nnn\u1d09n\u0183 \u0287\u0265\u01dd \u0183\u0279\u0250d\u01dd \u025f\u00f8\u0279 \u0287\u0265\u1d09s l\u01dd\u0250\u0279n\u01dd\u0279.", 
     "The cohort cannot be added": "\u0166\u0265\u01dd \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0254\u0250nn\u00f8\u0287 b\u01dd \u0250dd\u01ddd", 
     "The cohort cannot be saved": "\u0166\u0265\u01dd \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0254\u0250nn\u00f8\u0287 b\u01dd s\u0250\u028c\u01ddd", 
@@ -1586,6 +1587,7 @@
     "This team does not have any members.": "\u0166\u0265\u1d09s \u0287\u01dd\u0250\u026f d\u00f8\u01dds n\u00f8\u0287 \u0265\u0250\u028c\u01dd \u0250n\u028e \u026f\u01dd\u026fb\u01dd\u0279s.", 
     "This team is full.": "\u0166\u0265\u1d09s \u0287\u01dd\u0250\u026f \u1d09s \u025fnll.", 
     "This thread is closed.": "\u0166\u0265\u1d09s \u0287\u0265\u0279\u01dd\u0250d \u1d09s \u0254l\u00f8s\u01ddd.", 
+    "This unit has validation issues.": "\u0166\u0265\u1d09s nn\u1d09\u0287 \u0265\u0250s \u028c\u0250l\u1d09d\u0250\u0287\u1d09\u00f8n \u1d09ssn\u01dds.", 
     "This vote could not be processed. Refresh the page and try again.": "\u0166\u0265\u1d09s \u028c\u00f8\u0287\u01dd \u0254\u00f8nld n\u00f8\u0287 b\u01dd d\u0279\u00f8\u0254\u01ddss\u01ddd. \u024c\u01dd\u025f\u0279\u01dds\u0265 \u0287\u0265\u01dd d\u0250\u0183\u01dd \u0250nd \u0287\u0279\u028e \u0250\u0183\u0250\u1d09n.", 
     "This {parentCategory} has no {childCategory}": "\u0166\u0265\u1d09s {parentCategory} \u0265\u0250s n\u00f8 {childCategory}", 
     "Thumbnail": "\u0166\u0265n\u026fbn\u0250\u1d09l", 
diff --git a/cms/static/js/i18n/fr/djangojs.js b/cms/static/js/i18n/fr/djangojs.js
index e2fb72ba9b..9f6cee11d2 100644
--- a/cms/static/js/i18n/fr/djangojs.js
+++ b/cms/static/js/i18n/fr/djangojs.js
@@ -112,15 +112,10 @@
     "A valid email address is required": "Une adresse email valide est requise", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 
     "Abbreviation": "Abr\u00e9viation", 
-    "About Me": "\u00c0 propos de moi", 
     "About You": "A propos de vous", 
-    "About me": "A propos de moi", 
-    "Accomplishments": "Accomplissements", 
-    "Accomplishments Pagination": "Paginations des r\u00e9alisations", 
     "Account Information": "Information du compte", 
     "Account Not Activated": "Compte non activ\u00e9", 
     "Account Settings": "Param\u00e8tres du compte", 
-    "Account Settings page.": "Param\u00e8tres du compte", 
     "Action": "Action", 
     "Action required: Enter a valid date.": "Action requise : Entrez une date valide.", 
     "Actions": "Actions", 
@@ -131,7 +126,6 @@
     "Add Additional Signatory": "Ajouter une signature additionnelle.", 
     "Add Cohort": "Ajouter une cohorte", 
     "Add Component:": "Ajouter un composant :", 
-    "Add Country": "Ajouter un Pays", 
     "Add New Component": "Ajouter un nouveau Composant", 
     "Add URLs for additional versions": "Ajoutez des URL pour des versions suppl\u00e9mentaires", 
     "Add a Chapter": "Ajouter un chapitre", 
@@ -141,7 +135,6 @@
     "Add a comment": "Ajouter un commentaire", 
     "Add a response:": "Ajouter une r\u00e9ponse", 
     "Add another group": "Ajouter un autre groupe", 
-    "Add language": "Ajouter une langue", 
     "Add to Dictionary": "Ajouter au dictionnaire", 
     "Add your first content group": "Ajouter votre premier groupe de contenu", 
     "Add your first group configuration": "Ajouter votre premier groupe de configuration", 
@@ -267,7 +260,6 @@
     "Change Manually": "Changer manuellement", 
     "Change My Email Address": "Modifier mon adresse email", 
     "Change image": "Modifier l'image", 
-    "Change the settings for {display_name}": "Modifier les param\u00e8tres pour {display_name}", 
     "Chapter Asset": "Ressource associ\u00e9e au chapitre", 
     "Chapter Name": "Nom du chapitre", 
     "Chapter information": "Information sur le chapitre", 
@@ -455,7 +447,6 @@
     "Edit HTML": "Editer le code HTML", 
     "Edit Team": "Modifier l'\u00e9quipe", 
     "Edit Your Name": "Modifier votre nom", 
-    "Edit the name": "Modifier le nom", 
     "Edit this certificate?": "Modifier ce certificat ?", 
     "Editable": "Modifiable", 
     "Editing comment": "Commentaire en cours d'\u00e9dition", 
@@ -562,7 +553,6 @@
     "Free text notes": "Notes libres", 
     "Frequently Asked Questions": "Foire Aux Questions", 
     "Full Name": "Nom complet", 
-    "Full Profile": "Profil complet", 
     "Fullscreen": "Plein \u00e9cran", 
     "Gender": "Genre", 
     "General": "G\u00e9n\u00e9ral", 
@@ -690,7 +680,6 @@
     "License Display": "Affichage de la licence", 
     "License Type": "Type de licence", 
     "Limit Access": "Acc\u00e8s Limit\u00e9", 
-    "Limited Profile": "Profil restreint", 
     "Link Description": "Description du Lien", 
     "Link Your Account": "Liez votre compte", 
     "Link types should be unique.": "Les types de liens doivent \u00eatre uniques.", 
@@ -895,9 +884,6 @@
     "Proctored exams are timed and they record video of each learner taking the exam. The videos are then reviewed to ensure that learners follow all examination rules.": "Les examens v\u00e9rifi\u00e9s sont minut\u00e9s et un enregistrement vid\u00e9o est fait que chaque \u00e9tudiant. Les vid\u00e9o sont ensuite v\u00e9rifi\u00e9es pour s'assurer que les conditions de l'examen \u00e9taient correctes;", 
     "Professional Education": "Formation professionnelle", 
     "Professional Education Verified Certificate": "Certificat v\u00e9rifif\u00e9 professionel", 
-    "Profile": "Profil", 
-    "Profile Image": "Image du profil", 
-    "Profile image for {username}": "Image de profil pour {username}", 
     "Promote another member to Admin to remove your admin rights": "Veuillez ajouter un autre membre comme administrateur pour supprimer vos droits d'administrateurs", 
     "Public": "Public", 
     "Publish": "Publier", 
@@ -1098,7 +1084,6 @@
     "Team name cannot have more than 255 characters.": "Le nom de l'\u00e9quipe ne peut pas d\u00e9passer 255 caract\u00e8res.", 
     "Teams": "\u00c9quipes", 
     "Teams Pagination": "Pagination des \u00e9quipes", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "Parlez nous de vous : o\u00f9 habitez-vous, quels sont vos int\u00e9r\u00eats, pourquoi suivez-vous des cours ou ce que vous souhaitez apprendre.", 
     "Templates": "Mod\u00e8les", 
     "Text": "Texte", 
     "Text color": "Couleur du texte", 
@@ -1282,10 +1267,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "Utilisez votre webcam pour prendre une photo de votre pi\u00e8ce d'identit\u00e9. Nous allons v\u00e9rifier sa concordance avec la photo de votre visage et le nom de votre compte.", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "Utiliser votre webcam pour prendre une photo de votre visage, afin que nous puissions la comparer avec celle de votre pi\u00e8ce d'identit\u00e9.", 
     "Used": "Utilis\u00e9", 
-    "Used in {count} unit": [
-      "Utilis\u00e9 par {count} unit\u00e9s.", 
-      "Utilis\u00e9s par {count} unit\u00e9s."
-    ], 
     "User": "Utilisateur", 
     "User Email": "Email de l'utilisateur", 
     "Username": "Nom d'utilisateur", 
@@ -1390,12 +1371,10 @@
     "You haven't added any assets to this course yet.": "Vous n'avez encore ajout\u00e9 aucune ressource dans ce cours.", 
     "You haven't added any content to this course yet.": "Vous n'avez pas encore ajout\u00e9 de contenu \u00e0 ce cours.", 
     "You haven't added any textbooks to this course yet.": "Vous n'avez encore ajout\u00e9 aucun manuel \u00e0 ce cours.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "Vous devez avoir plus de 13 ans pour partager un profil complet. Si vous avez plus de 13 ans, assurez-vous que votre ann\u00e9e de naissance est correcte dans {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "Vous devez saisir une adresse e-mail valide afin d'ajouter un nouveau membre \u00e0 l'\u00e9quipe", 
     "You must sign out and sign back in before your language changes take effect.": "Vous devez vous d\u00e9connecter puis vous connecter \u00e0 nouveau afin que les param\u00e8tres de langue prennent effet.", 
     "You must specify a name": "Vous devez indiquer un nom", 
     "You must specify a name for the cohort": "Vous devez indiquer un nom pour la cohorte", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "Vous devez renseigner votre ann\u00e9e de naissance avant de pouvoir partager votre profil complet. Pour renseigner votre ann\u00e9e de naissance, allez sur {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "Vous avez besoin d'un ordinateur dot\u00e9 d'une webcam. Lors que votre explorateur vous le demandera, assurez vous de lui donner l'autorisation d'acc\u00e9der \u00e0 la webcam.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "Vous avez besoin d'un permis de conduire, d'un passeport ou d'une pi\u00e8ce d'identit\u00e9 avec votre nom et photo.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "Vous avez besoin d'un permis de conduire, un passeport ou toute pi\u00e8ce d'identit\u00e9 avec votre nom et photo.", 
@@ -1526,7 +1505,6 @@
       "{numVotes} Vote", 
       "{numVotes} Votes"
     ], 
-    "{platform_name} learners can see my:": "Les utilisateurs de {platform_name} peuvent voir mon:", 
     "{start_strong}{total}{end_strong} words submitted in total.": "{start_strong}{total}{end_strong} mots soumis au total.", 
     "{unread_comments_count} new": "{unread_comments_count} nouveaux", 
     "\u2026": "\u2026"
diff --git a/cms/static/js/i18n/he/djangojs.js b/cms/static/js/i18n/he/djangojs.js
index b14d84eaac..0691756f33 100644
--- a/cms/static/js/i18n/he/djangojs.js
+++ b/cms/static/js/i18n/he/djangojs.js
@@ -19,9 +19,17 @@
   /* gettext library */
 
   django.catalog = {
+    " and ": "\u05d5\u05d2\u05dd", 
     " learner does not exist in LMS and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3 \u05d0\u05d9\u05e0\u05d5 \u05e7\u05d9\u05d9\u05dd \u05d1-LMS \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " learner is already white listed and not added to the exception list": " \u05d4\u05ea\u05dc\u05de\u05d9\u05d3 \u05db\u05d1\u05e8 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05d4 \u05d4\u05d1\u05d8\u05d5\u05d7\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd ", 
+    " learner is not enrolled in course and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3 \u05d0\u05d9\u05e0\u05d5 \u05e8\u05e9\u05d5\u05dd \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     " learner is successfully added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3 \u05e0\u05d5\u05e1\u05e3 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " learners are already white listed and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05db\u05d1\u05e8 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05d4 \u05d4\u05dc\u05d1\u05e0\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd ", 
+    " learners are not enrolled in course and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d0\u05d9\u05e0\u05dd \u05e8\u05e9\u05d5\u05de\u05d9\u05dd \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     " learners are successfully added to exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d5 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " learners do not exist in LMS and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05dc\u05d0 \u05e7\u05d9\u05d9\u05de\u05d9\u05dd \u05d1-LMS \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " record is not in correct format and not added to the exception list": " \u05d4\u05e8\u05e9\u05d5\u05de\u05d4 \u05d0\u05d9\u05e0\u05d4 \u05d1\u05ea\u05d1\u05e0\u05d9\u05ea \u05d4\u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d4 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " records are not in correct format and not added to the exception list": " \u05d4\u05e8\u05e9\u05d5\u05de\u05d5\u05ea \u05d0\u05d9\u05e0\u05df \u05d1\u05ea\u05d1\u05e0\u05d9\u05ea \u05d4\u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     "#Replies": "#\u05ea\u05e9\u05d5\u05d1\u05d5\u05ea", 
     "%(cohort_name)s (%(user_count)s)": "%(cohort_name)s (%(user_count)s)", 
     "%(comments_count)s %(span_sr_open)scomments %(span_close)s": "%(comments_count)s %(span_sr_open)s\u05d4\u05e2\u05e8\u05d5\u05ea %(span_close)s", 
@@ -104,11 +112,14 @@
     "%s from now": "%s \u05de\u05e2\u05db\u05e9\u05d9\u05d5", 
     "(Add signatories for a certificate)": "(\u05d4\u05d5\u05e1\u05e3 \u05d7\u05ea\u05d9\u05de\u05d5\u05ea \u05dc\u05ea\u05e2\u05d5\u05d3\u05d4)", 
     "(Caption will be displayed when you start playing the video.)": "(\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05d9\u05d5\u05e6\u05d2\u05d5 \u05db\u05d0\u05e9\u05e8 \u05ea\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5).", 
+    "(Community TA)": "(\u05e2\u05d5\u05d6\u05e8 \u05d4\u05d5\u05e8\u05d0\u05d4 \u05e7\u05d4\u05d9\u05dc\u05ea\u05d9)", 
     "(Required Field)": "(\u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4)", 
+    "(Staff)": "(\u05e6\u05d5\u05d5\u05ea)", 
     "(contains %(student_count)s student)": [
       "(\u05db\u05d5\u05dc\u05dc\u05ea \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 %(student_count)s)", 
       "(\u05db\u05d5\u05dc\u05dc\u05ea %(student_count)s \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd)"
     ], 
+    "(optional)": "(\u05d0\u05d5\u05e4\u05e6\u05d9\u05d5\u05e0\u05d0\u05dc\u05d9)", 
     "- Sortable": "-\u05e0\u05d9\u05ea\u05df \u05dc\u05de\u05d9\u05d5\u05df", 
     ": video upload complete.": ": \u05d4\u05e2\u05dc\u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05d5\u05e9\u05dc\u05de\u05d4.", 
     "<%= user %> already in exception list.": "<%= user %> \u05db\u05d1\u05e8 \u05e0\u05de\u05e6\u05d0 \u05d1\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd.", 
@@ -121,15 +132,10 @@
     "A valid email address is required": "\u05d3\u05e8\u05d5\u05e9\u05d4 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05ea\u05e7\u05d9\u05e0\u05d4", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9\u05db\u05dc\u05de\u05e0\u05e1\u05e2\u05e4\u05e6\u05e7\u05e8\u05e9\u05ea", 
     "Abbreviation": "\u05e7\u05d9\u05e6\u05d5\u05e8", 
-    "About Me": "\u05e2\u05dc \u05e2\u05e6\u05de\u05d9", 
     "About You": "\u05e2\u05dc \u05e2\u05e6\u05de\u05da", 
-    "About me": "\u05e2\u05dc \u05e2\u05e6\u05de\u05d9", 
-    "Accomplishments": "\u05d4\u05d9\u05e9\u05d2\u05d9\u05dd", 
-    "Accomplishments Pagination": "\u05e2\u05d9\u05de\u05d5\u05d3 \u05d4\u05d9\u05e9\u05d2\u05d9\u05dd", 
     "Account Information": "\u05e4\u05e8\u05d8\u05d9 \u05d7\u05e9\u05d1\u05d5\u05df", 
     "Account Not Activated": "\u05d4\u05d7\u05e9\u05d1\u05d5\u05df \u05d0\u05d9\u05e0\u05d5 \u05de\u05d5\u05e4\u05e2\u05dc", 
     "Account Settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d7\u05e9\u05d1\u05d5\u05df", 
-    "Account Settings page.": "\u05e2\u05de\u05d5\u05d3 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d7\u05e9\u05d1\u05d5\u05df", 
     "Action": "\u05e4\u05e2\u05d5\u05dc\u05d4", 
     "Action required: Enter a valid date.": "\u05e0\u05d3\u05e8\u05e9\u05ea \u05e4\u05e2\u05d5\u05dc\u05d4: \u05d4\u05d6\u05df \u05ea\u05d0\u05e8\u05d9\u05da \u05d7\u05d5\u05e7\u05d9.", 
     "Actions": "\u05e4\u05e2\u05d5\u05dc\u05d5\u05ea", 
@@ -141,28 +147,30 @@
     "Add Additional Signatory": "\u05d4\u05d5\u05e1\u05e3 \u05d7\u05ea\u05d9\u05de\u05d4 \u05e0\u05d5\u05e1\u05e4\u05ea", 
     "Add Cohort": "\u05d4\u05d5\u05e1\u05e3 \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
     "Add Component:": "\u05d4\u05d5\u05e1\u05e3 \u05e8\u05db\u05d9\u05d1:", 
-    "Add Country": "\u05d4\u05d5\u05e1\u05e3 \u05de\u05d3\u05d9\u05e0\u05d4", 
     "Add New Component": "\u05d4\u05d5\u05e1\u05e3 \u05e8\u05db\u05d9\u05d1 \u05d7\u05d3\u05e9", 
     "Add URLs for additional versions": "\u05d4\u05d5\u05e1\u05e3 \u05db\u05ea\u05d5\u05d1\u05d5\u05ea URL \u05e2\u05d1\u05d5\u05e8 \u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05e0\u05d5\u05e1\u05e4\u05d5\u05ea", 
     "Add a Chapter": "\u05d4\u05d5\u05e1\u05e3 \u05e4\u05e8\u05e7", 
     "Add a New Cohort": "\u05d4\u05d5\u05e1\u05e3 \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05d7\u05d3\u05e9\u05d4", 
     "Add a Post": "\u05d4\u05d5\u05e1\u05e3 \u05e4\u05d5\u05e1\u05d8", 
     "Add a Response": "\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d2\u05d5\u05d1\u05d4", 
+    "Add a clear and descriptive title to encourage participation. (Required)": "\u05d4\u05d5\u05e1\u05e3 \u05db\u05d5\u05ea\u05e8\u05ea \u05d1\u05e8\u05d5\u05e8\u05d4 \u05d5\u05ea\u05d9\u05d0\u05d5\u05e8\u05d9\u05ea \u05d1\u05db\u05d3\u05d9 \u05dc\u05e2\u05d5\u05d3\u05d3 \u05d0\u05ea \u05d4\u05d4\u05e9\u05ea\u05ea\u05e4\u05d5\u05ea \u05d1\u05d3\u05d9\u05d5\u05df. (\u05d7\u05d5\u05d1\u05d4).", 
     "Add a comment": "\u05d4\u05d5\u05e1\u05e3 \u05d4\u05e2\u05e8\u05d4", 
     "Add a learning outcome here": "\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d5\u05e6\u05d0\u05ea \u05dc\u05de\u05d9\u05d3\u05d4 \u05db\u05d0\u05df", 
     "Add a response:": "\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d2\u05d5\u05d1\u05d4:", 
     "Add another group": "\u05d4\u05d5\u05e1\u05e3 \u05e7\u05d1\u05d5\u05e6\u05d4 \u05d0\u05d7\u05e8\u05ea", 
-    "Add language": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05e4\u05d4", 
     "Add notes about this learner": "\u05d4\u05d5\u05e1\u05e3 \u05d4\u05e2\u05e8\u05d5\u05ea \u05dc\u05d2\u05d1\u05d9 \u05dc\u05d5\u05de\u05d3 \u05d6\u05d4", 
     "Add to Dictionary": "\u05d4\u05d5\u05e1\u05e3 \u05dc\u05de\u05d9\u05dc\u05d5\u05df", 
     "Add to Exception List": "\u05d4\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     "Add your first content group": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05d4\u05e8\u05d0\u05e9\u05d5\u05e0\u05d4 \u05e9\u05dc\u05da", 
     "Add your first group configuration": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05d4\u05d2\u05d3\u05e8\u05ea \u05ea\u05e6\u05d5\u05e8\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea\u05da \u05d4\u05e8\u05d0\u05e9\u05d5\u05e0\u05d4 ", 
     "Add your first textbook": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05e1\u05e4\u05e8 \u05d4\u05dc\u05d9\u05de\u05d5\u05d3 \u05d4\u05e8\u05d0\u05e9\u05d5\u05df \u05e9\u05dc\u05da", 
+    "Add your post to a relevant topic to help others find it. (Required)": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05dc\u05da \u05dc\u05e0\u05d5\u05e9\u05d0 \u05d4\u05e8\u05dc\u05d5\u05d5\u05e0\u05d8\u05d9 \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e7\u05dc \u05e2\u05dc \u05d0\u05d7\u05e8\u05d9\u05dd \u05dc\u05de\u05e6\u05d5\u05d0 \u05d0\u05d5\u05ea\u05d5. (\u05d7\u05d5\u05d1\u05d4)", 
     "Add {role} Access": "\u05d4\u05d5\u05e1\u05e3 \u05d2\u05d9\u05e9\u05ea {role}", 
     "Adding": "\u05de\u05d5\u05e1\u05d9\u05e3", 
     "Adding the selected course to your cart": "\u05d4\u05d5\u05e1\u05e4\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e9\u05e0\u05d1\u05d7\u05e8 \u05dc\u05e2\u05d2\u05dc\u05ea \u05d4\u05e7\u05e0\u05d9\u05d5\u05ea \u05e9\u05dc\u05da", 
     "Additional Information": "\u05de\u05d9\u05d3\u05e2 \u05e0\u05d5\u05e1\u05e3", 
+    "Additional posts could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e4\u05d5\u05e1\u05d8\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d9\u05dd. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "Additional responses could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05ea\u05d2\u05d5\u05d1\u05d5\u05ea \u05e0\u05d5\u05e1\u05e4\u05d5\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Adjust video speed": "\u05d4\u05ea\u05d0\u05dd \u05d0\u05ea \u05de\u05d4\u05d9\u05e8\u05d5\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5", 
     "Adjust video volume": "\u05d4\u05ea\u05d0\u05dd \u05d0\u05ea \u05e2\u05d5\u05e6\u05de\u05ea \u05d4\u05e7\u05d5\u05dc \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5", 
     "Admin": "\u05de\u05e0\u05d4\u05dc", 
@@ -183,6 +191,7 @@
     "All groups must have a name.": "\u05dc\u05db\u05dc \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd.", 
     "All groups must have a unique name.": "\u05dc\u05db\u05dc \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd \u05d9\u05d9\u05d7\u05d5\u05d3\u05d9.", 
     "All learners in the {cohort_name} cohort": "\u05db\u05dc \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3 {cohort_name}", 
+    "All learners in the {track_name} track": "\u05db\u05dc \u05de\u05d9 \u05e9\u05dc\u05d5\u05de\u05d3 \u05d1\u05de\u05e1\u05dc\u05d5\u05dc {track_name}", 
     "All learners who are enrolled in this course": "\u05db\u05dc \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05e9\u05e8\u05e9\u05d5\u05de\u05d9\u05dd \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4", 
     "All payment options are currently unavailable.": "\u05db\u05dc \u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05d4\u05ea\u05e9\u05dc\u05d5\u05dd \u05d0\u05d9\u05e0\u05df \u05d6\u05de\u05d9\u05e0\u05d5\u05ea \u05db\u05e8\u05d2\u05e2.", 
     "All professional education courses are fee-based, and require payment to complete the enrollment process.": "\u05db\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05d1\u05d7\u05d9\u05e0\u05d5\u05da \u05d4\u05de\u05e7\u05e6\u05d5\u05e2\u05d9 \u05de\u05d1\u05d5\u05e1\u05e1\u05d9\u05dd \u05e2\u05dc \u05ea\u05e9\u05dc\u05d5\u05dd, \u05d5\u05dc\u05db\u05df \u05e0\u05d3\u05e8\u05e9 \u05ea\u05e9\u05dc\u05d5\u05dd \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05ea\u05d4\u05dc\u05d9\u05da \u05d4\u05d4\u05e8\u05e9\u05de\u05d4.", 
@@ -211,6 +220,7 @@
     "An error has occurred. Refresh the page, and then try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
     "An error has occurred. Try refreshing the page, or check your Internet connection.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4. \u05e0\u05e1\u05d4 \u05dc\u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d0\u05d5 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d7\u05d9\u05d1\u05d5\u05e8 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8.", 
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d0\u05d7\u05d6\u05d5\u05e8 \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05da. \u05d0\u05e0\u05d0 \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1 \u05de\u05d0\u05d5\u05d7\u05e8 \u05d9\u05d5\u05ea\u05e8. \u05d0\u05dd \u05d4\u05d1\u05e2\u05d9\u05d4 \u05e0\u05de\u05e9\u05db\u05ea, \u05e4\u05e0\u05d4 \u05dc\u05ea\u05de\u05d9\u05db\u05d4 \u05d8\u05db\u05e0\u05d9\u05ea. ", 
+    "An error occurred when signing you in to %s.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05d4\u05d7\u05d9\u05d1\u05d5\u05e8 \u05e9\u05dc\u05da \u05dc-%s.", 
     "An error occurred while removing the member from the team. Try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05d4\u05e1\u05e8\u05ea \u05d7\u05d1\u05e8 \u05de\u05d4\u05e6\u05d5\u05d5\u05ea. \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
     "An error occurred.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4.", 
     "An error occurred. Make sure that the student's username or email address is correct and try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4. \u05d0\u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d0\u05d5 \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05d5 \u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
@@ -233,6 +243,7 @@
     "Are you sure you want to delete this update?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea \u05e2\u05d3\u05db\u05d5\u05df \u05d6\u05d4?", 
     "Are you sure you want to delete {email} from the course team for \u201c{container}\u201d?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05de\u05d7\u05d5\u05e7  {email} \u05de\u05e6\u05d5\u05d5\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e2\u05d1\u05d5\u05e8 \u201c{container}\u201d? ", 
     "Are you sure you want to delete {email} from the library \u201c{container}\u201d?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea {email} \u05de\u05e1\u05e4\u05e8\u05d9\u05d9\u05ea \u201c{container}\u201d?", 
+    "Are you sure you want to remove this video from the list?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05e1\u05d9\u05e8 \u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d6\u05d4 \u05de\u05d4\u05e8\u05e9\u05d9\u05de\u05d4?", 
     "Are you sure you want to restrict {email} access to \u201c{container}\u201d?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05d4\u05d2\u05d1\u05d9\u05dc \u05d0\u05ea \u05d2\u05d9\u05e9\u05ea {email}  \u05dc\u201c{container}\u201d?", 
     "Are you sure you want to revert to the last published version of the unit? You cannot undo this action.": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d2\u05e8\u05e1\u05d4 \u05d4\u05d0\u05d7\u05e8\u05d5\u05e0\u05d4 \u05e9\u05dc \u05d9\u05d7\u05d9\u05d3\u05d4 \u05d6\u05d5, \u05e9\u05e4\u05d5\u05e8\u05e1\u05de\u05d4 ? \u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05d1\u05d8\u05dc \u05e4\u05e2\u05d5\u05dc\u05d4 \u05d6\u05d5. ", 
     "Are you sure you wish to delete this item. It cannot be reversed!\n\nAlso any content that links/refers to this item will no longer work (e.g. broken images and/or links)": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05de\u05d7\u05d5\u05e7 \u05e4\u05e8\u05d9\u05d8 \u05d6\u05d4. \u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05d9\u05d4\u05d9\u05d4 \u05dc\u05e9\u05d7\u05d6\u05e8 \u05d0\u05ea \u05d4\u05e4\u05e2\u05d5\u05dc\u05d4!\n\n\u05d1\u05e0\u05d5\u05e1\u05e3, \u05db\u05dc \u05ea\u05d5\u05db\u05df \u05e9\u05de\u05e7\u05e9\u05e8/\u05de\u05ea\u05d9\u05d9\u05d7\u05e1 \u05dc\u05e4\u05e8\u05d9\u05d8 \u05d6\u05d4 \u05dc\u05d0 \u05d9\u05e2\u05d1\u05d5\u05d3 \u05d9\u05d5\u05ea\u05e8 (\u05dc\u05d3\u05d5\u05d2\u05de\u05d4, \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05d5/\u05d0\u05d5 \u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd \u05e9\u05d1\u05d5\u05e8\u05d9\u05dd)", 
@@ -301,7 +312,6 @@
     "Change Manually": "\u05e9\u05e0\u05d4 \u05d9\u05d3\u05e0\u05d9\u05ea", 
     "Change My Email Address": "\u05e9\u05e0\u05d4 \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05d9", 
     "Change image": "\u05e9\u05e0\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4", 
-    "Change the settings for {display_name}": "\u05e9\u05e0\u05d4 \u05d0\u05ea \u05d4\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 {display_name}", 
     "Chapter Asset": "\u05e0\u05db\u05e1 \u05d4\u05e4\u05e8\u05e7", 
     "Chapter Name": "\u05e9\u05dd \u05d4\u05e4\u05e8\u05e7", 
     "Chapter information": "\u05de\u05d9\u05d3\u05e2 \u05e2\u05dc \u05d4\u05e4\u05e8\u05e7", 
@@ -330,6 +340,7 @@
     "Choose a .csv file": "\u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 CSV.", 
     "Choose a content group to associate": "\u05d1\u05d7\u05e8 \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05dc\u05e7\u05e9\u05e8", 
     "Choose mode": "\u05d1\u05d7\u05e8 \u05de\u05e6\u05d1", 
+    "Choose new file": "\u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 \u05d7\u05d3\u05e9", 
     "Choose one": "\u05d1\u05d7\u05e8 \u05d0\u05d7\u05d3", 
     "Choose your institution from the list below:": "\u05d1\u05d7\u05e8 \u05d0\u05ea \u05d4\u05de\u05d5\u05e1\u05d3 \u05e9\u05dc\u05da \u05de\u05d4\u05e8\u05e9\u05d9\u05de\u05d4 \u05e9\u05dc\u05d4\u05dc\u05df:", 
     "Circle": "\u05de\u05e2\u05d2\u05dc", 
@@ -356,6 +367,7 @@
     "Code block": "\u05d1\u05dc\u05d5\u05e7 \u05e7\u05d5\u05d3", 
     "Cohort Assignment Method": "\u05e9\u05d9\u05d8\u05ea \u05d4\u05e7\u05e6\u05d0\u05d4 \u05dc\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
     "Cohort Name": "\u05e9\u05dd \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
+    "Cohorts": "\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05dc\u05de\u05d9\u05d3\u05d4", 
     "Cohorts Disabled": "\u05d1\u05d8\u05dc \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
     "Cohorts Enabled": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05de\u05d0\u05d5\u05e4\u05e9\u05e8\u05ea", 
     "Collapse All": "\u05db\u05d5\u05d5\u05e5 \u05d4\u05db\u05dc", 
@@ -369,6 +381,7 @@
     "Commentary": "\u05d4\u05e2\u05e8\u05d5\u05ea", 
     "Common Problem Types": "\u05e1\u05d5\u05d2\u05d9 \u05d1\u05e2\u05d9\u05d5\u05ea \u05e0\u05e4\u05d5\u05e6\u05d5\u05ea", 
     "Community TA": "\u05e2\u05d5\u05d6\u05e8 \u05d4\u05d5\u05e8\u05d0\u05d4 \u05d1\u05e4\u05d5\u05e8\u05d5\u05dd", 
+    "Completed": "\u05d4\u05d5\u05e9\u05dc\u05dd", 
     "Component": "\u05e8\u05db\u05d9\u05d1", 
     "Component Location ID": "\u05de\u05d6\u05d4\u05d4 \u05de\u05d9\u05e7\u05d5\u05dd \u05e8\u05db\u05d9\u05d1", 
     "Configure": "\u05d4\u05d2\u05d3\u05e8", 
@@ -445,6 +458,7 @@
     "Deactivate": "\u05d1\u05d8\u05dc ", 
     "Decrease indent": "\u05d4\u05e7\u05d8\u05df \u05d4\u05d6\u05d7\u05d4", 
     "Default": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc", 
+    "Default (Local Time Zone)": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc (\u05d0\u05d6\u05d5\u05e8\u05d9 \u05d6\u05de\u05df \u05de\u05e7\u05d5\u05de\u05d9\u05d9\u05dd)", 
     "Default Timed Transcript": "\u05ea\u05de\u05dc\u05d9\u05dc \u05de\u05ea\u05d5\u05d6\u05de\u05df \u05db\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc", 
     "Delete": "\u05de\u05d7\u05e7", 
     "Delete \"<%= signatoryName %>\" from the list of signatories?": "\u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea \"<%= signatoryName %>\" \u05de\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05ea\u05d9\u05de\u05d5\u05ea?", 
@@ -459,12 +473,15 @@
     "Delete this %(item_display_name)s?": "\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4%(item_display_name)s?", 
     "Delete this asset": "\u05de\u05d7\u05e7 \u05e0\u05db\u05e1 \u05d6\u05d4", 
     "Delete this team?": "\u05dc\u05de\u05d7\u05d5\u05e7 \u05e6\u05d5\u05d5\u05ea \u05d6\u05d4?", 
+    "Delete this {xblock_type} (and prerequisite)?": "\u05d4\u05d0\u05dd \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea  {xblock_type} (and prerequisite) \u05d6\u05d4? ", 
+    "Delete this {xblock_type}?": "\u05d4\u05d0\u05dd \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea {xblock_type} \u05d6\u05d4?", 
     "Delete \u201c<%= name %>\u201d?": "\u05de\u05d7\u05e7 \u201c<%= name %>\u201d?", 
     "Deleted Content Group": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05e0\u05de\u05d7\u05e7\u05d4", 
     "Deleting": "\u05de\u05d5\u05d7\u05e7", 
     "Deleting a team is permanent and cannot be undone. All members are removed from the team, and team discussions can no longer be accessed.": "\u05de\u05d7\u05d9\u05e7\u05ea \u05e6\u05d5\u05d5\u05ea \u05d4\u05d9\u05d0 \u05e7\u05d1\u05d5\u05e2\u05d4 \u05d5\u05d0\u05d9\u05df \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05dc\u05d1\u05d8\u05dc\u05d4. \u05db\u05dc \u05d4\u05d7\u05d1\u05e8\u05d9\u05dd \u05d4\u05d5\u05e1\u05e8\u05d5 \u05de\u05d4\u05e6\u05d5\u05d5\u05ea, \u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d2\u05e9\u05ea \u05d9\u05d5\u05ea\u05e8 \u05dc\u05d3\u05d9\u05d5\u05e0\u05d9 \u05d4\u05e6\u05d5\u05d5\u05ea.", 
     "Deleting a textbook cannot be undone and once deleted any reference to it in your courseware's navigation will also be removed.": "\u05de\u05d7\u05d9\u05e7\u05ea \u05e1\u05e4\u05e8 \u05dc\u05d9\u05de\u05d5\u05d3 \u05d0\u05d9\u05e0\u05e0\u05d4 \u05d4\u05e4\u05d9\u05db\u05d4 \u05d5\u05d1\u05e8\u05d2\u05e2 \u05e9\u05ea\u05d1\u05d5\u05e6\u05e2 \u05de\u05d7\u05d9\u05e7\u05d4, \u05db\u05dc \u05d4\u05e4\u05e0\u05d9\u05d9\u05d4 \u05de\u05d4\u05dc\u05d5\u05de\u05d3\u05d4 \u05dc\u05e1\u05e4\u05e8 \u05ea\u05d9\u05de\u05d7\u05e7 \u05d2\u05dd \u05db\u05df. ", 
     "Deleting this %(item_display_name)s is permanent and cannot be undone.": "\u05de\u05d7\u05d9\u05e7\u05ea %(item_display_name)s \u05d4\u05d9\u05d0 \u05e7\u05d1\u05d5\u05e2\u05d4 \u05d5\u05d0\u05d9\u05e0\u05d4 \u05d4\u05e4\u05d9\u05db\u05d4.", 
+    "Deleting this {xblock_type} is permanent and cannot be undone.": "\u05de\u05d7\u05d9\u05e7\u05ea {xblock_type} \u05d6\u05d4 \u05d4\u05d9\u05d0 \u05e7\u05d1\u05d5\u05e2\u05d4 \u05d5\u05d0\u05d9\u05e0\u05d4 \u05d4\u05e4\u05d9\u05db\u05d4.", 
     "Deprecated": "\u05dc\u05d0  \u05de\u05d5\u05de\u05dc\u05e5 \u05dc\u05e9\u05d9\u05de\u05d5\u05e9", 
     "Description": "\u05ea\u05d9\u05d0\u05d5\u05e8", 
     "Description of the certificate": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4", 
@@ -515,7 +532,6 @@
     "Edit Membership": "\u05e2\u05e8\u05d5\u05da \u05d7\u05d1\u05e8\u05d5\u05ea", 
     "Edit Team": "\u05e2\u05e8\u05d5\u05da \u05e6\u05d5\u05d5\u05ea", 
     "Edit Your Name": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05e9\u05de\u05da", 
-    "Edit the name": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e9\u05dd", 
     "Edit this certificate?": "\u05dc\u05e2\u05e8\u05d5\u05da \u05ea\u05e2\u05d5\u05d3\u05d4 \u05d6\u05d5?", 
     "Edit your post below.": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05dc\u05d4\u05dc\u05df.", 
     "Editable": "\u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05e8\u05d9\u05db\u05d4", 
@@ -543,6 +559,7 @@
     "Enrollment Date": "\u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Enrollment Mode": "\u05de\u05e6\u05d1 \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Enrollment Opens on": "\u05d4\u05e8\u05d9\u05e9\u05d5\u05dd \u05e0\u05e4\u05ea\u05d7 \u05d1", 
+    "Enrollment Tracks": "\u05de\u05e1\u05dc\u05d5\u05dc\u05d9 \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Ensure that you can see your photo and read your name": "\u05d5\u05d3\u05d0 \u05db\u05d9 \u05e0\u05d9\u05ea\u05df \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea\u05da \u05d5\u05dc\u05e7\u05e8\u05d5\u05d0 \u05d0\u05ea \u05e9\u05de\u05da.", 
     "Enter Due Date and Time": "\u05d4\u05d6\u05df \u05ea\u05d0\u05e8\u05d9\u05da \u05e1\u05d9\u05d5\u05dd \u05d5\u05e9\u05e2\u05d4", 
     "Enter Start Date and Time": "\u05d4\u05d6\u05df \u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05ea\u05d7\u05dc\u05d4 \u05d5\u05e9\u05e2\u05d4", 
@@ -577,6 +594,7 @@
     "Error getting student list.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd.", 
     "Error getting student progress url for '<%- student_id %>'. Make sure that the student identifier is spelled correctly.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05db\u05ea\u05d5\u05d1\u05ea URL \u05e9\u05dc \u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05e2\u05d1\u05d5\u05e8 '<%- student_id %>'. \u05d5\u05d3\u05d0 \u05e9\u05de\u05d6\u05d4\u05d4 \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05de\u05d0\u05d5\u05d9\u05ea \u05db\u05d4\u05dc\u05db\u05d4.", 
     "Error getting task history for problem '<%- problem_id %>' and student '<%- student_id %>'. Make sure that the problem and student identifiers are complete and correct.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05e7\u05d1\u05dc\u05ea \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05d9\u05ea \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05d4\u05d1\u05e2\u05d9\u05d4 '<%- problem_id %>' \u05d5\u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8  '<%- student_id %>'. \u05d5\u05d3\u05d0 \u05e9\u05de\u05d6\u05d4\u05d4 \u05d4\u05d1\u05e2\u05d9\u05d4 \u05d5\u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05dd \u05de\u05dc\u05d0\u05d9\u05dd \u05d5\u05e0\u05db\u05d5\u05e0\u05d9\u05dd.", 
+    "Error importing course": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05d1\u05d5\u05d0 \u05e7\u05d5\u05e8\u05e1.", 
     "Error listing task history for this student and problem.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e8\u05d9\u05e9\u05d5\u05dd \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05ea \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d6\u05d4 \u05d5\u05d1\u05e2\u05d9\u05d4 \u05d6\u05d5.", 
     "Error posting your message.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05e4\u05e8\u05e1\u05d5\u05dd \u05d4\u05d4\u05d5\u05d3\u05e2\u05d4 \u05e9\u05dc\u05da", 
     "Error removing user": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e1\u05e8\u05ea \u05de\u05e9\u05ea\u05de\u05e9", 
@@ -645,7 +663,6 @@
     "Free text notes": "\u05d4\u05e2\u05e8\u05d5\u05ea \u05d8\u05e7\u05e1\u05d8 \u05d7\u05d5\u05e4\u05e9\u05d9", 
     "Frequently Asked Questions": "\u05e9\u05d0\u05dc\u05d5\u05ea \u05e0\u05e4\u05d5\u05e6\u05d5\u05ea", 
     "Full Name": "\u05e9\u05dd \u05de\u05dc\u05d0", 
-    "Full Profile": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05de\u05dc\u05d0", 
     "Fullscreen": "\u05de\u05e1\u05da \u05de\u05dc\u05d0", 
     "Fully Supported": "\u05e0\u05ea\u05de\u05da \u05d1\u05de\u05dc\u05d5\u05d0\u05d5", 
     "Gender": "\u05de\u05d2\u05d3\u05e8", 
@@ -807,7 +824,6 @@
     "License Display": "\u05ea\u05e6\u05d5\u05d2\u05ea \u05e8\u05d9\u05e9\u05d9\u05d5\u05df", 
     "License Type": "\u05e1\u05d5\u05d2 \u05e8\u05d9\u05e9\u05d9\u05d5\u05df", 
     "Limit Access": "\u05d2\u05d9\u05e9\u05d4 \u05de\u05d5\u05d2\u05d1\u05dc\u05ea", 
-    "Limited Profile": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d7\u05dc\u05e7\u05d9", 
     "Link Description": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05e7\u05d9\u05e9\u05d5\u05e8", 
     "Link Your Account": "\u05e7\u05e9\u05e8 \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da", 
     "Link types should be unique.": "\u05e2\u05dc \u05e1\u05d5\u05d2\u05d9 \u05d4\u05e7\u05d9\u05e9\u05d5\u05e8 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d9\u05d7\u05d5\u05d3\u05d9\u05d9\u05dd.", 
@@ -828,6 +844,7 @@
     "Loading content": "\u05d8\u05d5\u05e2\u05df \u05ea\u05d5\u05db\u05df", 
     "Loading data...": "\u05d8\u05d5\u05e2\u05df \u05e0\u05ea\u05d5\u05e0\u05d9\u05dd...", 
     "Loading more threads": "\u05d8\u05d5\u05e2\u05df \u05e2\u05d5\u05d3 \u05e9\u05e8\u05e9\u05d5\u05e8\u05d9\u05dd", 
+    "Loading posts list": "\u05d8\u05d5\u05e2\u05df \u05e8\u05e9\u05d9\u05de\u05ea \u05e4\u05d5\u05e1\u05d8\u05d9\u05dd", 
     "Loading your courses": "\u05d8\u05d5\u05e2\u05df \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05e9\u05dc\u05da", 
     "Location in Course": "\u05de\u05d9\u05e7\u05d5\u05dd \u05d1\u05e7\u05d5\u05e8\u05e1", 
     "Lock this asset": "\u05e0\u05e2\u05dc \u05e0\u05db\u05e1 \u05d6\u05d4", 
@@ -879,6 +896,7 @@
     "New document": "\u05de\u05e1\u05de\u05da \u05d7\u05d3\u05e9", 
     "New enrollment mode:": "\u05de\u05e6\u05d1 \u05d4\u05e8\u05e9\u05de\u05d4 \u05d7\u05d3\u05e9:", 
     "New window": "\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9", 
+    "New {component_type}": "\u05d7\u05d3\u05e9 {component_type} ", 
     "Next": "\u05d4\u05d1\u05d0", 
     "Next Step: Confirm your identity": "\u05d4\u05e9\u05dc\u05d1 \u05d4\u05d1\u05d0: \u05d0\u05de\u05ea \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da", 
     "Next: %(nextStepTitle)s": "\u05d4\u05d1\u05d0:  %(nextStepTitle)s", 
@@ -891,10 +909,12 @@
     "No color": "\u05dc\u05dc\u05d0 \u05e6\u05d1\u05e2", 
     "No content-specific discussion topics exist.": "\u05dc\u05d0 \u05e7\u05d9\u05d9\u05de\u05d9\u05dd \u05e0\u05d5\u05e9\u05d0\u05d9 \u05d3\u05d9\u05d5\u05df \u05e1\u05e4\u05e6\u05d9\u05e4\u05d9\u05d9\u05dd \u05dc\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
     "No description available": "\u05d0\u05d9\u05df \u05ea\u05d9\u05d0\u05d5\u05e8 \u05d6\u05de\u05d9\u05df", 
+    "No posts matched your query.": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05e4\u05d5\u05e1\u05d8\u05d9\u05dd \u05d4\u05ea\u05d5\u05d0\u05de\u05d9\u05dd \u05d0\u05ea \u05d4\u05e9\u05d0\u05d9\u05dc\u05ea\u05d0 \u05e9\u05dc\u05da.", 
     "No prerequisite": "\u05dc\u05dc\u05d0 \u05d3\u05e8\u05d9\u05e9\u05d4 \u05de\u05d5\u05e7\u05d3\u05de\u05ea", 
     "No receipt available": "\u05d0\u05d9\u05df \u05e7\u05d1\u05dc\u05d4 \u05d6\u05de\u05d9\u05e0\u05d4", 
     "No results": "\u05d0\u05d9\u05df \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea ", 
     "No results found for \"%(query_string)s\". Please try searching again.": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \"%(query_string)s\". \u05d0\u05e0\u05d0 \u05e0\u05e1\u05d4 \u05dc\u05d7\u05e4\u05e9 \u05e9\u05d5\u05d1.", 
+    "No results found for {original_query}. Showing results for {suggested_query}.": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 {original_query}. \u05de\u05e8\u05d0\u05d4 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 {suggested_query}.", 
     "No sources": "\u05d0\u05d9\u05df \u05de\u05e7\u05d5\u05e8\u05d5\u05ea", 
     "No tasks currently running.": "\u05d0\u05d9\u05df \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05d1\u05d4\u05e8\u05e6\u05d4 \u05db\u05e8\u05d2\u05e2.", 
     "No validation is performed on policy keys or value pairs. If you are having difficulties, check your formatting.": "\u05dc\u05d0 \u05d1\u05d5\u05e6\u05e2 \u05d0\u05d9\u05de\u05d5\u05ea \u05d1\u05e0\u05d5\u05d2\u05e2 \u05dc\u05e7\u05d5\u05d5\u05d9 \u05de\u05d3\u05d9\u05e0\u05d9\u05d5\u05ea \u05d0\u05d5 \u05e6\u05de\u05d3\u05d9 \u05e2\u05e8\u05db\u05d9\u05dd. \u05d1\u05de\u05d9\u05d3\u05d4 \u05d5\u05d0\u05ea\u05d4 \u05e0\u05ea\u05e7\u05dc \u05d1\u05e7\u05e9\u05d9\u05d9\u05dd, \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05e2\u05d9\u05e6\u05d5\u05d1\u05da.", 
@@ -940,6 +960,7 @@
     "Order Details": "\u05e4\u05e8\u05d8\u05d9 \u05d4\u05d6\u05de\u05e0\u05d4", 
     "Order History": "\u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05d9\u05ea \u05d4\u05d6\u05de\u05e0\u05d5\u05ea", 
     "Order No.": "\u05de\u05e1\u05e4\u05e8 \u05d4\u05d6\u05de\u05e0\u05d4", 
+    "Order Number": "\u05de\u05e1\u05e4\u05e8 \u05d4\u05d6\u05de\u05e0\u05d4", 
     "Organization": "\u05d0\u05e8\u05d2\u05d5\u05df", 
     "Organization ": "\u05d0\u05e8\u05d2\u05d5\u05df ", 
     "Organization Name": "\u05e9\u05dd \u05d4\u05d0\u05e8\u05d2\u05d5\u05df", 
@@ -1041,9 +1062,6 @@
     "Professional Certificate for {courseName}": "\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05e7\u05e6\u05d5\u05e2\u05d9\u05ea \u05e2\u05d1\u05d5\u05e8 {courseName}", 
     "Professional Education": "\u05d4\u05e9\u05db\u05dc\u05d4 \u05de\u05e7\u05e6\u05d5\u05e2\u05d9\u05ea", 
     "Professional Education Verified Certificate": "\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d0\u05d5\u05de\u05ea\u05ea \u05de\u05e7\u05e6\u05d5\u05e2\u05d9\u05ea", 
-    "Profile": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc", 
-    "Profile Image": "\u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc", 
-    "Profile image for {username}": "\u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05e2\u05d1\u05d5\u05e8 {username} ", 
     "Promote another member to Admin to remove your admin rights": "\u05e7\u05d3\u05dd \u05d7\u05d1\u05e8 \u05d0\u05d7\u05e8 \u05dc\u05de\u05e0\u05d4\u05dc \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e1\u05d9\u05e8 \u05d0\u05ea \u05d6\u05db\u05d5\u05d9\u05d5\u05ea\u05d9\u05da \u05d4\u05e0\u05d9\u05d4\u05d5\u05dc\u05d9\u05d5\u05ea", 
     "Provisional": "\u05d6\u05de\u05e0\u05d9", 
     "Provisionally Supported": "\u05e0\u05ea\u05de\u05da \u05d1\u05d0\u05d5\u05e4\u05df \u05d6\u05de\u05e0\u05d9", 
@@ -1056,6 +1074,7 @@
     "Publishing": "\u05de\u05e4\u05e8\u05e1\u05dd", 
     "Publishing Status": "\u05de\u05e6\u05d1 \u05e4\u05e8\u05e1\u05d5\u05dd", 
     "Question": "\u05e9\u05d0\u05dc\u05d4", 
+    "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "\u05d1\u05e2\u05d6\u05e8\u05ea \u05dc\u05d7\u05e6\u05df '\u05e9\u05d0\u05dc\u05d5\u05ea' \u05ea\u05d5\u05db\u05dc \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e1\u05d5\u05d2\u05d9\u05d4 \u05de\u05e1\u05d5\u05d9\u05de\u05ea \u05d4\u05de\u05e6\u05e8\u05d9\u05db\u05d4 \u05ea\u05e9\u05d5\u05d1\u05d4. \u05d1\u05e2\u05d6\u05e8\u05ea \u05dc\u05d7\u05e6\u05df '\u05d3\u05d9\u05d5\u05e0\u05d9\u05dd' \u05ea\u05d5\u05db\u05dc \u05dc\u05d7\u05dc\u05d5\u05e7 \u05e8\u05e2\u05d9\u05d5\u05e0\u05d5\u05ea \u05d5\u05dc\u05d4\u05ea\u05d7\u05d9\u05dc \u05d1\u05e9\u05d9\u05d7\u05d5\u05ea \u05e2\u05dc \u05e0\u05d5\u05e9\u05d0\u05d9 \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05e9\u05d5\u05e0\u05d9\u05dd. (\u05d7\u05d5\u05d1\u05d4)", 
     "Queued": "\u05de\u05de\u05ea\u05d9\u05df \u05d1\u05ea\u05d5\u05e8", 
     "Read More": "\u05e7\u05e8\u05d0 \u05e2\u05d5\u05d3", 
     "Reason": "\u05e1\u05d9\u05d1\u05d4", 
@@ -1090,6 +1109,7 @@
     "Remove {role} Access": "\u05d4\u05e1\u05e8 \u05d2\u05d9\u05e9\u05ea {role}", 
     "Remove {video_name} video": "\u05d4\u05e1\u05e8 \u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5  {video_name}   ", 
     "Removing": "\u05de\u05e1\u05d9\u05e8", 
+    "Removing a video from this list does not affect course content. Any content that uses a previously uploaded video ID continues to display in the course.": "\u05d4\u05e1\u05e8\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d5\u05d9\u05d3\u05d0\u05d5 \u05de\u05e8\u05e9\u05d9\u05de\u05d4 \u05d6\u05d5 \u05d0\u05d9\u05e0\u05d4 \u05de\u05e9\u05e4\u05d9\u05e2\u05d4 \u05e2\u05dc \u05ea\u05d5\u05db\u05df \u05d4\u05e7\u05d5\u05e8\u05e1. \u05db\u05dc \u05ea\u05d5\u05db\u05df \u05d4\u05de\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e1\u05e4\u05e8 \u05de\u05d6\u05d4\u05d4 \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05e9\u05d4\u05d5\u05e2\u05dc\u05d4 \u05d1\u05e2\u05d1\u05e8 \u05de\u05de\u05e9\u05d9\u05da \u05dc\u05d4\u05e6\u05d9\u05d2 \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "Replace": "\u05d4\u05d7\u05dc\u05e3", 
     "Replace all": "\u05d4\u05d7\u05dc\u05e3 \u05d4\u05db\u05dc", 
     "Replace with": "\u05d4\u05d7\u05dc\u05e3 \u05d1", 
@@ -1107,6 +1127,7 @@
     "Reset Your Password": "\u05d0\u05e4\u05e1 \u05d0\u05ea \u05e1\u05d9\u05e1\u05de\u05ea\u05da", 
     "Reset attempts for all students on problem '<%- problem_id %>'?": "\u05d0\u05e4\u05e1 \u05e0\u05d9\u05e1\u05d9\u05d5\u05e0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05db\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd \u05d1\u05d1\u05e2\u05d9\u05d4  '<%- problem_id %>'? ", 
     "Reset my password": "\u05e9\u05d7\u05d6\u05e8 \u05d0\u05ea \u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05e9\u05dc\u05d9", 
+    "Responses could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05ea\u05d2\u05d5\u05d1\u05d5\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Restore enrollment code": "\u05e9\u05d7\u05d6\u05e8 \u05e7\u05d5\u05d3 \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Restore last draft": "\u05e9\u05d7\u05d6\u05e8 \u05d8\u05d9\u05d5\u05d8\u05d4 \u05d0\u05d7\u05e8\u05d5\u05e0\u05d4", 
     "Retake Photo": "\u05e6\u05dc\u05dd \u05e9\u05d5\u05d1 \u05ea\u05de\u05d5\u05e0\u05d4", 
@@ -1142,6 +1163,7 @@
     "Search teams": "\u05d7\u05d9\u05e4\u05d5\u05e9 \u05e6\u05d5\u05d5\u05ea\u05d9\u05dd", 
     "Section": "\u05e4\u05e8\u05e7", 
     "Section Visibility": "\u05ea\u05e6\u05d5\u05d2\u05ea \u05e4\u05e8\u05e7", 
+    "Sections": "\u05e4\u05e8\u05e7\u05d9\u05dd", 
     "See all teams in your course, organized by topic. Join a team to collaborate with other learners who are interested in the same topic as you are.": "\u05e8\u05d0\u05d4 \u05e9\u05db\u05dc \u05d4\u05e6\u05d5\u05d5\u05ea\u05d9\u05dd \u05e9\u05d1\u05e7\u05d5\u05e8\u05e1 \u05e9\u05dc\u05da \u05de\u05d0\u05d5\u05e8\u05d2\u05e0\u05d9\u05dd \u05dc\u05e4\u05d9 \u05e0\u05d5\u05e9\u05d0. \u05d4\u05e6\u05d8\u05e8\u05e3 \u05dc\u05e6\u05d5\u05d5\u05ea \u05db\u05d3\u05d9 \u05dc\u05e9\u05ea\u05e3 \u05e4\u05e2\u05d5\u05dc\u05d4 \u05e2\u05dd \u05ea\u05dc\u05de\u05d9\u05d3\u05d9\u05dd \u05d0\u05d7\u05e8\u05d9\u05dd \u05d4\u05de\u05e2\u05d5\u05e0\u05d9\u05d9\u05e0\u05d9\u05dd \u05d1\u05d0\u05d5\u05ea\u05d5 \u05e0\u05d5\u05e9\u05d0 \u05d1\u05d5 \u05d0\u05ea\u05d4 \u05de\u05ea\u05e2\u05e0\u05d9\u05d9\u05df.", 
     "Select a Content Group": "\u05d1\u05d7\u05e8 \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df", 
     "Select a chapter": "\u05d1\u05d7\u05e8 \u05e4\u05e8\u05e7", 
@@ -1196,6 +1218,7 @@
     "Showing {currentItemRange} out of {totalItemsCount}, sorted by {sortName} descending": "\u05de\u05e6\u05d9\u05d2  {currentItemRange} \u05de\u05ea\u05d5\u05da {totalItemsCount}, \u05de\u05de\u05d5\u05d9\u05df \u05d1\u05e1\u05d3\u05e8 \u05d9\u05d5\u05e8\u05d3 \u05e9\u05dc {sortName} ", 
     "Showing {firstIndex} out of {numItems} total": "\u05de\u05e6\u05d9\u05d2 {firstIndex} \u05de\u05ea\u05d5\u05da {numItems} \u05e1\u05da \u05d4\u05db\u05dc", 
     "Showing {firstIndex}-{lastIndex} out of {numItems} total": "\u05de\u05e6\u05d9\u05d2 {firstIndex}-{lastIndex} \u05de\u05ea\u05d5\u05da {numItems} \u05e1\u05da \u05d4\u05db\u05dc", 
+    "Sign In": "\u05d4\u05ea\u05d7\u05d1\u05e8", 
     "Sign in": "\u05db\u05e0\u05d9\u05e1\u05d4", 
     "Sign in here using your email address and password, or use one of the providers listed below.": "\u05d4\u05d9\u05db\u05e0\u05e1 \u05db\u05d0\u05df \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05e9\u05dc\u05da \u05d0\u05d5 \u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d0\u05d7\u05d3 \u05de\u05d4\u05e1\u05e4\u05e7\u05d9\u05dd \u05d4\u05e8\u05e9\u05d5\u05de\u05d9\u05dd \u05d1\u05d4\u05de\u05e9\u05da.", 
     "Sign in here using your email address and password.": "\u05d4\u05d9\u05db\u05e0\u05e1 \u05db\u05d0\u05df \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05d4\u05e1\u05d9\u05e1\u05de\u05d4.", 
@@ -1241,6 +1264,9 @@
     "Student": "\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8", 
     "Student Removed from certificate white list successfully.": "\u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05d5\u05e1\u05e8 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05de\u05d4\u05e8\u05e9\u05d9\u05de\u05d4 \u05d4\u05dc\u05d1\u05e0\u05d4 \u05e9\u05dc \u05d4\u05ea\u05e2\u05d5\u05d3\u05d5\u05ea.", 
     "Student email or username": "\u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d0\u05d5 \u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8", 
+    "Student username/email field is required and can not be empty. Kindly fill in username/email and then press \"Add to Exception List\" button.": "\u05e9\u05d3\u05d4 \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05d5\u05d0 \u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05d0\u05d9\u05e8\u05d5 \u05e8\u05d9\u05e7. \u05d0\u05e0\u05d0 \u05de\u05dc\u05d0 \u05d0\u05ea \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05dc\u05d0\u05d7\u05e8 \u05de\u05db\u05df \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05d7\u05e6\u05df \"\u05d4\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d7\u05e8\u05d9\u05d2\u05d9\u05dd\".", 
+    "Student username/email field is required and can not be empty. Kindly fill in username/email and then press \"Invalidate Certificate\" button.": "\u05e9\u05d3\u05d4 \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05d5\u05d0 \u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05d0\u05d9\u05e8\u05d5 \u05e8\u05d9\u05e7. \u05d0\u05e0\u05d0 \u05de\u05dc\u05d0 \u05d0\u05ea \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05dc\u05d0\u05d7\u05e8 \u05de\u05db\u05df \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05d7\u05e6\u05df \"\u05e4\u05e1\u05d9\u05dc\u05ea \u05ea\u05e2\u05d5\u05d3\u05d4\".", 
+    "Studio's having trouble saving your work": "\u05e1\u05d8\u05d5\u05d3\u05d9\u05d5 \u05de\u05ea\u05e7\u05e9\u05d4 \u05dc\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05e2\u05d1\u05d5\u05d3\u05ea\u05da", 
     "Studio:": "\u05e1\u05d8\u05d5\u05d3\u05d9\u05d5:", 
     "Style": "\u05e1\u05d2\u05e0\u05d5\u05df", 
     "Subject": "\u05e0\u05d5\u05e9\u05d0", 
@@ -1298,8 +1324,8 @@
     "Team name cannot have more than 255 characters.": "\u05e9\u05dd \u05d4\u05e6\u05d5\u05d5\u05ea \u05d0\u05d9\u05e0\u05d5 \u05d9\u05db\u05d5\u05dc \u05dc\u05d7\u05e8\u05d5\u05d2 \u05de-255 \u05ea\u05d5\u05d5\u05d9\u05dd.", 
     "Teams": "\u05e6\u05d5\u05d5\u05ea\u05d9\u05dd", 
     "Teams Pagination": "\u05e2\u05d9\u05de\u05d5\u05d3 \u05e6\u05d5\u05d5\u05ea\u05d9\u05dd", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u05e1\u05e4\u05e8 \u05de\u05e2\u05d8 \u05e2\u05dc \u05e2\u05e6\u05de\u05da \u05dc\u05ea\u05dc\u05de\u05d9\u05d3\u05d9\u05dd \u05d4\u05d0\u05d7\u05e8\u05d9\u05dd: \u05d4\u05d9\u05db\u05df \u05d0\u05ea\u05d4 \u05d2\u05e8, \u05de\u05d4\u05dd \u05ea\u05d7\u05d5\u05de\u05d9 \u05d4\u05e2\u05e0\u05d9\u05d9\u05df \u05e9\u05dc\u05da, \u05de\u05d3\u05d5\u05e2 \u05e0\u05e8\u05e9\u05de\u05ea \u05dc\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05d0\u05d5 \u05de\u05d4 \u05d0\u05ea\u05d4 \u05de\u05e7\u05d5\u05d5\u05d4 \u05dc\u05dc\u05de\u05d5\u05d3.", 
     "Templates": "\u05ea\u05d1\u05e0\u05d9\u05d5\u05ea", 
+    "Terms of Service and Honor Code": "\u05ea\u05e0\u05d0\u05d9 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d5\u05e7\u05d5\u05d3 \u05d0\u05ea\u05d9", 
     "Text": "\u05d8\u05e7\u05e1\u05d8", 
     "Text color": "\u05e6\u05d1\u05e2 \u05d8\u05e7\u05e1\u05d8", 
     "Text to display": "\u05d8\u05e7\u05e1\u05d8 \u05dc\u05d4\u05e6\u05d2\u05d4", 
@@ -1350,6 +1376,7 @@
     "The organization that this signatory belongs to, as it should appear on certificates.": "\u05d7\u05ea\u05d9\u05de\u05ea \u05d4\u05d0\u05e8\u05d2\u05d5\u05df, \u05db\u05e4\u05d9 \u05e9\u05d4\u05d9\u05d0 \u05d0\u05de\u05d5\u05e8\u05d4 \u05dc\u05d4\u05d5\u05e4\u05d9\u05e2 \u05d1\u05ea\u05e2\u05d5\u05d3\u05d4.", 
     "The page \"{route}\" could not be found.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05de\u05e6\u05d5\u05d0 \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \"{route}\".", 
     "The photo of your face matches the photo on your ID.": "\u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05e9\u05dc \u05e4\u05e0\u05d9\u05da \u05ea\u05d5\u05d0\u05de\u05ea \u05dc\u05ea\u05de\u05d5\u05e0\u05d4 \u05e9\u05d1\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4 \u05e9\u05dc\u05da.", 
+    "The post you selected has been deleted.": "\u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05d1\u05d7\u05e8\u05ea \u05e0\u05de\u05d7\u05e7.", 
     "The published branch version, {published}, was reset to the draft branch version, {draft}.": "\u05d2\u05e8\u05e1\u05ea \u05d4\u05de\u05d3\u05d5\u05e8 \u05e9\u05e4\u05d5\u05e8\u05e1\u05dd, {published}, \u05d0\u05d5\u05e4\u05e1\u05d4 \u05dc\u05d2\u05e8\u05e1\u05ea \u05de\u05d3\u05d5\u05e8 \u05d4\u05d8\u05d9\u05d5\u05d8\u05d4, {draft}.", 
     "The raw error message is:": "\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d4\u05d9\u05d0:", 
     "The selected content group does not exist": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05e9\u05e0\u05d1\u05d7\u05e8\u05d4 \u05d0\u05d9\u05e0\u05d4 \u05e7\u05d9\u05d9\u05de\u05ea", 
@@ -1360,6 +1387,7 @@
     "The weight of all assignments of this type as a percentage of the total grade, for example, 40. Do not include the percent symbol.": "\u05de\u05e9\u05e7\u05dc \u05db\u05dc \u05d4\u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e9\u05dc \u05e1\u05d5\u05d2 \u05d6\u05d4 \u05d4\u05d5\u05d0 \u05db\u05d0\u05d7\u05d5\u05d6 \u05de\u05e1\u05da \u05d4\u05e6\u05d9\u05d5\u05df, \u05dc\u05d3\u05d5\u05d2\u05de\u05d4, 40. \u05d0\u05dc \u05ea\u05db\u05dc\u05d5\u05dc \u05d0\u05ea \u05e1\u05de\u05dc \u05d4\u05d0\u05d7\u05d5\u05d6.", 
     "The {cohortGroupName} cohort has been created. You can manually add students to this cohort below.": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3 {cohortGroupName} \u05e0\u05d5\u05e6\u05e8\u05d4. \u05d0\u05ea\u05d4 \u05d9\u05db\u05d5\u05dc \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd \u05d1\u05e6\u05d5\u05e8\u05d4 \u05d9\u05d3\u05e0\u05d9\u05ea \u05dc\u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05d6\u05d5. ", 
     "There are invalid keywords in your email. Check the following keywords and try again.": "\u05d9\u05e9\u05e0\u05df \u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9\u05d5\u05ea \u05d1\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05da. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05de\u05d9\u05dc\u05d5\u05ea \u05d4\u05de\u05e4\u05ea\u05d7 \u05d4\u05d1\u05d0\u05d5\u05ea \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
+    "There has been a failure to export to XML at least one component. It is recommended that you go to the edit page and repair the error before attempting another export. Please check that all components on the page are valid and do not display any error messages.": "\u05d9\u05e6\u05d5\u05d0 \u05e9\u05dc \u05e8\u05db\u05d9\u05d1 \u05d0\u05d7\u05d3 \u05dc\u05e4\u05d7\u05d5\u05ea \u05dc-XML, \u05e0\u05db\u05e9\u05dc. \u05de\u05d5\u05de\u05dc\u05e5 \u05dc\u05d2\u05e9\u05ea \u05dc\u05e2\u05de\u05d5\u05d3 \u05d4\u05e2\u05e8\u05d9\u05db\u05d4 \u05d5\u05dc\u05ea\u05e7\u05df \u05d0\u05ea \u05d4\u05e9\u05d2\u05d9\u05d0\u05d4 \u05dc\u05e4\u05e0\u05d9 \u05d1\u05d9\u05e6\u05d5\u05e2 \u05d9\u05e6\u05d5\u05d0 \u05e0\u05d5\u05e1\u05e3. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d7\u05d5\u05e7\u05d9\u05d5\u05ea \u05db\u05dc \u05d4\u05e8\u05db\u05d9\u05d1\u05d9\u05dd \u05d1\u05e2\u05de\u05d5\u05d3 \u05d5\u05db\u05d9 \u05d4\u05dd \u05d0\u05d9\u05e0\u05dd \u05de\u05e6\u05d9\u05d2\u05d9\u05dd \u05d4\u05d5\u05d3\u05e2\u05d5\u05ea \u05e9\u05d2\u05d9\u05d0\u05d4.  ", 
     "There has been an error processing your survey.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e2\u05d9\u05d1\u05d5\u05d3 \u05d4\u05e1\u05e7\u05e8 \u05e9\u05dc\u05da.", 
     "There has been an error while exporting.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05d4\u05d9\u05d9\u05e6\u05d5\u05d0.", 
     "There has been an error with your export.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05e6\u05d5\u05d0 \u05e9\u05dc\u05da. ", 
@@ -1369,9 +1397,15 @@
     "There must be one cohort to which students can automatically be assigned.": "\u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05d9\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05d0\u05d7\u05ea \u05e9\u05d0\u05dc\u05d9\u05d4 \u05e0\u05d9\u05ea\u05df \u05dc\u05e9\u05d9\u05d9\u05da \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd \u05d1\u05d0\u05d5\u05e4\u05df \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9.", 
     "There was a problem creating the report. Select \"Create Executive Summary\" to try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05d1\u05e2\u05d9\u05d4 \u05d1\u05e2\u05ea \u05d9\u05e6\u05d9\u05e8\u05ea \u05d4\u05d3\u05d5\u05d7. \u05d1\u05d7\u05e8 \"\u05e6\u05d5\u05e8 \u05ea\u05e7\u05e6\u05d9\u05e8 \u05de\u05e0\u05d4\u05dc\u05d9\u05dd\" \u05db\u05d3\u05d9 \u05dc\u05e0\u05e1\u05d5\u05ea \u05e9\u05d5\u05d1.", 
     "There was an error changing the user's role": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e9\u05d9\u05e0\u05d5\u05d9 \u05ea\u05e4\u05e7\u05d9\u05d3 \u05d4\u05de\u05e9\u05ea\u05de\u05e9.", 
+    "There was an error during the upload process.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05ea\u05d4\u05dc\u05d9\u05da \u05d4\u05e2\u05dc\u05d0\u05ea \u05d4\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd.", 
     "There was an error obtaining email content history for this course.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05e9\u05dc \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "There was an error obtaining email task history for this course.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05ea \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "There was an error retrieving preview results for this catalog. Please check that your query is correct and try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e2\u05ea \u05d0\u05b4\u05d7\u05d6\u05d5\u05e8 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05d4\u05ea\u05e6\u05d5\u05d2\u05d4 \u05d4\u05de\u05d5\u05e7\u05d3\u05de\u05ea \u05e2\u05d1\u05d5\u05e8 \u05e7\u05d8\u05dc\u05d5\u05d2 \u05d6\u05d4. \u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05e9\u05d4\u05e9\u05d0\u05d9\u05dc\u05ea\u05d0 \u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
+    "There was an error while importing the new course to our database.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05d9\u05d1\u05d5\u05d0 \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05d7\u05d3\u05e9 \u05dc\u05d1\u05e1\u05d9\u05e1 \u05d4\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05e9\u05dc\u05e0\u05d5.", 
+    "There was an error while importing the new library to our database.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05d9\u05d1\u05d5\u05d0 \u05d4\u05e1\u05e4\u05e8\u05d9\u05d9\u05d4 \u05d4\u05d7\u05d3\u05e9\u05d4 \u05dc\u05d1\u05e1\u05d9\u05e1 \u05d4\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05e9\u05dc\u05e0\u05d5.", 
+    "There was an error while unpacking the file.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d7\u05d9\u05dc\u05d5\u05e5 \u05d4\u05e7\u05d5\u05d1\u05e5.", 
+    "There was an error while verifying the file you submitted.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05d0\u05d9\u05de\u05d5\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5 \u05e9\u05d4\u05d2\u05e9\u05ea.", 
+    "There was an error with the upload": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e2\u05dc\u05d0\u05d4", 
     "There was an error, try searching again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4, \u05e0\u05e1\u05d4 \u05dc\u05d7\u05e4\u05e9 \u05e9\u05d5\u05d1.", 
     "There were errors reindexing course.": "\u05e7\u05e8\u05d5 \u05e9\u05d2\u05d9\u05d0\u05d5\u05ea \u05d1\u05de\u05d9\u05d5\u05df \u05de\u05d7\u05d3\u05e9 \u05e9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1.", 
     "There's already another assignment type with this name.": "\u05d9\u05e9 \u05db\u05d1\u05e8 \u05e1\u05d5\u05d2 \u05de\u05e9\u05d9\u05de\u05d4 \u05d0\u05d7\u05e8 \u05d1\u05e2\u05dc \u05e9\u05dd \u05d6\u05d4.", 
@@ -1393,12 +1427,14 @@
     "This browser cannot play .mp4, .ogg, or .webm files.": "\u05d3\u05e4\u05d3\u05e4\u05df \u05d6\u05d4 \u05d0\u05d9\u05e0\u05d5 \u05d9\u05db\u05d5\u05dc \u05dc\u05e0\u05d2\u05df \u05e7\u05d1\u05e6\u05d9  ogg  .webm ,.mp4.", 
     "This catalog's courses:": "\u05d4\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05d1\u05e7\u05d8\u05dc\u05d5\u05d2 \u05d6\u05d4:", 
     "This certificate has already been activated and is live. Are you sure you want to continue editing?": "\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d6\u05d5  \u05d4\u05d5\u05e4\u05e2\u05dc\u05d4 \u05db\u05d1\u05e8 \u05d5\u05d4\u05d9\u05d0 \u05d1\u05de\u05e6\u05d1 \u05e4\u05e2\u05d9\u05dc. \u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05de\u05e9\u05d9\u05da \u05d1\u05e2\u05e8\u05d9\u05db\u05d4?", 
+    "This comment could not be deleted. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea \u05d4\u05d4\u05e2\u05e8\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This component has validation issues.": "\u05dc\u05e8\u05db\u05d9\u05d1 \u05d6\u05d4 \u05d1\u05e2\u05d9\u05d5\u05ea \u05d0\u05d9\u05de\u05d5\u05ea.", 
     "This configuration is currently used in content experiments. If you make changes to the groups, you may need to edit those experiments.": "\u05d4\u05d2\u05d3\u05e8\u05d4 \u05d6\u05d5 \u05e0\u05de\u05e6\u05d0\u05ea \u05db\u05e2\u05ea \u05d1\u05e9\u05d9\u05de\u05d5\u05e9 \u05e0\u05d9\u05e1\u05d5\u05d9 \u05ea\u05d5\u05db\u05df. \u05d0\u05dd \u05ea\u05e9\u05e0\u05d4 \u05d0\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea, \u05d9\u05ea\u05db\u05df \u05e9\u05ea\u05e6\u05d8\u05e8\u05da \u05dc\u05d1\u05e6\u05e2 \u05e2\u05e8\u05d9\u05db\u05d4 \u05d1\u05e0\u05d9\u05e1\u05d5\u05d9\u05d9\u05dd \u05d0\u05dc\u05d5.", 
     "This content group is used in one or more units.": "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d1\u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05d6\u05d5 \u05d1\u05d9\u05d7\u05d9\u05d3\u05d4 \u05d0\u05d7\u05ea \u05d0\u05d5 \u05d9\u05d5\u05ea\u05e8. ", 
     "This course has automatic cohorting enabled for verified track learners, but cohorts are disabled. You must enable cohorts for the feature to work.": "\u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05d9\u05e9 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9 \u05e9\u05de\u05d5\u05e4\u05e2\u05dc \u05e2\u05d1\u05d5\u05e8 \u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05de\u05e1\u05dc\u05d5\u05dc \u05de\u05d0\u05d5\u05de\u05ea, \u05d0\u05da \u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05d4\u05dc\u05de\u05d9\u05d3\u05d4 \u05de\u05d5\u05e9\u05d1\u05ea\u05d9\u05dd. \u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05db\u05d3\u05d9 \u05e9\u05d4\u05ea\u05db\u05d5\u05e0\u05d4 \u05ea\u05e2\u05d1\u05d5\u05d3.", 
     "This course has automatic cohorting enabled for verified track learners, but the required cohort does not exist. You must create a manually-assigned cohort named '{verifiedCohortName}' for the feature to work.": "\u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05d9\u05e9 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9 \u05e9\u05de\u05d5\u05e4\u05e2\u05dc \u05e2\u05d1\u05d5\u05e8 \u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05de\u05e1\u05dc\u05d5\u05dc \u05de\u05d0\u05d5\u05de\u05ea, \u05d0\u05da \u05de\u05d7\u05d6\u05d5\u05e8 \u05d4\u05dc\u05de\u05d9\u05d3\u05d4 \u05d4\u05d3\u05e8\u05d5\u05e9 \u05d0\u05d9\u05e0\u05d5 \u05e7\u05d9\u05d9\u05dd. \u05e2\u05dc\u05d9\u05da \u05dc\u05d9\u05e6\u05d5\u05e8 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05e9\u05de\u05d5\u05e7\u05e6\u05d4 \u05d1\u05d0\u05d5\u05e4\u05df \u05d9\u05d3\u05e0\u05d9 \u05d4\u05de\u05db\u05d5\u05e0\u05d4 '{verifiedCohortName}' \u05db\u05d3\u05d9 \u05e9\u05d4\u05ea\u05db\u05d5\u05e0\u05d4 \u05ea\u05e2\u05d1\u05d5\u05d3.", 
     "This course uses automatic cohorting for verified track learners. You cannot disable cohorts, and you cannot rename the manual cohort named '{verifiedCohortName}'. To change the configuration for verified track cohorts, contact your edX partner manager.": "\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05de\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05d9\u05dd \u05e2\u05d1\u05d5\u05e8 \u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05de\u05e1\u05dc\u05d5\u05dc \u05de\u05d0\u05d5\u05de\u05ea. \u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05d4\u05e9\u05d1\u05d9\u05ea \u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d5\u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05e9\u05e0\u05d5\u05ea \u05d0\u05ea \u05d4\u05e9\u05dd \u05e9\u05dc \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d9\u05d3\u05e0\u05d9 \u05d4\u05de\u05db\u05d5\u05e0\u05d4 '{verifiedCohortName}'. \u05db\u05d3\u05d9 \u05dc\u05e9\u05e0\u05d5\u05ea \u05d0\u05ea \u05d4\u05d4\u05d2\u05d3\u05e8\u05d4 \u05dc\u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05e2\u05dd \u05de\u05e2\u05e7\u05d1 \u05de\u05d0\u05d5\u05de\u05ea, \u05e6\u05d5\u05e8 \u05e7\u05e9\u05e8 \u05e2\u05dd \u05d4\u05de\u05e0\u05d4\u05dc \u05d4\u05e9\u05d5\u05ea\u05e3 \u05e9\u05dc\u05da \u05d1-edX.", 
+    "This discussion could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05d0\u05ea \u05d4\u05d3\u05d9\u05d5\u05df. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This image is for decorative purposes only and does not require a description.": "\u05ea\u05de\u05d5\u05e0\u05d4 \u05d6\u05d5 \u05e0\u05d5\u05e2\u05d3\u05d4 \u05dc\u05de\u05d8\u05e8\u05d5\u05ea \u05d3\u05e7\u05d5\u05e8\u05d8\u05d9\u05d1\u05d9\u05d5\u05ea \u05d1\u05dc\u05d1\u05d3 \u05d5\u05d0\u05d9\u05df \u05e6\u05d5\u05e8\u05da \u05d1\u05ea\u05d9\u05d0\u05d5\u05e8\u05d4.", 
     "This is the Description of the Group Configuration": "\u05d6\u05d4\u05d5 \u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05d2\u05d3\u05e8\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
     "This is the Name of the Group Configuration": "\u05d6\u05d4\u05d5 \u05e9\u05dd \u05d4\u05d2\u05d3\u05e8\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
@@ -1407,14 +1443,26 @@
     "This learner will be removed from the team, allowing another learner to take the available spot.": "\u05ea\u05dc\u05de\u05d9\u05d3 \u05d6\u05d4 \u05d9\u05d5\u05e1\u05e8 \u05de\u05d4\u05e6\u05d5\u05d5\u05ea, \u05db\u05da \u05e9\u05d9\u05ea\u05d0\u05e4\u05e9\u05e8 \u05dc\u05ea\u05dc\u05de\u05d9\u05d3 \u05d0\u05d7\u05e8 \u05dc\u05d4\u05e6\u05d8\u05e8\u05e3 \u05dc\u05de\u05e7\u05d5\u05dd \u05e9\u05d4\u05ea\u05e4\u05e0\u05d4.", 
     "This link will open in a modal window": "\u05e7\u05d9\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05d9\u05e4\u05ea\u05d7 \u05d1\u05d7\u05dc\u05d5\u05e0\u05d9\u05ea \u05e9\u05d9\u05d7\u05d4", 
     "This link will open in a new browser window/tab": "\u05e7\u05d9\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05d9\u05d9\u05e4\u05ea\u05d7 \u05d1\u05d7\u05dc\u05d5\u05df/\u05dc\u05e9\u05d5\u05e0\u05d9\u05ea \u05d3\u05e4\u05d3\u05e4\u05df \u05d7\u05d3\u05e9/\u05d4", 
+    "This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.": "\u05d9\u05d9\u05ea\u05db\u05df \u05d5\u05d3\u05d1\u05e8 \u05d6\u05d4 \u05de\u05ea\u05e8\u05d7\u05e9 \u05d1\u05e9\u05dc \u05d8\u05e2\u05d5\u05ea \u05d1\u05e9\u05e8\u05ea \u05e9\u05dc\u05e0\u05d5 \u05d0\u05d5 \u05d1\u05d7\u05d9\u05d1\u05d5\u05e8 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8. \u05e0\u05e1\u05d4 \u05dc\u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d0\u05d5 \u05d5\u05d3\u05d0 \u05e9\u05d0\u05ea\u05d4 \u05de\u05e7\u05d5\u05d5\u05df.", 
     "This page contains information about orders that you have placed with {platform_name}.": "\u05e2\u05de\u05d5\u05d3 \u05d6\u05d4 \u05de\u05db\u05d9\u05dc \u05de\u05d9\u05d3\u05e2 \u05e2\u05dc \u05d4\u05d6\u05de\u05e0\u05d5\u05ea \u05e9\u05d1\u05d9\u05e6\u05e2\u05ea \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea {platform_name}.", 
+    "This post could not be closed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e1\u05d2\u05d5\u05e8 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be flagged for abuse. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d3\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05e4\u05d5\u05e1\u05d8 \u05db\u05d1\u05dc\u05ea\u05d9 \u05d4\u05d5\u05dc\u05dd. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be pinned. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e6\u05de\u05d9\u05d3 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be reopened. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e4\u05ea\u05d5\u05d7 \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be unflagged for abuse. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05d4\u05d3\u05d9\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05e4\u05d5\u05e1\u05d8 \u05db\u05d1\u05dc\u05ea\u05d9 \u05d4\u05d5\u05dc\u05dd. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be unpinned. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05d4\u05e6\u05de\u05d3\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This post is visible only to %(group_name)s.": "\u05e4\u05d5\u05e1\u05d8 \u05d6\u05d4 \u05d2\u05dc\u05d5\u05d9 \u05e8\u05e7 \u05dc-%(group_name)s.", 
     "This post is visible to everyone.": "\u05e4\u05d5\u05e1\u05d8 \u05d6\u05d4 \u05d2\u05dc\u05d5\u05d9 \u05dc\u05db\u05d5\u05dc\u05dd.", 
     "This problem has been reset.": "\u05d4\u05d1\u05e2\u05d9\u05d4 \u05dc\u05d0 \u05d0\u05d5\u05ea\u05d7\u05dc\u05d4.", 
+    "This response could not be marked as an answer. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e1\u05de\u05df \u05d0\u05ea \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05ea\u05e9\u05d5\u05d1\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This response could not be marked as endorsed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e1\u05de\u05df \u05d0\u05ea \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05de\u05d5\u05de\u05dc\u05e6\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This response could not be unendorsed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05e1\u05d9\u05de\u05d5\u05df \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05de\u05d5\u05de\u05dc\u05e6\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This response could not be unmarked as an answer. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05e1\u05d9\u05de\u05d5\u05df \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05ea\u05e9\u05d5\u05d1\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This short name for the assignment type (for example, HW or Midterm) appears next to assignments on a learner's Progress page.": "\u05e9\u05dd \u05e7\u05e6\u05e8 \u05d6\u05d4 \u05dc\u05e1\u05d5\u05d2 \u05d4\u05de\u05e9\u05d9\u05de\u05d4 (\u05dc\u05d3\u05d5\u05d2\u05de\u05d4, \u05e9\"\u05d1 \u05d0\u05d5 \u05de\u05d1\u05d7\u05df \u05d0\u05de\u05e6\u05e2) \u05de\u05d5\u05e4\u05d9\u05e2 \u05dc\u05d9\u05d3 \u05d4\u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e9\u05d1\u05e2\u05de\u05d5\u05d3 \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05e9\u05dc \u05d4\u05dc\u05d5\u05de\u05d3.", 
     "This team does not have any members.": "\u05d0\u05d9\u05df \u05d7\u05d1\u05e8\u05d9\u05dd \u05d1\u05e6\u05d5\u05d5\u05ea \u05d6\u05d4.", 
     "This team is full.": "\u05e6\u05d5\u05d5\u05ea \u05d6\u05d4 \u05de\u05dc\u05d0.", 
     "This thread is closed.": "\u05e9\u05e8\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05e1\u05d2\u05d5\u05e8", 
+    "This vote could not be processed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d1\u05d3 \u05d0\u05ea \u05d4\u05d1\u05e7\u05e9\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Time Allotted (HH:MM):": "\u05d6\u05de\u05df \u05e9\u05d4\u05d5\u05e7\u05e6\u05d1 (\u05e9\u05e9:\u05d3\u05d3):", 
     "Time Sent": "\u05d6\u05de\u05df \u05d4\u05e9\u05dc\u05d9\u05d7\u05d4:", 
     "Time Sent:": "\u05d6\u05de\u05df \u05d4\u05e9\u05dc\u05d9\u05d7\u05d4:", 
@@ -1466,6 +1514,7 @@
     "Ungraded": "\u05dc\u05dc\u05d0 \u05e6\u05d9\u05d5\u05df", 
     "Unit": "\u05d9\u05d7\u05d9\u05d3\u05d4", 
     "Unit Visibility": "\u05e0\u05e8\u05d0\u05d5\u05ea \u05d9\u05d7\u05d9\u05d3\u05d4", 
+    "Units": "\u05d9\u05d7\u05d9\u05d3\u05d5\u05ea", 
     "Unknown": "\u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2", 
     "Unknown Error Occurred.": "\u05d4\u05ea\u05e8\u05d7\u05e9\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2\u05d4.", 
     "Unlink This Account": "\u05d4\u05e1\u05e8 \u05d0\u05ea \u05d4\u05e7\u05d9\u05e9\u05d5\u05e8 \u05e9\u05dc \u05d7\u05e9\u05d1\u05d5\u05df \u05d6\u05d4", 
@@ -1503,7 +1552,9 @@
     "Upload an image": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4", 
     "Upload an image or capture one with your web or phone camera.": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4 \u05d0\u05d5 \u05e6\u05dc\u05dd \u05d1\u05e2\u05d6\u05e8\u05ea \u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05d0\u05d5 \u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e0\u05d9\u05d9\u05d3 \u05e9\u05d1\u05e8\u05e9\u05d5\u05ea\u05da. ", 
     "Upload completed": "\u05d4\u05e2\u05dc\u05d0\u05d4 \u05d4\u05d5\u05e9\u05dc\u05de\u05d4", 
+    "Upload completed for video {fileName}": "\u05d4\u05d4\u05e2\u05dc\u05d0\u05d4 \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5 {fileName} \u05d4\u05d5\u05e9\u05dc\u05de\u05d4", 
     "Upload failed": "\u05d4\u05e2\u05dc\u05d0\u05d4 \u05e0\u05db\u05e9\u05dc\u05d4", 
+    "Upload failed for video {fileName}": "\u05d4\u05d4\u05e2\u05dc\u05d0\u05d4 \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5 {fileName} \u05dc\u05d0 \u05d4\u05e6\u05dc\u05d9\u05d7\u05d4", 
     "Upload instructor image.": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05ea \u05de\u05d3\u05e8\u05d9\u05da.", 
     "Upload is in progress. To avoid errors, stay on this page until the process is complete.": "\u05d4\u05e2\u05dc\u05d0\u05d4 \u05de\u05ea\u05d1\u05e6\u05e2\u05ea. \u05db\u05d3\u05d9 \u05dc\u05d4\u05d9\u05de\u05e0\u05e2 \u05de\u05e9\u05d2\u05d9\u05d0\u05d5\u05ea, \u05d4\u05d9\u05e9\u05d0\u05e8 \u05d1\u05e2\u05de\u05d5\u05d3 \u05d6\u05d4 \u05e2\u05d3 \u05e9\u05d4\u05ea\u05d4\u05dc\u05d9\u05da \u05d9\u05d5\u05e9\u05dc\u05dd.", 
     "Upload signature image.": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05ea \u05d7\u05ea\u05d9\u05de\u05d4.", 
@@ -1528,10 +1579,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05e9\u05dc\u05da \u05dc\u05e6\u05dc\u05dd \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4 \u05e9\u05dc\u05da. \u05d0\u05e0\u05d5 \u05e0\u05ea\u05d0\u05d9\u05dd \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05d4\u05d6\u05d5 \u05dc\u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e0\u05d9\u05da \u05d5\u05dc\u05e9\u05dd \u05d7\u05e9\u05d1\u05d5\u05e0\u05da. ", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05e9\u05dc\u05da \u05dc\u05e6\u05dc\u05dd \u05d0\u05ea \u05e4\u05e0\u05d9\u05da. \u05d0\u05e0\u05d7\u05e0\u05d5 \u05e0\u05e9\u05d5\u05d5\u05d4 \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05dc\u05ea\u05de\u05d5\u05e0\u05ea\u05da \u05d1\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4.", 
     "Used": "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9", 
-    "Used in {count} unit": [
-      "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d1\u05d9\u05d7\u05d9\u05d3\u05d4 {count}", 
-      "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d1-{count} \u05d9\u05d7\u05d9\u05d3\u05d5\u05ea"
-    ], 
     "User": "\u05de\u05e9\u05ea\u05de\u05e9", 
     "User Email": "\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc \u05de\u05e9\u05ea\u05de\u05e9", 
     "Username": "\u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9", 
@@ -1575,6 +1622,7 @@
       "\u05de\u05e6\u05d9\u05d2 \u05e7\u05d5\u05e8\u05e1 %s", 
       "\u05de\u05e6\u05d9\u05d2 %s \u05e7\u05d5\u05e8\u05e1\u05d9\u05dd"
     ], 
+    "Visibility": "\u05ea\u05e6\u05d5\u05d2\u05d4", 
     "Visible to": "\u05d2\u05dc\u05d5\u05d9 \u05e2\u05d1\u05d5\u05e8:", 
     "Visible to Staff Only": "\u05d2\u05dc\u05d5\u05d9 \u05dc\u05e6\u05d5\u05d5\u05ea \u05d1\u05dc\u05d1\u05d3", 
     "Visual aids": "\u05e2\u05d6\u05e8\u05d9\u05dd \u05d5\u05d9\u05d6\u05d5\u05d0\u05dc\u05d9\u05dd", 
@@ -1614,6 +1662,7 @@
     "Would you like to sign in using your %(providerName)s credentials?": "\u05d4\u05d0\u05dd \u05ea\u05e8\u05e6\u05d4 \u05dc\u05d4\u05d9\u05db\u05e0\u05e1 \u05dc\u05d7\u05e9\u05d1\u05d5\u05df \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05d4\u05e8\u05e9\u05d0\u05d5\u05ea %(providerName)s \u05e9\u05dc\u05da?", 
     "Year of Birth": "\u05e9\u05e0\u05ea \u05dc\u05d9\u05d3\u05d4", 
     "Yes, allow edits to the active Certificate": "\u05db\u05df, \u05d0\u05e4\u05e9\u05e8 \u05e2\u05e8\u05d9\u05db\u05d5\u05ea \u05d1\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05e4\u05e2\u05d9\u05dc\u05d4", 
+    "Yes, delete this {xblock_type}": "\u05db\u05df, \u05de\u05d7\u05e7 \u05d0\u05ea {xblock_type} \u05d6\u05d4", 
     "Yes, replace the edX transcript with the YouTube transcript": "\u05db\u05df, \u05d4\u05d7\u05dc\u05e3 \u05d0\u05ea \u05ea\u05de\u05dc\u05d9\u05dc edX \u05d1\u05ea\u05de\u05dc\u05d9\u05dc \u05d9\u05d5\u05d8\u05d9\u05d5\u05d1", 
     "You already belong to another team.": "\u05d0\u05ea\u05d4 \u05db\u05d1\u05e8 \u05e9\u05d9\u05d9\u05da \u05dc\u05e6\u05d5\u05d5\u05ea \u05d0\u05d7\u05e8.", 
     "You are a member of this team.": "\u05d0\u05ea\u05d4 \u05d7\u05d1\u05e8 \u05d1\u05e6\u05d5\u05d5\u05ea \u05d6\u05d4.", 
@@ -1633,6 +1682,8 @@
     "You cannot view the course as a student or beta tester before the course release date.": "\u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05e6\u05e4\u05d5\u05ea \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05db\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d0\u05d5 \u05de\u05e9\u05ea\u05de\u05e9 \u05d1\u05d2\u05e8\u05e1\u05ea \u05d4\u05d1\u05d8\u05d0 \u05dc\u05e4\u05e0\u05d9 \u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05d4\u05e9\u05e7\u05d4 \u05e9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1.", 
     "You changed a video URL, but did not change the timed transcript file. Do you want to use the current timed transcript or upload a new .srt transcript file?": "\u05e9\u05d9\u05e0\u05d9\u05ea \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4-URL \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d0\u05da \u05dc\u05d0 \u05e9\u05d9\u05e0\u05d9\u05ea \u05d0\u05ea \u05e7\u05d5\u05d1\u05e5 \u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df. \u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e7\u05d5\u05d1\u05e5 \u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05e0\u05d5\u05db\u05d7\u05d9 \u05d0\u05d5 \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e7\u05d5\u05d1\u05e5 \u05ea\u05de\u05dc\u05d9\u05dc SRT \u05d7\u05d3\u05e9?", 
     "You commented...": "\u05d4\u05d2\u05d1\u05ea...", 
+    "You could not be subscribed to this post. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e8\u05e9\u05d5\u05dd \u05d0\u05d5\u05ea\u05da \u05dc\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "You could not be unsubscribed from this post. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05d4\u05e8\u05d9\u05e9\u05d5\u05dd \u05e9\u05dc\u05da \u05dc\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "You currently have no cohorts configured": "\u05dc\u05d0 \u05de\u05d5\u05d2\u05d3\u05e8\u05d5\u05ea \u05db\u05e2\u05ea \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
     "You did not select a content group": "\u05dc\u05d0 \u05d1\u05d7\u05e8\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df", 
     "You did not select any files to submit.": "\u05dc\u05d0 \u05d1\u05d7\u05e8\u05ea \u05d0\u05e3 \u05e7\u05d5\u05d1\u05e5 \u05dc\u05d4\u05d2\u05e9\u05d4.", 
@@ -1641,22 +1692,22 @@
     "You don't seem to have a webcam connected.": "\u05e0\u05e8\u05d0\u05d4 \u05db\u05d9 \u05dc\u05d0 \u05de\u05d7\u05d5\u05d1\u05e8\u05ea \u05de\u05e6\u05dc\u05de\u05ea \u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8.", 
     "You have already reported this annotation.": "\u05db\u05d1\u05e8 \u05d3\u05d9\u05d5\u05d5\u05d7\u05ea \u05e2\u05dc \u05d4\u05d4\u05e2\u05e8\u05d4 \u05d4\u05d6\u05d5.", 
     "You have already verified your ID!": "\u05d0\u05d9\u05de\u05ea\u05ea \u05db\u05d1\u05e8 \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da!", 
+    "You have been logged out of your edX account. Click Okay to log in again now. Click Cancel to stay on this page (you must log in again to save your work).": "\u05d9\u05e6\u05d0\u05ea \u05de\u05d7\u05e9\u05d1\u05d5\u05df edX \u05e9\u05dc\u05da. \u05dc\u05d7\u05e5 \u05e2\u05dc '\u05d0\u05d9\u05e9\u05d5\u05e8' \u05db\u05d3\u05d9 \u05dc\u05d4\u05d9\u05db\u05e0\u05e1 \u05e9\u05d5\u05d1 \u05db\u05e2\u05ea. \u05dc\u05d7\u05e5 \u05e2\u05dc '\u05d1\u05d9\u05d8\u05d5\u05dc' \u05db\u05d3\u05d9 \u05dc\u05d4\u05d9\u05e9\u05d0\u05e8 \u05d1\u05e2\u05de\u05d5\u05d3 (\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d9\u05db\u05e0\u05e1 \u05e9\u05d5\u05d1 \u05db\u05d3\u05d9 \u05dc\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05de\u05d4 \u05e9\u05e2\u05e9\u05d9\u05ea).", 
     "You have done a dry run of force publishing the course. Nothing has changed. Had you run it, the following course versions would have been change.": "\u05d1\u05d9\u05e6\u05e2\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4 \u05de\u05d0\u05d5\u05dc\u05e6\u05ea \u05e9\u05dc \u05e4\u05e8\u05e1\u05d5\u05dd \u05d4\u05e7\u05d5\u05e8\u05e1. \u05d3\u05d1\u05e8 \u05dc\u05d0 \u05d4\u05e9\u05ea\u05e0\u05d4. \u05d0\u05dd \u05d4\u05d9\u05d9\u05ea \u05de\u05e4\u05e2\u05d9\u05dc \u05d0\u05d5\u05ea\u05d5, \u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05d1\u05d0\u05d5\u05ea \u05d4\u05d9\u05d5 \u05de\u05e9\u05ea\u05e0\u05d5\u05ea.", 
     "You have no handouts defined": "\u05dc\u05d0 \u05d4\u05d5\u05d2\u05d3\u05e8\u05d5 \u05d3\u05e4\u05d9 \u05de\u05d9\u05d3\u05e2", 
     "You have not created any certificates yet.": "\u05dc\u05d0 \u05d9\u05e6\u05e8\u05ea \u05d0\u05e3 \u05ea\u05e2\u05d5\u05d3\u05d4 \u05e2\u05d3\u05d9\u05d9\u05df.", 
     "You have not created any content groups yet.": " \u05dc\u05d0 \u05d9\u05e6\u05e8\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05ea\u05d5\u05db\u05df \u05db\u05dc\u05e9\u05d4\u05df.", 
     "You have not created any group configurations yet.": "\u05dc\u05d0 \u05d9\u05e6\u05e8\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d4.", 
+    "You have successfully signed into %(currentProvider)s, but your %(currentProvider)s account does not have a linked %(platformName)s account. To link your accounts, sign in now using your %(platformName)s password.": "\u05e0\u05e8\u05e9\u05de\u05ea \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc-%(currentProvider)s, \u05d0\u05da \u05dc\u05d7\u05e9\u05d1\u05d5\u05df %(currentProvider)s\u05d0\u05d9\u05df \u05d7\u05e9\u05d1\u05d5\u05df %(platformName)s \u05de\u05e7\u05d5\u05e9\u05e8. \u05db\u05d3\u05d9 \u05dc\u05e7\u05e9\u05e8 \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05d5\u05ea\u05d9\u05d9\u05da, \u05d4\u05d9\u05db\u05e0\u05e1 \u05db\u05e2\u05ea \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05e1\u05d9\u05e1\u05de\u05ea %(platformName)s.", 
     "You have unsaved changes are you sure you want to navigate away?": "\u05d9\u05e9\u05e0\u05dd \u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5, \u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05e2\u05d6\u05d5\u05d1?", 
     "You have unsaved changes. Do you really want to leave this page?": "\u05d9\u05e9\u05e0\u05dd \u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5. \u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e2\u05d6\u05d5\u05d1 \u05e2\u05de\u05d5\u05d3 \u05d6\u05d4?", 
     "You haven't added any assets to this course yet.": "\u05e2\u05d3\u05d9\u05d9\u05df \u05dc\u05d0 \u05d4\u05d5\u05e1\u05e4\u05ea \u05e0\u05db\u05e1\u05d9\u05dd \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "You haven't added any content to this course yet.": " \u05dc\u05d0 \u05d4\u05d5\u05e1\u05e4\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05ea\u05d5\u05db\u05df \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "You haven't added any textbooks to this course yet.": "\u05dc\u05d0 \u05d4\u05d5\u05e1\u05e4\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05e1\u05e4\u05e8\u05d9 \u05dc\u05d9\u05de\u05d5\u05d3 \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d9\u05d5\u05ea \u05de\u05e2\u05dc \u05d2\u05d9\u05dc 13 \u05db\u05d3\u05d9 \u05dc\u05e9\u05ea\u05e3 \u05d0\u05ea \u05de\u05d9\u05d3\u05e2 \u05d4\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d4\u05de\u05dc\u05d0 \u05e9\u05dc\u05da. \u05d0\u05dd \u05d0\u05ea\u05d4 \u05de\u05e2\u05dc \u05d2\u05d9\u05dc 13, \u05d5\u05d3\u05d0 \u05e9\u05e6\u05d9\u05d9\u05e0\u05ea \u05d0\u05ea \u05e9\u05e0\u05ea \u05d4\u05dc\u05d9\u05d3\u05d4 \u05e9\u05dc\u05da \u05d1{account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d6\u05d9\u05df \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05ea\u05e7\u05d9\u05e0\u05d4 \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d7\u05d1\u05e8 \u05e6\u05d5\u05d5\u05ea \u05d7\u05d3\u05e9.", 
     "You must sign out and sign back in before your language changes take effect.": "\u05e2\u05dc\u05d9\u05da \u05dc\u05e6\u05d0\u05ea \u05de\u05d4\u05d7\u05e9\u05d1\u05d5\u05df \u05d5\u05dc\u05d4\u05db\u05e0\u05e1 \u05d7\u05d6\u05e8\u05d4 \u05e2\u05dc \u05de\u05e0\u05ea \u05e9\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9 \u05d4\u05e9\u05e4\u05d4 \u05d9\u05d9\u05db\u05e0\u05e1\u05d5 \u05dc\u05ea\u05d5\u05e7\u05e3.", 
     "You must specify a name": "\u05e2\u05dc\u05d9\u05da \u05dc\u05ea\u05ea \u05e9\u05dd", 
     "You must specify a name for the cohort": "\u05e2\u05dc\u05d9\u05da \u05dc\u05e6\u05d9\u05d9\u05df \u05e9\u05dd \u05e9\u05dc \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u05e2\u05dc\u05d9\u05da \u05dc\u05e6\u05d9\u05d9\u05df \u05d0\u05ea \u05e9\u05e0\u05ea \u05d4\u05dc\u05d9\u05d3\u05d4 \u05e9\u05dc\u05da \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05d5\u05db\u05dc \u05dc\u05d7\u05dc\u05d5\u05e7 \u05d0\u05ea \u05d4\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d4\u05de\u05dc\u05d0 \u05e9\u05dc\u05da. \u05d1\u05db\u05d3\u05d9 \u05dc\u05e6\u05d9\u05d9\u05df \u05d0\u05ea \u05e9\u05e0\u05ea \u05d4\u05dc\u05d9\u05d3\u05d4 \u05e9\u05dc\u05da \u05e2\u05d1\u05d5\u05e8 \u05dc{account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u05d0\u05ea\u05d4 \u05d6\u05e7\u05d5\u05e7 \u05dc\u05de\u05d7\u05e9\u05d1 \u05d1\u05e2\u05dc \u05de\u05e6\u05dc\u05de\u05ea \u05e8\u05e9\u05ea. \u05d1\u05e7\u05d1\u05dc\u05ea \u05d4\u05e0\u05d7\u05d9\u05d9\u05ea \u05d3\u05e4\u05d3\u05e4\u05df, \u05d5\u05d3\u05d0 \u05db\u05d9 \u05d0\u05ea\u05d4 \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05dc\u05de\u05e6\u05dc\u05de\u05d4.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u05d0\u05ea\u05d4 \u05d6\u05e7\u05d5\u05e7 \u05dc\u05e8\u05d9\u05e9\u05d9\u05d5\u05df \u05e0\u05d4\u05d9\u05d2\u05d4, \u05d3\u05e8\u05db\u05d5\u05df \u05d0\u05d5 \u05ea\u05e2\u05d5\u05d3\u05ea \u05de\u05d6\u05d4\u05d4 \u05d0\u05d7\u05e8\u05ea \u05e9\u05de\u05d5\u05e4\u05d9\u05e2\u05d9\u05dd \u05d1\u05d4 \u05e9\u05de\u05da \u05d5\u05ea\u05de\u05d5\u05e0\u05ea\u05da.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u05d0\u05ea\u05d4 \u05d6\u05e7\u05d5\u05e7 \u05dc\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d6\u05d4\u05d4 \u05e2\u05dd \u05e9\u05de\u05da \u05d5\u05e2\u05dd \u05ea\u05de\u05d5\u05e0\u05d4. \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e8\u05d9\u05e9\u05d9\u05d5\u05df \u05e0\u05d4\u05d9\u05d2\u05d4, \u05d3\u05e8\u05db\u05d5\u05df \u05d0\u05d5 \u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d6\u05d4\u05d4 \u05d0\u05d7\u05e8\u05ea \u05e9\u05d4\u05d5\u05e0\u05e4\u05e7\u05d4 \u05e2\u05dc \u05d9\u05d3\u05d9 \u05d4\u05de\u05de\u05e9\u05dc\u05d4. ", 
@@ -1677,6 +1728,7 @@
     "Your changes have been saved.": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e0\u05e9\u05de\u05e8\u05d5", 
     "Your changes will not take effect until you save your progress.": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05d1\u05d9\u05e6\u05e2\u05ea \u05dc\u05d0 \u05d9\u05db\u05e0\u05e1\u05d5 \u05dc\u05e4\u05d5\u05e2\u05dc \u05e2\u05d3 \u05e9\u05ea\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05e2\u05d1\u05d5\u05d3\u05ea\u05da.", 
     "Your changes will not take effect until you save your progress. Take care with key and value formatting, as validation is not implemented.": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05d1\u05d9\u05e6\u05e2\u05ea \u05dc\u05d0 \u05d9\u05db\u05e0\u05e1\u05d5 \u05dc\u05ea\u05d5\u05e7\u05e3 \u05e2\u05d3 \u05e9\u05ea\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea\u05da. \u05e9\u05d9\u05dd \u05dc\u05d1 \u05dc\u05e2\u05d9\u05e6\u05d5\u05d1 \u05d4\u05e7\u05d5 \u05d5\u05d4\u05e2\u05e8\u05da, \u05de\u05d0\u05d7\u05e8 \u05e9\u05d4\u05d0\u05d9\u05de\u05d5\u05ea \u05d0\u05d9\u05e0\u05d5 \u05de\u05d5\u05d8\u05de\u05e2.", 
+    "Your course could not be exported to XML. There is not enough information to identify the failed component. Inspect your course to identify any problematic components and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d9\u05d9\u05e6\u05d0 \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05dc-XML. \u05d0\u05d9\u05df \u05de\u05d9\u05d3\u05e2 \u05d1\u05de\u05d9\u05d3\u05d4 \u05de\u05e1\u05e4\u05e7\u05ea \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d6\u05d4\u05d5\u05ea \u05d0\u05ea \u05d4\u05e8\u05db\u05d9\u05d1 \u05d4\u05db\u05d5\u05e9\u05dc. \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e9\u05dc\u05da \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d6\u05d4\u05d5\u05ea \u05e8\u05db\u05d9\u05d1\u05d9\u05dd \u05d1\u05e2\u05d9\u05d9\u05ea\u05d9\u05dd \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
     "Your donation could not be submitted.": "\u05d4\u05ea\u05e8\u05d5\u05de\u05d4 \u05e9\u05dc\u05da \u05dc\u05d0 \u05d9\u05db\u05dc\u05d4 \u05dc\u05d4\u05ea\u05e7\u05d1\u05dc.", 
     "Your email message was successfully queued for sending. In courses with a large number of learners, email messages to learners might take up to an hour to be sent.": "\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e0\u05db\u05e0\u05e1\u05d4 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc\u05d4\u05de\u05ea\u05e0\u05d4 \u05dc\u05de\u05e9\u05dc\u05d5\u05d7. \u05d1\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05e2\u05dd \u05de\u05e1\u05e4\u05e8 \u05d2\u05d3\u05d5\u05dc \u05e9\u05dc \u05dc\u05d5\u05de\u05d3\u05d9\u05dd, \u05d9\u05d9\u05ea\u05db\u05df \u05e9\u05d9\u05d9\u05e7\u05d7 \u05e2\u05d3 \u05e9\u05e2\u05d4 \u05e2\u05d3 \u05e9\u05d4\u05d5\u05d3\u05e2\u05d5\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05dc\u05db\u05dc \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d9\u05d9\u05e9\u05dc\u05d7\u05d5.", 
     "Your entire face fits inside the frame.": "\u05e4\u05e0\u05d9\u05da \u05de\u05ea\u05d0\u05d9\u05de\u05d9\u05dd \u05dc\u05d2\u05d1\u05d5\u05dc\u05d5\u05ea \u05d4\u05de\u05e1\u05d2\u05e8\u05ea.", 
@@ -1685,13 +1737,19 @@
     "Your file could not be uploaded": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05d0\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5 \u05e9\u05dc\u05da", 
     "Your file has been deleted.": "\u05d4\u05e7\u05d5\u05d1\u05e5 \u05e9\u05dc\u05da \u05e0\u05de\u05d7\u05e7", 
     "Your file {filename} is too large (max size: {maxSize}MB).": "\u05d4\u05e7\u05d5\u05d1\u05e5 {filename} \u05d2\u05d3\u05d5\u05dc \u05de\u05d3\u05d9 (\u05d2\u05d5\u05d3\u05dc \u05de\u05e8\u05d1\u05d9: {maxSize}MB).", 
+    "Your import has failed.": "\u05d4\u05d9\u05d1\u05d5\u05d0 \u05e0\u05db\u05e9\u05dc.", 
+    "Your import is in progress; navigating away will abort it.": "\u05d4\u05d9\u05d1\u05d5\u05d0 \u05e9\u05dc\u05da \u05e0\u05de\u05e6\u05d0 \u05d1\u05ea\u05d4\u05dc\u05d9\u05da; \u05e0\u05d9\u05d5\u05d5\u05d8 \u05d4\u05d7\u05d5\u05e6\u05d4 \u05d9\u05d1\u05d8\u05dc \u05d6\u05d0\u05ea.", 
+    "Your library could not be exported to XML. There is not enough information to identify the failed component. Inspect your library to identify any problematic components and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d9\u05d9\u05e6\u05d0 \u05d0\u05ea \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea\u05da \u05dc\u05e7\u05d5\u05d1\u05e5 XML. \u05d0\u05d9\u05df \u05de\u05d9\u05d3\u05e2  \u05d1\u05de\u05d9\u05d3\u05d4 \u05de\u05e1\u05e4\u05e7\u05ea \u05dc\u05d6\u05d9\u05d4\u05d5\u05d9 \u05d4\u05e8\u05db\u05d9\u05d1 \u05d4\u05db\u05d5\u05e9\u05dc. \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea\u05da, \u05d6\u05d4\u05d4 \u05e8\u05db\u05d9\u05d1\u05d9\u05dd \u05d1\u05e2\u05d9\u05ea\u05d9\u05d9\u05dd \u05d5\u05dc\u05d0\u05d7\u05e8 \u05de\u05db\u05df \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
     "Your message cannot be blank.": "\u05d4\u05d5\u05d3\u05e2\u05ea\u05da \u05d0\u05d9\u05e0\u05d4 \u05d9\u05db\u05d5\u05dc\u05d4 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e8\u05d9\u05e7\u05d4.", 
     "Your message must have a subject.": "\u05d4\u05d5\u05d3\u05e2\u05ea\u05da \u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05db\u05d9\u05dc \u05e0\u05d5\u05e9\u05d0.", 
     "Your message must have at least one target.": "\u05d4\u05d4\u05d5\u05d3\u05e2\u05d4 \u05e9\u05dc\u05da \u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05db\u05d9\u05dc \u05d9\u05e2\u05d3 \u05d0\u05d7\u05d3 \u05dc\u05e4\u05d7\u05d5\u05ea.", 
     "Your policy changes have been saved.": "\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9 \u05de\u05d3\u05d9\u05e0\u05d9\u05d5\u05ea\u05da \u05e0\u05e9\u05de\u05e8\u05d5.", 
     "Your post will be discarded.": "\u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05dc\u05da \u05d9\u05d1\u05d5\u05d8\u05dc.", 
+    "Your question or idea (required)": "\u05e9\u05d0\u05dc\u05ea\u05da \u05d0\u05d5 \u05e8\u05e2\u05d9\u05d5\u05e0\u05da (\u05d7\u05d5\u05d1\u05d4)", 
+    "Your request could not be completed due to a server problem. Reload the page and try again. If the issue persists, click the Help tab to report the problem.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da \u05d1\u05d2\u05dc\u05dc \u05d1\u05e2\u05d9\u05d4 \u05d1\u05e9\u05e8\u05ea. \u05d8\u05e2\u05df \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. \u05d0\u05dd \u05d4\u05d1\u05e2\u05d9\u05d4 \u05e0\u05de\u05e9\u05db\u05ea, \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05e9\u05d5\u05e0\u05d9\u05ea '\u05e2\u05d6\u05e8\u05d4' \u05db\u05d3\u05d9 \u05dc\u05d3\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05d1\u05e2\u05d9\u05d4.", 
     "Your request could not be completed. Reload the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da. \u05d8\u05e2\u05df \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
     "Your request could not be completed. Reload the page and try again. If the issue persists, click the Help tab to report the problem.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da. \u05d8\u05e2\u05df \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. \u05d0\u05dd \u05d4\u05d1\u05e2\u05d9\u05d4 \u05e0\u05de\u05e9\u05db\u05ea, \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05e9\u05d5\u05e0\u05d9\u05ea '\u05e2\u05d6\u05e8\u05d4' \u05db\u05d3\u05d9 \u05dc\u05d3\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05d1\u05e2\u05d9\u05d4.", 
+    "Your request could not be processed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d1\u05d3 \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Your team could not be created.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d9\u05e6\u05d5\u05e8 \u05d0\u05ea \u05d4\u05e6\u05d5\u05d5\u05ea \u05e9\u05dc\u05da.", 
     "Your team could not be updated.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d3\u05db\u05df \u05d0\u05ea \u05d4\u05e6\u05d5\u05d5\u05ea \u05e9\u05dc\u05da.", 
     "Your upload of '{file}' failed.": "\u05d4\u05e2\u05dc\u05ea \u05e7\u05d5\u05d1\u05e5 '{file}' \u05e0\u05db\u05e9\u05dc\u05d4.", 
@@ -1732,6 +1790,7 @@
     "dropped on target": "\u05e9\u05d5\u05d7\u05e8\u05e8 \u05e2\u05dc \u05d4\u05de\u05d8\u05e8\u05d4", 
     "e.g. 'Sky with clouds'. The description is helpful for users who cannot see the image.": "\u05dc\u05d3\u05d5\u05d2\u05de\u05d4 '\u05e9\u05de\u05d9\u05d9\u05dd \u05e2\u05dd \u05e2\u05e0\u05e0\u05d9\u05dd'. \u05d4\u05ea\u05d9\u05d0\u05d5\u05e8 \u05de\u05d5\u05e2\u05d9\u05dc \u05dc\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05e9\u05d0\u05d9\u05e0\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4.", 
     "e.g. 'google'": "\u05dc\u05d3\u05d5\u05d2\u05de\u05d4: 'google'", 
+    "e.g. 'http://google.com'": "\u05dc\u05de\u05e9\u05dc 'http://google.com'", 
     "e.g. johndoe@example.com, JaneDoe, joeydoe@example.com": "\u05dc\u05d3\u05d5\u05d2\u05de\u05d4 johndoe@example.com, JaneDoe, joeydoe@example.com", 
     "emphasized text": "\u05d8\u05e7\u05e1\u05d8 \u05de\u05d5\u05d3\u05d2\u05e9", 
     "endorsed %(time_ago)s": "\u05d0\u05d5\u05e9\u05e8 %(time_ago)s", 
@@ -1746,6 +1805,7 @@
     "less than a minute": "\u05e4\u05d7\u05d5\u05ea \u05de\u05d3\u05e7\u05d4", 
     "marked as answer %(time_ago)s": "\u05e1\u05d5\u05de\u05df \u05db\u05ea\u05e9\u05d5\u05d1\u05d4 %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "\u05e1\u05d5\u05de\u05df \u05db\u05ea\u05e9\u05d5\u05d1\u05d4 \u05e2\u05dc \u05d9\u05d3\u05d9 %(time_ago)s \u05e2\u05dc \u05d9\u05d3\u05d9%(user)s", 
+    "minutes": "\u05d3\u05e7\u05d5\u05ea", 
     "name": "\u05e9\u05dd", 
     "off": "\u05db\u05d1\u05d5\u05d9", 
     "on": "\u05e4\u05d5\u05e2\u05dc", 
@@ -1787,6 +1847,8 @@
     "{browse_span_start}Browse teams in other topics{span_end} or {search_span_start}search teams{span_end} in this topic. If you still can't find a team to join, {create_span_start}create a new team in this topic{span_end}.": "{browse_span_start}\u05e2\u05d9\u05d9\u05df \u05d1\u05e6\u05d5\u05d5\u05ea\u05d9\u05dd \u05d1\u05e0\u05d5\u05e9\u05d0\u05d9\u05dd \u05d0\u05d7\u05e8\u05d9\u05dd {span_end}\u05d0\u05d5 {search_span_start}\u05d7\u05e4\u05e9 \u05e6\u05d5\u05d5\u05ea\u05d9\u05dd{span_end} \u05d1\u05e0\u05d5\u05e9\u05d0 \u05d6\u05d4. \u05d0\u05dd \u05e2\u05d3\u05d9\u05d9\u05df \u05dc\u05d0 \u05d4\u05e6\u05dc\u05d7\u05ea \u05dc\u05de\u05e6\u05d5\u05d0 \u05e6\u05d5\u05d5\u05ea \u05dc\u05d4\u05e6\u05d8\u05e8\u05e3 \u05d0\u05dc\u05d9\u05d5, {create_span_start}\u05e6\u05d5\u05e8 \u05e6\u05d5\u05d5\u05ea \u05d7\u05d3\u05e9 \u05d1\u05e0\u05d5\u05e9\u05d0 \u05d6\u05d4{span_end}.", 
     "{display_name} Settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea {display_name}", 
     "{email} is already on the {container} team. Recheck the email address if you want to add a new member.": "{email} \u05db\u05d1\u05e8 \u05e0\u05de\u05e6\u05d0 \u05d1\u05e6\u05d5\u05d5\u05ea {container}. \u05d1\u05d3\u05d5\u05e7 \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05d1\u05de\u05d9\u05d3\u05d4 \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d7\u05d1\u05e8 \u05e6\u05d5\u05d5\u05ea \u05d7\u05d3\u05e9.", 
+    "{filename} exceeds maximum size of {maxFileSizeInGB} GB.": "\u05d4\u05e7\u05d5\u05d1\u05e5 {filename} \u05d7\u05d5\u05e8\u05d2 \u05de\u05d4\u05d2\u05d5\u05d3\u05dc \u05d4\u05de\u05e8\u05d1\u05d9 \u05e9\u05dc {maxFileSizeInGB} GB.", 
+    "{filename} is not in a supported file format. Supported file formats are {supportedFileFormats}.": "\u05d4\u05e4\u05d5\u05e8\u05de\u05d8 \u05e9\u05dc {filename} \u05d0\u05d9\u05e0\u05d5 \u05e0\u05ea\u05de\u05da. \u05e1\u05d5\u05d2\u05d9 \u05d4\u05e7\u05d1\u05e6\u05d9\u05dd \u05e9\u05e0\u05ea\u05de\u05db\u05d9\u05dd \u05d4\u05dd {supportedFileFormats}.", 
     "{hours}:{minutes} (current UTC time)": "{hours}:{minutes} (\u05d6\u05de\u05df \u05d0\u05d5\u05e0\u05d9\u05d1\u05e8\u05e1\u05dc\u05d9 \u05de\u05ea\u05d5\u05d0\u05dd (UTC) \u05e0\u05d5\u05db\u05d7\u05d9)", 
     "{label}: {status}": "{label}: {status}", 
     "{numResponses} other response": [
@@ -1802,7 +1864,7 @@
       "{numVotes} \u05e7\u05d5\u05dc\u05d5\u05ea"
     ], 
     "{organization}\\'s logo": "\u05d4\u05e1\u05de\u05dc \u05e9\u05dc {organization}", 
-    "{platform_name} learners can see my:": "{platform_name} \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea:", 
+    "{paragraphStart}You entered {boldStart}{email}{boldEnd}. If this email address is associated with your {platform_name} account, we will send a message with password reset instructions to this email address.{paragraphEnd}{paragraphStart}If you do not receive a password reset message, verify that you entered the correct email address, or check your spam folder.{paragraphEnd}{paragraphStart}If you need further assistance, {anchorStart}contact technical support{anchorEnd}.{paragraphEnd}": "{paragraphStart}\u05d4\u05d6\u05e0\u05ea {boldStart}{email}{boldEnd}. \u05d0\u05dd \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05d4\u05d6\u05d5 \u05e7\u05e9\u05d5\u05e8\u05d4 \u05dc\u05d7\u05e9\u05d1\u05d5\u05df {platform_name} \u05e9\u05dc\u05da, \u05e0\u05e9\u05dc\u05d7 \u05d4\u05d5\u05d3\u05e2\u05d4 \u05e2\u05dd \u05d4\u05e0\u05d7\u05d9\u05d5\u05ea \u05dc\u05d0\u05d9\u05e4\u05d5\u05e1 \u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05dc\u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05d4\u05d6\u05d5.{paragraphEnd}{paragraphStart}\u05d0\u05dd \u05dc\u05d0 \u05ea\u05e7\u05d1\u05dc \u05d4\u05d5\u05d3\u05e2\u05d4 \u05dc\u05d0\u05d9\u05e4\u05d5\u05e1 \u05e1\u05d9\u05e1\u05de\u05d4, \u05d1\u05d3\u05d5\u05e7 \u05e9\u05d4\u05d6\u05e0\u05ea \u05d0\u05ea \u05d4\u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05e0\u05db\u05d5\u05e0\u05d4 \u05d0\u05d5 \u05d1\u05d3\u05d5\u05e7 \u05d1\u05ea\u05d9\u05e7\u05d9\u05d9\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d4\u05d6\u05d1\u05dc \u05d0\u05e6\u05dc\u05da.{paragraphEnd}{paragraphStart}\u05d0\u05dd \u05d9\u05e9 \u05dc\u05da \u05e6\u05d5\u05e8\u05da \u05d1\u05e2\u05d6\u05e8\u05d4 \u05e0\u05d5\u05e1\u05e4\u05ea, {anchorStart}\u05e4\u05e0\u05d4 \u05dc\u05ea\u05de\u05d9\u05db\u05d4 \u05d4\u05d8\u05db\u05e0\u05d9\u05ea{anchorEnd}.{paragraphEnd}", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u05d0\u05d6\u05d4\u05e8\u05d4:{screen_reader_end} \u05dc\u05d0 \u05e7\u05d9\u05d9\u05de\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05ea\u05d5\u05db\u05df.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u05d0\u05d6\u05d4\u05e8\u05d4:{screen_reader_end} \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05e9\u05e0\u05d1\u05d7\u05e8\u05d4 \u05d1\u05e2\u05d1\u05e8, \u05e0\u05de\u05d7\u05e7\u05d4. \u05d1\u05d7\u05e8 \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05d0\u05d7\u05e8\u05ea.", 
     "{start_strong}{total}{end_strong} words submitted in total.": "{start_strong}{total}{end_strong} \u05e1\u05da \u05db\u05dc \u05d4\u05de\u05d9\u05dc\u05d9\u05dd \u05e9\u05e0\u05e9\u05dc\u05d7\u05d5.", 
diff --git a/cms/static/js/i18n/ko-kr/djangojs.js b/cms/static/js/i18n/ko-kr/djangojs.js
index 11d7850cf8..c1dff0e1d8 100644
--- a/cms/static/js/i18n/ko-kr/djangojs.js
+++ b/cms/static/js/i18n/ko-kr/djangojs.js
@@ -55,13 +55,9 @@
     ], 
     "%s ago": "%s \uc804", 
     "%s from now": "\uc9c0\uae08\uc73c\ub85c \ubd80\ud130 %s \uc774\ud6c4", 
-    "About me": "\uc790\uae30\uc18c\uac1c", 
     "Account Settings": "\uacc4\uc815 \uc124\uc815", 
-    "Account Settings page.": "\uacc4\uc815 \uc124\uc815 \ud398\uc774\uc9c0", 
     "Add Cohort": "\ud559\uc2b5\uc9d1\ub2e8 \ucd94\uac00\ud558\uae30", 
-    "Add Country": "\uad6d\uac00 \ucd94\uac00", 
     "Add a New Cohort": "\uc2e0\uaddc \ud559\uc2b5 \uc9d1\ub2e8 \ucd94\uac00", 
-    "Add language": "\uc5b8\uc5b4 \ucd94\uac00", 
     "Add to Dictionary": "\ubaa8\uc74c\uc5d0 \ucd94\uac00\ud558\uae30", 
     "Adding the selected course to your cart": "\uc7a5\ubc14\uad6c\ub2c8\uc5d0 \uc120\ud0dd\ub41c \uac15\uc88c\ub97c \ucd94\uac00\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4.", 
     "Advanced": "\uace0\uae09", 
@@ -244,7 +240,6 @@
     "Format": "\ud615\uc2dd", 
     "Formats": "\ud615\uc2dd", 
     "Full Name": "\uc2e4\uba85", 
-    "Full Profile": "\uc804\uccb4 \ud504\ub85c\ud544", 
     "Fullscreen": "\uc804\uccb4 \ud654\uba74", 
     "Gender": "\uc131 ", 
     "General": "\uc77c\ubc18", 
@@ -313,7 +308,6 @@
     "Left": "\uc67c\ucabd \uc815\ub82c", 
     "Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd\uc73c\ub85c", 
     "Less": "\uc801\uac8c", 
-    "Limited Profile": "\uc81c\ud55c\uc801 \ud504\ub85c\ud544", 
     "Linking": "\uc5f0\uacb0\ud558\uae30", 
     "Links are generated on demand and expire within 5 minutes due to the sensitive nature of student information.": "\uc694\uccad\uc5d0 \uc758\ud574 \uc0dd\uc131\ub41c \ub9c1\ud06c\ub294 \ud559\uc2b5\uc790 \uc815\ubcf4 \ubcf4\ud638\ub97c \uc704\ud574  5\ubd84 \ub0b4\uc5d0 \uc18c\uba78\ub429\ub2c8\ub2e4.", 
     "List item": "\ubb38\ub2e8\ubc88\ud638", 
@@ -402,8 +396,6 @@
     "Print": "\ud504\ub9b0\ud2b8", 
     "Professional Education": "\uc804\ubb38 \uad50\uc721 \uacfc\uc815", 
     "Professional Education Verified Certificate": "\uc804\ubb38 \uacfc\uc815 \uc774\uc218\uc99d", 
-    "Profile Image": "\ud504\ub85c\ud544 \uc774\ubbf8\uc9c0", 
-    "Profile image for {username}": "{username}\uc758 \ud504\ub85c\ud544 \uc774\ubbf8\uc9c0", 
     "Public": "\uacf5\uac1c", 
     "Reason field should not be left blank.": "\uc774\uc720\ub97c \uc785\ub825\ud558\ub294 \ud544\ub4dc\ub294 \ube44\uc6cc\ub458 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.", 
     "Recent Activity": "\ucd5c\uadfc \ud65c\ub3d9", 
@@ -505,7 +497,6 @@
     "Task Type": "\uc791\uc5c5 \uc720\ud615", 
     "Task inputs": "\uc791\uc5c5 \uc785\ub825", 
     "Teams": "\ud300", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\ub2e4\ub978 \ud559\uc2b5\uc790\ub4e4\uc5d0\uac8c \uac04\ub2e8\ud558\uac8c \ub098\ub97c \uc18c\uac1c\ud569\ub2c8\ub2e4. \uad00\uc2ec\uc0ac, \uc218\uac15 \uc774\uc720 \ub610\ub294 \ud559\uc2b5 \ubaa9\ud45c \uac19\uc740 \uac83\uc744 \uc4f0\uba74 \ub429\ub2c8\ub2e4. ", 
     "Templates": "\ud15c\ud50c\ub9bf", 
     "Text": "Text", 
     "Text color": "\uae00\uc790\uc0c9", 
@@ -606,11 +597,9 @@
     "You don't seem to have a webcam connected.": "\uc6f9\ucea0\uc774 \uc5f0\uacb0\ub418\uc9c0 \uc54a\uc740 \uac83 \uac19\uc2b5\ub2c8\ub2e4.", 
     "You have already reported this annotation.": "\uc774 \uc8fc\uc11d\uc740 \uc774\ubbf8 \uc2e0\uace0\ub418\uc5c8\uc2b5\ub2c8\ub2e4.", 
     "You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ub418\uc9c0 \uc54a\uc740 \ubcc0\uacbd\uc0ac\ud56d\uc774 \uc788\uc2b5\ub2c8\ub2e4. \uacc4\uc18d \ud0d0\uc0c9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\uc804\uccb4 \ud504\ub85c\ud544\uc744 \uacf5\uc720\ud558\ub824\uba74 13\uc138 \uc774\uc0c1\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. 13\uc138 \uc774\uc0c1\uc774\ub77c\uba74,  {account_settings_page_link}\uc5d0\uc11c \ucd9c\uc0dd\uc5f0\ub3c4\ub97c \uc785\ub825\ud558\uc138\uc694.", 
     "You must sign out and sign back in before your language changes take effect.": "\uc5b8\uc5b4\uac00 \ubc14\ub00c\uc5b4\uc84c\ub294\uc9c0 \ud655\uc778\ud558\uae30 \uc704\ud574 \ub85c\uadf8\uc544\uc6c3 \ud558\uace0 \ub2e4\uc2dc \ub85c\uadf8\uc778 \ud558\uc138\uc694.", 
     "You must specify a name": "\uc774\ub984\uc744 \uba85\uc2dc\ud574\uc57c \ud569\ub2c8\ub2e4.", 
     "You must specify a name for the cohort": "\ud559\uc2b5 \uc9d1\ub2e8\uc758 \uc774\ub984\uc744 \uc785\ub825\ud574\uc57c \ud569\ub2c8\ub2e4.", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\uadc0\ud558\uc758 \uc804\uccb4 \ud504\ub85c\ud544\uc744 \uacf5\uc720\ud558\uae30 \uc804\uc5d0 \ucd9c\uc0dd\uc5f0\ub3c4\ub97c \uc785\ub825\ud574\uc57c \ud569\ub2c8\ub2e4. \ucd9c\uc0dd\uc5f0\ub3c4\ub97c \uc9c0\uc815\ud558\ub824\uba74  {account_settings_page_link}\ub85c \uac00\uba74 \ub429\ub2c8\ub2e4.  ", 
     "You've made some changes": "\uc218\uc815 \uc644\ub8cc", 
     "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc800\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc9c1\uc811 \uc561\uc138\uc2a4\ub97c \uc9c0\uc6d0\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.  \ub300\uc2e0 \ub2e8\ucd95\ud0a4 Ctrl+X/C/V \ub97c \uc774\uc6a9\ud558\uc138\uc694.", 
     "Your changes have been saved.": "\ubcc0\uacbd\uc0ac\ud56d\uc774 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.", 
@@ -647,7 +636,6 @@
     "name": "\uc774\ub984", 
     "strong text": "\uac15\ud558\uac8c", 
     "team count": "\ud300 \uc778\uc6d0 \uc218", 
-    "{platform_name} learners can see my:": "{platform_name} \ud559\uc2b5\uc790\uac00 \ub098\uc5d0 \ub300\ud574 \ubcfc \uc218 \uc788\ub294 \uac83\uc740 :", 
     "\u2026": "\u2026"
   };
 
diff --git a/cms/static/js/i18n/pt-br/djangojs.js b/cms/static/js/i18n/pt-br/djangojs.js
index dc72fad620..1b12fd9b2f 100644
--- a/cms/static/js/i18n/pt-br/djangojs.js
+++ b/cms/static/js/i18n/pt-br/djangojs.js
@@ -97,10 +97,8 @@
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 
     "Abbreviation": "Abrevia\u00e7\u00e3o", 
     "About You": "Sobre Voc\u00ea", 
-    "About me": "Sobre mim", 
     "Account Not Activated": "Conta n\u00e3o ativada", 
     "Account Settings": "Configura\u00e7\u00f5es da Conta", 
-    "Account Settings page.": "P\u00e1gina de Configura\u00e7\u00f5es da conta.", 
     "Action": "A\u00e7\u00e3o", 
     "Actions": "A\u00e7\u00f5es", 
     "Activate": "Ativar", 
@@ -110,7 +108,6 @@
     "Add Additional Signatory": "Adicionar signat\u00e1rio adicional", 
     "Add Cohort": "Adicionar Grupo", 
     "Add Component:": "Adicionar componente:", 
-    "Add Country": "Adicionar pa\u00eds", 
     "Add New Component": "Adicionar Novo Componente", 
     "Add URLs for additional versions": "Adicionar URLs para vers\u00f5es adicionais", 
     "Add a Chapter": "Adicionar um Cap\u00edtulo", 
@@ -118,7 +115,6 @@
     "Add a Response": "Adicionar resposta", 
     "Add a comment": "Adicionar coment\u00e1rio", 
     "Add another group": "Adicionar outro grupo", 
-    "Add language": "Adicionar idioma", 
     "Add notes about this learner": "Adicionar coment\u00e1rios sobre esse aluno", 
     "Add to Dictionary": "Adicionar ao Dicion\u00e1rio", 
     "Add to Exception List": "Adicionar a Lista de Exce\u00e7\u00e3o", 
@@ -439,7 +435,6 @@
     "Edit Membership": "Editar assinatura.", 
     "Edit Team": "Editar equipe", 
     "Edit Your Name": "Edite o seu nome", 
-    "Edit the name": "Editar nome", 
     "Edit this certificate?": "Gostaria de editar este certificado?", 
     "Editable": "Edit\u00e1vel", 
     "Editing comment": "Editando coment\u00e1rios", 
@@ -541,7 +536,6 @@
     "Formats": "Formatos", 
     "Frequently Asked Questions": "Perguntas frequentes", 
     "Full Name": "Nome completo", 
-    "Full Profile": "Perfil completo", 
     "Fullscreen": "Tela cheia", 
     "Gender": "Sexo", 
     "General": "Geral", 
@@ -681,7 +675,6 @@
     "Library User": "Usu\u00e1rio da Biblioteca", 
     "License Display": "Exibi\u00e7\u00e3o de Licen\u00e7a", 
     "License Type": "Tipo de licen\u00e7a", 
-    "Limited Profile": "Perfil limitado", 
     "Link types should be unique.": "Tipos de link devem ser exclusivos.", 
     "Linking": "Vinculando", 
     "Links are generated on demand and expire within 5 minutes due to the sensitive nature of student information.": "Os links s\u00e3o gerados a pedido e expiram em 5 minutos devido \u00e0 natureza delicada das informa\u00e7\u00f5es do aluno.", 
@@ -869,8 +862,6 @@
     "Proctored exams are timed and they record video of each learner taking the exam. The videos are then reviewed to ensure that learners follow all examination rules.": "Exames supervisionados s\u00e3o cronometrados e eles gravam um v\u00eddeo de cada aluno fazendo a prova. Os v\u00eddeos s\u00e3o ent\u00e3o revisados para garantir que os alunos sigam as regras do exame.", 
     "Professional Education": "Educa\u00e7\u00e3o Profissional", 
     "Professional Education Verified Certificate": "Certificado verificado de profissional de educa\u00e7\u00e3o", 
-    "Profile Image": "Imagem do perfil", 
-    "Profile image for {username}": "Imagem do perfil de {username}", 
     "Promote another member to Admin to remove your admin rights": "Promova outro membro a Administrador para remover seus direitos de administrador", 
     "Public": "P\u00fablico", 
     "Publish": "Publicar", 
@@ -1072,7 +1063,6 @@
     "Team member profiles": "Perfis dos Membros da Equipe", 
     "Team name cannot have more than 255 characters.": "O nome da equipe n\u00e3o pode exceder 255 caracteres.", 
     "Teams": "Equipes", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "Conte um pouco sobre voc\u00ea para outros estudantes do edX: onde voc\u00ea mora, quais s\u00e3o seus interesses, porqu\u00ea voc\u00ea est\u00e1 fazendo um curso no edX ou o que voc\u00ea espera aprender.", 
     "Templates": "Modelos", 
     "Text": "Texto", 
     "Text color": "Cor do texto", 
@@ -1347,12 +1337,10 @@
     "You haven't added any assets to this course yet.": "Voc\u00ea n\u00e3o adicionou nenhum ativo a este curso ainda", 
     "You haven't added any content to this course yet.": "Voc\u00ea ainda n\u00e3o adicionou nenhum conte\u00fado a este curso.", 
     "You haven't added any textbooks to this course yet.": "Voc\u00ea ainda n\u00e3o adicionou nenhum livro-texto a este curso.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "Voc\u00ea deve ter mais de 13 anos para compartilhar seu perfil completo. Se voc\u00ea tem mais de 13 anos, tenha certeza que voc\u00ea especificou o ano do seu nascimento na {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "Voc\u00ea deve escrever um endere\u00e7o de e-mail v\u00e1lido para adicionar um novo membro do grupo", 
     "You must sign out and sign back in before your language changes take effect.": "Voc\u00ea deve sair e entrar antes que as mudan\u00e7as de idioma tenham efeito.", 
     "You must specify a name": "Voc\u00ea deve especificar um nome ", 
     "You must specify a name for the cohort": "Voc\u00ea deve especificar um nome para o grupo", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "Voc\u00ea deve especificar seu ano de nascimento antes de compartilhar seu perfil completo. Para especificar seu ano de anivers\u00e1rio, v\u00e1 para {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "Voc\u00ea precisa de um computador com uma c\u00e2mera. Ao abrir o aviso, certifique-se de permitir o acesso a sua c\u00e2mera.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "Voc\u00ea precisa de uma carteira de habilita\u00e7\u00e3o, passaporte ou outra identifica\u00e7\u00e3o emitida pelo governo que possua o seu nome e foto.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "Voc\u00ea precisa de um documento com o seu nome e foto. Uma carteira de motorista, passaporte ou outro documento emitido pelo governo s\u00e3o aceit\u00e1veis.", 
@@ -1459,7 +1447,6 @@
     "with %(section_or_subsection)s": "com %(section_or_subsection)s", 
     "{browse_span_start}Browse teams in other topics{span_end} or {search_span_start}search teams{span_end} in this topic. If you still can't find a team to join, {create_span_start}create a new team in this topic{span_end}.": "{browse_span_start}D\u00ea uma olhada nas equipes de outros t\u00f3picos{span_end} ou {search_span_start}busque equipes{span_end} neste t\u00f3pico. Caso voc\u00ea ainda n\u00e3o tenha encontrado nenhuma, {create_span_start}crie uma nova equipe neste t\u00f3pico{span_end}.", 
     "{email} is already on the {container} team. Recheck the email address if you want to add a new member.": "{email} j\u00e1 est\u00e1 no grupo {container}. Verifique novamente o endere\u00e7o de email se voc\u00ea quiser adicionar um novo membro.", 
-    "{platform_name} learners can see my:": "Estudantes do {platform_name} podem visualizar meu:", 
     "\u2026": "\u2026"
   };
 
diff --git a/cms/static/js/i18n/rtl/djangojs.js b/cms/static/js/i18n/rtl/djangojs.js
index 32c362ff95..70203b24ee 100644
--- a/cms/static/js/i18n/rtl/djangojs.js
+++ b/cms/static/js/i18n/rtl/djangojs.js
@@ -1451,6 +1451,7 @@
     "Thanks for returning to verify your ID in: {courseName}": "\u0641\u0627\u0634\u0631\u0646\u0633 \u0628\u062e\u0642 \u0642\u062b\u0641\u0639\u0642\u0631\u0647\u0631\u0644 \u0641\u062e \u062f\u062b\u0642\u0647\u0628\u063a \u063a\u062e\u0639\u0642 \u0647\u064a \u0647\u0631: {courseName}", 
     "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0641\u0627\u062b \u0639\u0642\u0645 \u063a\u062e\u0639 \u062b\u0631\u0641\u062b\u0642\u062b\u064a \u0633\u062b\u062b\u0648\u0633 \u0641\u062e \u0632\u062b \u0634\u0631 \u062b\u0648\u0634\u0647\u0645 \u0634\u064a\u064a\u0642\u062b\u0633\u0633. \u064a\u062e \u063a\u062e\u0639 \u0635\u0634\u0631\u0641 \u0641\u062e \u0634\u064a\u064a \u0641\u0627\u062b \u0642\u062b\u0636\u0639\u0647\u0642\u062b\u064a \u0648\u0634\u0647\u0645\u0641\u062e: \u062d\u0642\u062b\u0628\u0647\u0637?", 
     "The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "\u0641\u0627\u062b \u0639\u0642\u0645 \u063a\u062e\u0639 \u062b\u0631\u0641\u062b\u0642\u062b\u064a \u0633\u062b\u062b\u0648\u0633 \u0641\u062e \u0632\u062b \u0634\u0631 \u062b\u0637\u0641\u062b\u0642\u0631\u0634\u0645 \u0645\u0647\u0631\u0646. \u064a\u062e \u063a\u062e\u0639 \u0635\u0634\u0631\u0641 \u0641\u062e \u0634\u064a\u064a \u0641\u0627\u062b \u0642\u062b\u0636\u0639\u0647\u0642\u062b\u064a \u0627\u0641\u0641\u062d:// \u062d\u0642\u062b\u0628\u0647\u0637?", 
+    "The certificate available date must be later than the enrollment start date.": "\u0641\u0627\u062b \u0630\u062b\u0642\u0641\u0647\u0628\u0647\u0630\u0634\u0641\u062b \u0634\u062f\u0634\u0647\u0645\u0634\u0632\u0645\u062b \u064a\u0634\u0641\u062b \u0648\u0639\u0633\u0641 \u0632\u062b \u0645\u0634\u0641\u062b\u0642 \u0641\u0627\u0634\u0631 \u0641\u0627\u062b \u062b\u0631\u0642\u062e\u0645\u0645\u0648\u062b\u0631\u0641 \u0633\u0641\u0634\u0642\u0641 \u064a\u0634\u0641\u062b.", 
     "The certificate for this learner has been re-validated and the system is re-running the grade for this learner.": "\u0641\u0627\u062b \u0630\u062b\u0642\u0641\u0647\u0628\u0647\u0630\u0634\u0641\u062b \u0628\u062e\u0642 \u0641\u0627\u0647\u0633 \u0645\u062b\u0634\u0642\u0631\u062b\u0642 \u0627\u0634\u0633 \u0632\u062b\u062b\u0631 \u0642\u062b-\u062f\u0634\u0645\u0647\u064a\u0634\u0641\u062b\u064a \u0634\u0631\u064a \u0641\u0627\u062b \u0633\u063a\u0633\u0641\u062b\u0648 \u0647\u0633 \u0642\u062b-\u0642\u0639\u0631\u0631\u0647\u0631\u0644 \u0641\u0627\u062b \u0644\u0642\u0634\u064a\u062b \u0628\u062e\u0642 \u0641\u0627\u0647\u0633 \u0645\u062b\u0634\u0642\u0631\u062b\u0642.", 
     "The cohort cannot be added": "\u0641\u0627\u062b \u0630\u062e\u0627\u062e\u0642\u0641 \u0630\u0634\u0631\u0631\u062e\u0641 \u0632\u062b \u0634\u064a\u064a\u062b\u064a", 
     "The cohort cannot be saved": "\u0641\u0627\u062b \u0630\u062e\u0627\u062e\u0642\u0641 \u0630\u0634\u0631\u0631\u062e\u0641 \u0632\u062b \u0633\u0634\u062f\u062b\u064a", 
@@ -1586,6 +1587,7 @@
     "This team does not have any members.": "\u0641\u0627\u0647\u0633 \u0641\u062b\u0634\u0648 \u064a\u062e\u062b\u0633 \u0631\u062e\u0641 \u0627\u0634\u062f\u062b \u0634\u0631\u063a \u0648\u062b\u0648\u0632\u062b\u0642\u0633.", 
     "This team is full.": "\u0641\u0627\u0647\u0633 \u0641\u062b\u0634\u0648 \u0647\u0633 \u0628\u0639\u0645\u0645.", 
     "This thread is closed.": "\u0641\u0627\u0647\u0633 \u0641\u0627\u0642\u062b\u0634\u064a \u0647\u0633 \u0630\u0645\u062e\u0633\u062b\u064a.", 
+    "This unit has validation issues.": "\u0641\u0627\u0647\u0633 \u0639\u0631\u0647\u0641 \u0627\u0634\u0633 \u062f\u0634\u0645\u0647\u064a\u0634\u0641\u0647\u062e\u0631 \u0647\u0633\u0633\u0639\u062b\u0633.", 
     "This vote could not be processed. Refresh the page and try again.": "\u0641\u0627\u0647\u0633 \u062f\u062e\u0641\u062b \u0630\u062e\u0639\u0645\u064a \u0631\u062e\u0641 \u0632\u062b \u062d\u0642\u062e\u0630\u062b\u0633\u0633\u062b\u064a. \u0642\u062b\u0628\u0642\u062b\u0633\u0627 \u0641\u0627\u062b \u062d\u0634\u0644\u062b \u0634\u0631\u064a \u0641\u0642\u063a \u0634\u0644\u0634\u0647\u0631.", 
     "This {parentCategory} has no {childCategory}": "\u0641\u0627\u0647\u0633 {parentCategory} \u0627\u0634\u0633 \u0631\u062e {childCategory}", 
     "Thumbnail": "\u0641\u0627\u0639\u0648\u0632\u0631\u0634\u0647\u0645", 
diff --git a/cms/static/js/i18n/ru/djangojs.js b/cms/static/js/i18n/ru/djangojs.js
index 7510f75b44..b5705051ef 100644
--- a/cms/static/js/i18n/ru/djangojs.js
+++ b/cms/static/js/i18n/ru/djangojs.js
@@ -131,15 +131,10 @@
     "A valid email address is required": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "\u0410\u0411\u0412\u0413\u0414\u0415\u0416\u0417\u0418\u041a\u041b\u041c\u041d\u041e\u041f\u0420\u0421\u0422\u0423\u0424\u0425\u0426\u0427\u0428\u0429\u042d\u042e\u042f", 
     "Abbreviation": "\u0410\u0431\u0431\u0440\u0435\u0432\u0438\u0430\u0442\u0443\u0440\u0430", 
-    "About Me": "\u041e\u0431\u043e \u043c\u043d\u0435", 
     "About You": "\u041e \u0432\u0430\u0441", 
-    "About me": "\u041e \u0441\u0435\u0431\u0435", 
-    "Accomplishments": "\u0414\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f", 
-    "Accomplishments Pagination": "\u041f\u043e\u0441\u0442\u0440\u0430\u043d\u0438\u0447\u043d\u043e\u0435 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u0439", 
     "Account Information": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e\u0431 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438", 
     "Account Not Activated": "\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u043d\u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430", 
     "Account Settings": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438", 
-    "Account Settings page.": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438.", 
     "Action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435", 
     "Action required: Enter a valid date.": "\u0422\u0440\u0435\u0431\u0443\u0435\u043c\u043e\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435: \u0432\u0432\u0435\u0441\u0442\u0438 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0443\u044e \u0434\u0430\u0442\u0443", 
     "Actions": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f", 
@@ -151,7 +146,6 @@
     "Add Additional Signatory": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043b\u044f, \u043f\u043e\u0434\u043f\u0438\u0441\u0430\u0432\u0448\u0435\u0433\u043e \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442", 
     "Add Cohort": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443", 
     "Add Component:": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442:", 
-    "Add Country": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0443", 
     "Add New Component": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442", 
     "Add URLs for additional versions": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0438 \u043d\u0430 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438", 
     "Add a Chapter": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u043b\u0430\u0432\u0443", 
@@ -161,7 +155,6 @@
     "Add a learning outcome here": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u044f \u0437\u0434\u0435\u0441\u044c", 
     "Add a response:": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043e\u0442\u0432\u0435\u0442:", 
     "Add another group": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0440\u0443\u0433\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443", 
-    "Add language": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u044f\u0437\u044b\u043a", 
     "Add notes about this learner": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0437\u0430\u043c\u0435\u0442\u043a\u0438 \u043e\u0431 \u044d\u0442\u043e\u043c \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0435", 
     "Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043b\u043e\u0432\u0430\u0440\u044c", 
     "Add to Exception List": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439", 
@@ -307,7 +300,6 @@
     "Change Manually": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0440\u0443\u0447\u043d\u0443\u044e", 
     "Change My Email Address": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0430\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b", 
     "Change image": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435", 
-    "Change the settings for {display_name}": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0434\u043b\u044f {display_name}", 
     "Chapter Asset": "\u0410\u043a\u0442\u0438\u0432 \u0433\u043b\u0430\u0432\u044b", 
     "Chapter Name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0433\u043b\u0430\u0432\u044b", 
     "Chapter information": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0433\u043b\u0430\u0432\u0435", 
@@ -522,7 +514,6 @@
     "Edit Membership": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u043e\u0441\u0442\u0430\u0432", 
     "Edit Team": "\u0412\u043d\u0435\u0441\u0442\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432 \u043a\u043e\u043c\u0430\u043d\u0434\u0443", 
     "Edit Your Name": "\u041e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u043c\u044f", 
-    "Edit the name": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435", 
     "Edit this certificate?": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442?", 
     "Editable": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0443\u0435\u043c\u043e", 
     "Editing comment": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u044f", 
@@ -639,7 +630,6 @@
     "Free text notes": "\u0417\u0430\u043c\u0435\u0442\u043a\u0438", 
     "Frequently Asked Questions": "\u0427\u0430\u0441\u0442\u043e \u0437\u0430\u0434\u0430\u0432\u0430\u0435\u043c\u044b\u0435 \u0432\u043e\u043f\u0440\u043e\u0441\u044b", 
     "Full Name": "\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f", 
-    "Full Profile": "\u041f\u043e\u043b\u043d\u044b\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c", 
     "Fullscreen": "\u0412\u043e \u0432\u0435\u0441\u044c \u044d\u043a\u0440\u0430\u043d", 
     "Fully Supported": "\u041f\u043e\u043b\u043d\u043e\u0441\u0442\u044c\u044e \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f", 
     "Gender": "\u041f\u043e\u043b", 
@@ -799,7 +789,6 @@
     "License Display": "\u041f\u043e\u043a\u0430\u0437 \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438", 
     "License Type": "\u0422\u0438\u043f \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438", 
     "Limit Access": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f", 
-    "Limited Profile": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u044b\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c", 
     "Link Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438", 
     "Link Your Account": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0441\u0432\u043e\u044e \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c", 
     "Link types should be unique.": "\u0421\u0441\u044b\u043b\u043a\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0439.", 
@@ -1029,9 +1018,6 @@
     "Professional Certificate for {courseName}": "\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 \u043e \u043f\u043e\u0432\u044b\u0448\u0435\u043d\u0438\u0438 \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 {courseName}", 
     "Professional Education": "\u041f\u0440\u043e\u0444\u0435\u0441\u0441\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0435 \u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435", 
     "Professional Education Verified Certificate": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 \u043e \u043f\u043e\u0432\u044b\u0448\u0435\u043d\u0438\u0438 \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438", 
-    "Profile": "\u041f\u0440\u043e\u0444\u0438\u043b\u044c", 
-    "Profile Image": "\u0424\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u044f", 
-    "Profile image for {username}": "\u0424\u043e\u0442\u043e {username}", 
     "Promote another member to Admin to remove your admin rights": "\u041f\u0435\u0440\u0435\u0434\u0430\u0439\u0442\u0435 \u043f\u0440\u0430\u0432\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u0434\u0440\u0443\u0433\u043e\u043c\u0443 \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0443, \u0447\u0442\u043e\u0431\u044b \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0435 \u043f\u0440\u0430\u0432\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430", 
     "Provisional": "\u0427\u0430\u0441\u0442\u0438\u0447\u043d\u043e \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f", 
     "Provisionally Supported": "\u0427\u0430\u0441\u0442\u0438\u0447\u043d\u043e \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f", 
@@ -1271,7 +1257,6 @@
     "Team name cannot have more than 255 characters.": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u0431\u043e\u043b\u0435\u0435 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432.", 
     "Teams": "\u041a\u043e\u043c\u0430\u043d\u0434\u044b", 
     "Teams Pagination": "\u041a\u043e\u043c\u0430\u043d\u0434\u043d\u0430\u044f \u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u0420\u0430\u0441\u0441\u043a\u0430\u0436\u0438\u0442\u0435 \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u044f\u043c \u043d\u0435\u043c\u043d\u043e\u0433\u043e \u043e \u0441\u0435\u0431\u0435: \u0433\u0434\u0435 \u0432\u044b \u0436\u0438\u0432\u0451\u0442\u0435, \u0447\u0435\u043c \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u0443\u0435\u0442\u0435\u0441\u044c, \u0434\u043b\u044f \u0447\u0435\u0433\u043e \u0432\u044b \u043f\u0440\u043e\u0445\u043e\u0434\u0438\u0442\u0435 \u043a\u0443\u0440\u0441\u044b \u0438 \u0447\u0435\u043c\u0443 \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u043d\u0430\u0443\u0447\u0438\u0442\u044c\u0441\u044f.", 
     "Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b", 
     "Text": "\u0422\u0435\u043a\u0441\u0442", 
     "Text color": "\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430", 
@@ -1498,12 +1483,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "\u041f\u043e\u043b\u044c\u0437\u0443\u044f\u0441\u044c \u0432\u0435\u0431-\u043a\u0430\u043c\u0435\u0440\u043e\u0439, \u0441\u0434\u0435\u043b\u0430\u0439\u0442\u0435 \u0441\u043d\u0438\u043c\u043e\u043a \u0441\u0432\u043e\u0435\u0433\u043e \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u044f \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u0438.  \u041c\u044b \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u0438\u043c \u044d\u0442\u043e\u0442 \u0441\u043d\u0438\u043c\u043e\u043a \u0441\u043e \u0441\u043d\u0438\u043c\u043a\u043e\u043c \u0432\u0430\u0448\u0435\u0433\u043e \u043b\u0438\u0446\u0430 \u0438 \u0438\u043c\u0435\u043d\u0435\u043c \u0432 \u0432\u0430\u0448\u0435\u0439 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438.", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "\u041f\u043e\u043b\u044c\u0437\u0443\u044f\u0441\u044c \u0432\u0435\u0431-\u043a\u0430\u043c\u0435\u0440\u043e\u0439, \u0441\u0434\u0435\u043b\u0430\u0439\u0442\u0435 \u0441\u043d\u0438\u043c\u043e\u043a \u0441\u0432\u043e\u0435\u0433\u043e \u043b\u0438\u0446\u0430.  \u041c\u044b \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u0438\u043c \u044d\u0442\u043e\u0442 \u0441\u043d\u0438\u043c\u043e\u043a \u0441 \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439 \u0432 \u0432\u0430\u0448\u0435\u043c \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u0438 \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u0438.", 
     "Used": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u043e", 
-    "Used in {count} unit": [
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0435", 
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0430\u0445", 
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0430\u0445", 
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0430\u0445"
-    ], 
     "User": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c", 
     "User Email": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f", 
     "Username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f", 
@@ -1617,12 +1596,10 @@
     "You haven't added any assets to this course yet.": "\u0412\u044b \u043d\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043b\u0438 \u043d\u0438\u043a\u0430\u043a\u0438\u0445 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u043e\u0432 \u043a \u044d\u0442\u043e\u043c\u0443 \u043a\u0443\u0440\u0441\u0443.", 
     "You haven't added any content to this course yet.": "\u0412\u044b \u0435\u0449\u0451 \u043d\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043b\u0438 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b \u043a\u0443\u0440\u0441\u0430.", 
     "You haven't added any textbooks to this course yet.": "\u0412\u044b \u0435\u0449\u0451 \u043d\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043b\u0438 \u043d\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u0443\u0447\u0435\u0431\u043d\u0438\u043a\u0430 \u043a \u044d\u0442\u043e\u043c\u0443 \u043a\u0443\u0440\u0441\u0443.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\u0414\u043b\u044f \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u0432\u0430\u043c \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435 13 \u043b\u0435\u0442. \u0415\u0441\u043b\u0438 \u0432\u044b \u0441\u0442\u0430\u0440\u0448\u0435 13 \u043b\u0435\u0442, \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044c\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0432\u044b \u0443\u043a\u0430\u0437\u0430\u043b\u0438 \u0433\u043e\u0434 \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f \u043d\u0430 {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "\u0427\u0442\u043e\u0431\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u043e\u0433\u043e \u0447\u043b\u0435\u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u044b, \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0432\u0432\u0435\u0441\u0442\u0438 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441", 
     "You must sign out and sign back in before your language changes take effect.": "\u0427\u0442\u043e\u0431\u044b \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u044f\u0437\u044b\u043a\u0430 \u0432\u0441\u0442\u0443\u043f\u0438\u043b\u043e \u0432 \u0441\u0438\u043b\u0443, \u0432\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u0439\u0442\u0438 \u0438 \u0441\u043d\u043e\u0432\u0430 \u0432\u043e\u0439\u0442\u0438 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.", 
     "You must specify a name": "\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043c\u044f", 
     "You must specify a name for the cohort": "\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u043d\u0430\u0437\u0432\u0430\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u0414\u043b\u044f \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u0432\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0433\u043e\u0434 \u0432\u0430\u0448\u0435\u0433\u043e \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f \u043d\u0430 {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u0412\u0430\u043c \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440 \u0441 \u0432\u0435\u0431-\u043a\u0430\u043c\u0435\u0440\u043e\u0439. \u041a\u043e\u0433\u0434\u0430 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0438\u0442 \u0441\u0434\u0435\u043b\u0430\u0442\u044c \u0444\u043e\u0442\u043e, \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0432\u044b \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u043b\u0438 \u0435\u043c\u0443 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043a\u0430\u043c\u0435\u0440\u0435.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u0412\u0430\u043c \u0442\u0440\u0435\u0431\u0443\u044e\u0442\u0441\u044f \u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u043f\u0440\u0430\u0432\u0430, \u043f\u0430\u0441\u043f\u043e\u0440\u0442 \u0438\u043b\u0438 \u0438\u043d\u043e\u0439 \u0433\u043e\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0435\u0441\u0442\u044c \u0432\u0430\u0448\u0435 \u0438\u043c\u044f \u0438 \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u044f.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u0412\u0430\u043c \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u0435 \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u0438 \u0441 \u0432\u0430\u0448\u0438\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u0438 \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439.  \u041f\u043e\u0434\u043e\u0439\u0434\u0451\u0442 \u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435 \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u0435, \u043f\u0430\u0441\u043f\u043e\u0440\u0442 \u0438\u043b\u0438 \u0434\u0440\u0443\u0433\u043e\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 \u0433\u043e\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e \u043e\u0431\u0440\u0430\u0437\u0446\u0430.", 
@@ -1766,7 +1743,6 @@
       "{numVotes} \u0433\u043e\u043b\u043e\u0441\u043e\u0432"
     ], 
     "{organization}\\'s logo": "\u043b\u043e\u0433\u043e\u0442\u0438\u043f {organization}", 
-    "{platform_name} learners can see my:": "\u0421\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0438 {platform_name} \u0432\u0438\u0434\u044f\u0442 \u043c\u043e\u0439:", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435:{screen_reader_end} \u043d\u0435\u0442 \u0433\u0440\u0443\u043f\u043f \u043f\u043e \u0438\u0437\u0443\u0447\u0430\u0435\u043c\u043e\u043c\u0443 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u0443.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435:{screen_reader_end} \u0440\u0430\u043d\u0435\u0435 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u0430\u044f \u0433\u0440\u0443\u043f\u043f\u0430 \u043f\u043e \u0438\u0437\u0443\u0447\u0430\u0435\u043c\u043e\u043c\u0443 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u0443 \u0443\u0434\u0430\u043b\u0435\u043d\u0430. \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443.", 
     "{totalItems} total": "{totalItems} \u0438\u0442\u043e\u0433", 
diff --git a/cms/static/js/i18n/zh-cn/djangojs.js b/cms/static/js/i18n/zh-cn/djangojs.js
index 587528e2b3..5eaa9b66ff 100644
--- a/cms/static/js/i18n/zh-cn/djangojs.js
+++ b/cms/static/js/i18n/zh-cn/djangojs.js
@@ -83,26 +83,19 @@
     "A name that identifies your team (maximum 255 characters).": "\u56e2\u961f\u540d\u79f0 (\u4e0d\u957f\u4e8e255\u4e2a\u5b57\u7b26)", 
     "A short description of the team to help other learners understand the goals or direction of the team (maximum 300 characters).": "\u7b80\u77ed\u7684\u56e2\u961f\u63cf\u8ff0\uff0c\u4ee5\u5e2e\u52a9\u5176\u4ed6\u5b66\u4e60\u8005\u4e86\u89e3\u6b64\u56e2\u961f\u7684\u76ee\u6807\u4e0e\u65b9\u5411 (\u6700\u5927\u4e3a300\u4e2a\u5b57\u7b26\u957f\u5ea6)", 
     "A valid email address is required": "\u9700\u8981\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740", 
-    "About Me": "\u4e2a\u4eba\u8d44\u6599", 
     "About You": "\u5173\u4e8e\u60a8", 
-    "About me": "\u4e2a\u4eba\u7b80\u4ecb", 
-    "Accomplishments": "\u6210\u7ee9", 
-    "Accomplishments Pagination": "\u6210\u7ee9\u5206\u9875", 
     "Account Information": "\u5e10\u6237\u4fe1\u606f", 
     "Account Not Activated": "\u8d26\u6237\u672a\u6fc0\u6d3b", 
     "Account Settings": "\u8d26\u6237\u8bbe\u7f6e", 
-    "Account Settings page.": "\u8d26\u6237\u8bbe\u7f6e\u9875\u9762\u3002", 
     "Action": "\u64cd\u4f5c", 
     "Actions": "\u64cd\u4f5c", 
     "Activate Your Account": "\u6fc0\u6d3b\u4f60\u7684\u8d26\u6237", 
     "Activating a link in this group will skip to the corresponding point in the video.": "\u6fc0\u6d3b\u672c\u7ec4\u4e2d\u7684\u94fe\u63a5\u5c06\u8df3\u8f6c\u81f3\u89c6\u9891\u4e2d\u76f8\u5e94\u7684\u5730\u65b9\u3002", 
     "Add Cohort": "\u6dfb\u52a0\u7fa4\u7ec4", 
-    "Add Country": "\u6dfb\u52a0\u56fd\u5bb6", 
     "Add a New Cohort": "\u6dfb\u52a0\u65b0\u7fa4\u7ec4", 
     "Add a Response": "\u6dfb\u52a0\u56de\u590d", 
     "Add a comment": "\u6dfb\u52a0\u8bc4\u8bba", 
     "Add a response:": "\u6dfb\u52a0\u4e00\u6761\u56de\u590d\uff1a", 
-    "Add language": "\u6dfb\u52a0\u8bed\u8a00", 
     "Add notes about this learner": "\u6dfb\u52a0\u5173\u4e8e\u6b64\u5b66\u5458\u7684\u5907\u6ce8", 
     "Add to Dictionary": "\u52a0\u5165\u5230\u5b57\u5178", 
     "Add to Exception List": "\u6dfb\u52a0\u5230\u7279\u6b8a\u5904\u7406\u5217\u8868", 
@@ -469,7 +462,6 @@
     "Formats": "\u683c\u5f0f", 
     "Frequently Asked Questions": "\u5e38\u89c1\u95ee\u9898", 
     "Full Name": "\u5168\u540d", 
-    "Full Profile": "\u5168\u90e8\u8d44\u6599", 
     "Fullscreen": "\u5168\u5c4f", 
     "Gender": "\u6027\u522b", 
     "General": "\u4e00\u822c", 
@@ -592,7 +584,6 @@
     "Legal name": "\u6cd5\u5b9a\u59d3\u540d", 
     "Less": "\u6536\u8d77", 
     "Library User": "\u77e5\u8bc6\u5e93\u7528\u6237", 
-    "Limited Profile": "\u90e8\u5206\u8d44\u6599", 
     "Link Description": "\u94fe\u63a5\u7684\u63cf\u8ff0", 
     "Link Your Account": "\u5173\u8054\u60a8\u7684\u8d26\u6237", 
     "Link types should be unique.": "\u94fe\u63a5\u7c7b\u578b\u5e94\u5f53\u552f\u4e00\u3002", 
@@ -760,9 +751,6 @@
     "Professional Certificate for {courseName}": "{courseName} \u7684\u4e13\u4e1a\u8bc1\u4e66", 
     "Professional Education": "\u4e13\u4e1a\u6559\u80b2", 
     "Professional Education Verified Certificate": "\u4e13\u4e1a\u6559\u80b2\u8ba4\u8bc1\u8bc1\u4e66", 
-    "Profile": "\u7528\u6237\u8d44\u6599", 
-    "Profile Image": "\u8d44\u6599\u7167\u7247", 
-    "Profile image for {username}": "{username} \u7684\u5934\u50cf", 
     "Public": "\u516c\u5f00", 
     "Publish": "\u53d1\u5e03", 
     "Publishing": "\u6b63\u5728\u53d1\u5e03", 
@@ -948,7 +936,6 @@
     "Team name cannot have more than 255 characters.": "\u56e2\u961f\u540d\u79f0\u4e0d\u80fd\u8d85\u8fc7 255 \u4e2a\u5b57\u7b26", 
     "Teams": "\u56e2\u961f", 
     "Teams Pagination": "\u56e2\u961f\u5206\u9875", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u5411\u5176\u4ed6\u7528\u6237\u7b80\u5355\u4ecb\u7ecd\u4e0b\u4f60\u81ea\u5df1\uff1a\u5982\u5c45\u4f4f\u5730\u3001\u5174\u8da3\u7231\u597d\u3001\u4e3a\u4ec0\u4e48\u9009\u62e9\u8fd9\u4e9b\u8bfe\u7a0b\uff0c\u53ca\u4f60\u5e0c\u671b\u5b66\u4e60\u54ea\u65b9\u9762\u7684\u77e5\u8bc6", 
     "Templates": "\u6a21\u677f", 
     "Text": "\u6587\u672c", 
     "Text color": "\u6587\u672c\u989c\u8272", 
@@ -1190,12 +1177,10 @@
     "You have not created any group configurations yet.": "\u60a8\u8fd8\u6ca1\u6709\u521b\u5efa\u4efb\u4f55\u7ec4\u914d\u7f6e\u3002", 
     "You have unsaved changes are you sure you want to navigate away?": "\u6709\u672a\u4fdd\u5b58\u7684\u66f4\u6539\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\u5417\uff1f", 
     "You have unsaved changes. Do you really want to leave this page?": "\u60a8\u5c1a\u6709\u672a\u4fdd\u5b58\u7684\u4fee\u6539\uff0c\u786e\u5b9a\u8981\u79bb\u6b64\u9875\u9762\u5417\uff1f", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "13\u5c81\u4ee5\u4e0a\u7684\u7528\u6237\u624d\u80fd\u5206\u4eab\u5b8c\u6574\u8d44\u6599\u3002\u5982\u679c\u60a8\u572813\u5c81\u4ee5\u4e0a\uff0c\u8bf7\u786e\u8ba4\u5df2\u5728 {account_settings_page_link} \u9875\u9762\u4e2d\u586b\u5199\u4e86\u51fa\u751f\u5e74\u4efd\u3002", 
     "You must enter a valid email address in order to add a new team member": "\u60a8\u5fc5\u987b\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u4ee5\u4fbf\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u56e2\u961f\u6210\u5458", 
     "You must sign out and sign back in before your language changes take effect.": "\u8bed\u8a00\u8bbe\u7f6e\u5c06\u5728\u60a8\u91cd\u65b0\u767b\u5f55\u540e\u751f\u6548", 
     "You must specify a name": "\u60a8\u5fc5\u987b\u6307\u5b9a\u4e00\u4e2a\u540d\u79f0", 
     "You must specify a name for the cohort": "\u60a8\u5fc5\u987b\u4e3a\u8be5\u7fa4\u7ec4\u547d\u540d\u3002", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u60a8\u5fc5\u987b\u586b\u5199\u51fa\u751f\u5e74\u4efd\u624d\u80fd\u5206\u4eab\u5b8c\u6574\u8d44\u6599\u3002\u70b9\u51fb {account_settings_page_link} \u586b\u5199", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u60a8\u9700\u8981\u4e00\u4e2a\u5177\u6709\u6444\u50cf\u5934\u7684\u7535\u8111\u3002\u5f53\u60a8\u6536\u5230\u6d4f\u89c8\u5668\u5f39\u7a97\u65f6\uff0c\u786e\u4fdd\u5b83\u6709\u6743\u9650\u4f7f\u7528\u6444\u50cf\u5934\u3002", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u60a8\u9700\u8981\u9a7e\u7167\u3001\u62a4\u7167\u6216\u8005\u5176\u4ed6\u7531\u653f\u5e9c\u7b7e\u53d1\u7684\u5e26\u6709\u60a8\u59d3\u540d\u548c\u7167\u7247\u7684\u8eab\u4efd\u8bc1\u4ef6\u3002", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u60a8\u9700\u8981\u4e00\u4efd\u5e26\u6709\u60a8\u59d3\u540d\u548c\u7167\u7247\u7684\u8eab\u4efd\u8bc1\u4ef6\uff0c\u6211\u4eec\u53ef\u4ee5\u63a5\u53d7\u9a7e\u7167\u3001\u62a4\u7167\u4ee5\u53ca\u5176\u4ed6\u7531\u653f\u5e9c\u7b7e\u53d1\u7684\u8eab\u4efd\u8bc1\u4ef6\u3002", 
@@ -1291,7 +1276,6 @@
     "{browse_span_start}Browse teams in other topics{span_end} or {search_span_start}search teams{span_end} in this topic. If you still can't find a team to join, {create_span_start}create a new team in this topic{span_end}.": "{browse_span_start} \u7528\u5176\u4ed6\u6807\u9898\u6d4f\u89c8\u56e2\u961f {span_end} \u6216 {search_span_start} \u641c\u7d22\u56e2\u961f{span_end} \u65bc\u6b64\u6807\u9898\u3002 \u5982\u679c\u4f60\u4ecd\u7136\u65e0\u6cd5\u627e\u5230\u56e2\u961f\u6765\u52a0\u5165\uff0c {create_span_start} \u5728\u6b64\u6807\u9898\u65b0\u521b\u4e00\u4e2a\u56e2\u961f{span_end}\u3002", 
     "{email} is already on the {container} team. Recheck the email address if you want to add a new member.": "{email}\u5df2\u5728{container}\u56e2\u961f\u4e2d\u3002\u5982\u679c\u60a8\u60f3\u6dfb\u52a0\u65b0\u6210\u5458\uff0c\u8bf7\u518d\u6b21\u68c0\u67e5\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002", 
     "{organization}\\'s logo": "{organization}\\'s \u7684\u6807\u8bc6", 
-    "{platform_name} learners can see my:": "\u5bf9{platform_name}\u7528\u6237\u53ef\u89c1\uff1a", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u8b66\u544a\uff1a{screen_reader_end}\u4e0d\u5b58\u5728\u5185\u5bb9\u7ec4\u3002", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u8b66\u544a\uff1a{screen_reader_end}\u4e4b\u524d\u9009\u62e9\u7684\u5185\u5bb9\u7ec4\u5df2\u88ab\u5220\u9664\u3002\u8bf7\u9009\u62e9\u53e6\u4e00\u4e2a\u5185\u5bb9\u7ec4\u3002", 
     "\u2026": "\u2026"
diff --git a/cms/static/js/index.js b/cms/static/js/index.js
index ae88a24dcc..70def59cad 100644
--- a/cms/static/js/index.js
+++ b/cms/static/js/index.js
@@ -161,6 +161,7 @@ define(['domReady', 'jquery', 'underscore', 'js/utils/cancel_on_escape', 'js/vie
             return function(e) {
                 e.preventDefault();
                 $('.courses-tab').toggleClass('active', tab === 'courses');
+                $('.archived-courses-tab').toggleClass('active', tab === 'archived-courses');
                 $('.libraries-tab').toggleClass('active', tab === 'libraries');
 
             // Also toggle this course-related notice shown below the course tab, if it is present:
@@ -179,6 +180,7 @@ define(['domReady', 'jquery', 'underscore', 'js/utils/cancel_on_escape', 'js/vie
             $('.action-reload').bind('click', ViewUtils.reload);
 
             $('#course-index-tabs .courses-tab').bind('click', showTab('courses'));
+            $('#course-index-tabs .archived-courses-tab').bind('click', showTab('archived-courses'));
             $('#course-index-tabs .libraries-tab').bind('click', showTab('libraries'));
         };
 
diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js
index 683200d7d6..6e1cb6e296 100644
--- a/cms/static/js/models/settings/course_details.js
+++ b/cms/static/js/models/settings/course_details.js
@@ -8,6 +8,7 @@ define(['backbone', 'underscore', 'gettext', 'js/models/validation_helpers', 'js
                 language: '',
                 start_date: null,	// maps to 'start'
                 end_date: null,		// maps to 'end'
+                certificate_available_date: null,
                 enrollment_start: null,
                 enrollment_end: null,
                 syllabus: null,
@@ -38,7 +39,7 @@ define(['backbone', 'underscore', 'gettext', 'js/models/validation_helpers', 'js
         // A bit funny in that the video key validation is asynchronous; so, it won't stop the validation.
                 var errors = {};
                 newattrs = DateUtils.convertDateStringsToObjects(
-            newattrs, ['start_date', 'end_date', 'enrollment_start', 'enrollment_end']
+            newattrs, ['start_date', 'end_date', 'certificate_available_date', 'enrollment_start', 'enrollment_end']
         );
 
                 if (newattrs.start_date === null) {
diff --git a/cms/static/js/spec/views/settings/main_spec.js b/cms/static/js/spec/views/settings/main_spec.js
index 4fbebcc84d..e33e845465 100644
--- a/cms/static/js/spec/views/settings/main_spec.js
+++ b/cms/static/js/spec/views/settings/main_spec.js
@@ -21,6 +21,7 @@ define([
                 end_date: '2014-11-05T20:00:00Z',
                 enrollment_start: '2014-10-00T00:00:00Z',
                 enrollment_end: '2014-11-05T00:00:00Z',
+                certificate_available_date: '2014-11-05T20:00:00Z',
                 org: '',
                 course_id: '',
                 run: '',
diff --git a/cms/static/js/views/settings/main.js b/cms/static/js/views/settings/main.js
index 8125c0a936..0b9204a8e1 100644
--- a/cms/static/js/views/settings/main.js
+++ b/cms/static/js/views/settings/main.js
@@ -79,6 +79,7 @@ define(['js/views/validation', 'codemirror', 'underscore', 'jquery', 'jquery.ui'
 
                    DateUtils.setupDatePicker('start_date', this);
                    DateUtils.setupDatePicker('end_date', this);
+                   DateUtils.setupDatePicker('certificate_available_date', this);
                    DateUtils.setupDatePicker('enrollment_start', this);
                    DateUtils.setupDatePicker('enrollment_end', this);
 
@@ -154,29 +155,30 @@ define(['js/views/validation', 'codemirror', 'underscore', 'jquery', 'jquery.ui'
                    return this;
                },
                fieldToSelectorMap: {
-                   'language': 'course-language',
-                   'start_date': 'course-start',
-                   'end_date': 'course-end',
-                   'enrollment_start': 'enrollment-start',
-                   'enrollment_end': 'enrollment-end',
-                   'overview': 'course-overview',
-                   'title': 'course-title',
-                   'subtitle': 'course-subtitle',
-                   'duration': 'course-duration',
-                   'description': 'course-description',
-                   'short_description': 'course-short-description',
-                   'intro_video': 'course-introduction-video',
-                   'effort': 'course-effort',
-                   'course_image_asset_path': 'course-image-url',
-                   'banner_image_asset_path': 'banner-image-url',
-                   'video_thumbnail_image_asset_path': 'video-thumbnail-image-url',
-                   'pre_requisite_courses': 'pre-requisite-course',
-                   'entrance_exam_enabled': 'entrance-exam-enabled',
-                   'entrance_exam_minimum_score_pct': 'entrance-exam-minimum-score-pct',
-                   'course_settings_learning_fields': 'course-settings-learning-fields',
-                   'add_course_learning_info': 'add-course-learning-info',
-                   'add_course_instructor_info': 'add-course-instructor-info',
-                   'course_learning_info': 'course-learning-info'
+                   language: 'course-language',
+                   start_date: 'course-start',
+                   end_date: 'course-end',
+                   enrollment_start: 'enrollment-start',
+                   enrollment_end: 'enrollment-end',
+                   certificate_available_date: 'certificate-available',
+                   overview: 'course-overview',
+                   title: 'course-title',
+                   subtitle: 'course-subtitle',
+                   duration: 'course-duration',
+                   description: 'course-description',
+                   short_description: 'course-short-description',
+                   intro_video: 'course-introduction-video',
+                   effort: 'course-effort',
+                   course_image_asset_path: 'course-image-url',
+                   banner_image_asset_path: 'banner-image-url',
+                   video_thumbnail_image_asset_path: 'video-thumbnail-image-url',
+                   pre_requisite_courses: 'pre-requisite-course',
+                   entrance_exam_enabled: 'entrance-exam-enabled',
+                   entrance_exam_minimum_score_pct: 'entrance-exam-minimum-score-pct',
+                   course_settings_learning_fields: 'course-settings-learning-fields',
+                   add_course_learning_info: 'add-course-learning-info',
+                   add_course_instructor_info: 'add-course-instructor-info',
+                   course_learning_info: 'course-learning-info'
                },
 
                addLearningFields: function() {
diff --git a/cms/static/sass/views/_dashboard.scss b/cms/static/sass/views/_dashboard.scss
index c5c9372fe1..af144c0d75 100644
--- a/cms/static/sass/views/_dashboard.scss
+++ b/cms/static/sass/views/_dashboard.scss
@@ -318,7 +318,7 @@
   }
 
   // ELEM: course listings
-  .courses-tab, .libraries-tab {
+  .courses-tab, .archived-courses-tab, .libraries-tab {
     display: none;
 
     &.active {
@@ -326,7 +326,7 @@
     }
   }
 
-  .courses, .libraries {
+  .courses, .libraries, .archived-courses {
     .title {
       @extend %t-title6;
       margin-bottom: $baseline;
@@ -342,7 +342,7 @@
       padding-bottom: ($baseline/2);
       color: $gray-l2;
     }
-	}
+  }
 
   .list-courses {
     border-radius: 3px;
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 9a226aced3..e19078b656 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -308,10 +308,15 @@ from openedx.core.djangolib.markup import HTML, Text
       </div>
       %endif
 
-      % if libraries_enabled:
+      % if libraries_enabled or archived_courses:
       <ul id="course-index-tabs">
         <li class="courses-tab active"><a>${_("Courses")}</a></li>
+        % if archived_courses:
+        <li class="archived-courses-tab"><a>${_("Archived Courses")}</a></li>
+        % endif
+        % if libraries_enabled:
         <li class="libraries-tab"><a>${_("Libraries")}</a></li>
+        % endif
       </ul>
       % endif
 
@@ -467,6 +472,44 @@ from openedx.core.djangolib.markup import HTML, Text
       </div>
       % endif
 
+      %if archived_courses:
+      <div class="archived-courses archived-courses-tab">
+        <ul class="list-courses">
+          %for course_info in sorted(archived_courses, key=lambda s: s['display_name'].lower() if s['display_name'] is not None else ''):
+          <li class="course-item" data-course-key="${course_info['course_key']}">
+            <a class="course-link" href="${course_info['url']}">
+              <h3 class="course-title">${course_info['display_name']}</h3>
+
+              <div class="course-metadata">
+                <span class="course-org metadata-item">
+                  <span class="label">${_("Organization:")}</span> <span class="value">${course_info['org']}</span>
+                </span>
+                <span class="course-num metadata-item">
+                  <span class="label">${_("Course Number:")}</span>
+                  <span class="value">${course_info['number']}</span>
+                </span>
+                <span class="course-run metadata-item">
+                  <span class="label">${_("Course Run:")}</span> <span class="value">${course_info['run']}</span>
+                </span>
+              </div>
+            </a>
+
+            <ul  class="item-actions course-actions">
+              % if allow_course_reruns and rerun_creator_status and course_creator_status=='granted':
+              <li class="action action-rerun">
+                <a href="${course_info['rerun_link']}" class="button rerun-button">${_("Re-run Course")}</a>
+              </li>
+              % endif
+              <li class="action action-view">
+                <a href="${course_info['lms_link']}" rel="external" class="button view-button">${_("View Live")}</a>
+              </li>
+            </ul>
+          </li>
+          %endfor
+        </ul>
+      </div>
+      %endif
+
       %if len(libraries) > 0:
       <div class="libraries libraries-tab">
         <ul class="list-courses">
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 2a5c51b887..420b6975f8 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -9,6 +9,7 @@
   import urllib
   from django.utils.translation import ugettext as _
   from contentstore import utils
+  from openedx.core.djangoapps.certificates.config import waffle
   from openedx.core.djangolib.js_utils import (
       dump_js_escaped_json, js_escaped_string
   )
@@ -213,6 +214,18 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url | n, js_escaped_string}'
             </li>
           </ol>
 
+          % if waffle.waffle().is_enabled(waffle.INSTRUCTOR_PACED_ONLY):
+          <ol class="list-input">
+            <li class="field-group field-group-certificate-available" id="certificate-available">
+              <div class="field date" id="field-certificate-available-date">
+                <label for="certificate-available-date">${_("Certificates Available Date")}</label>
+                <input type="text" class="certificate-available-date date start datepicker" id="certificate-available-date" placeholder="MM/DD/YYYY" autocomplete="off" />
+                <span class="tip tip-stacked">${_("By default, 48 hours after course end date")}</span>
+              </div>
+            </li>
+          </ol>
+          % endif
+
           <ol class="list-input">
             <li class="field-group field-group-enrollment-start" id="enrollment-start">
               <div class="field date" id="field-enrollment-start-date">
diff --git a/cms/urls.py b/cms/urls.py
index 03184d8f21..b804a13620 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -1,17 +1,19 @@
 from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
-# There is a course creators admin table.
+from django.contrib.admin import autodiscover as django_autodiscover
 from ratelimitbackend import admin
 
 from cms.djangoapps.contentstore.views.organization import OrganizationListView
 
-admin.autodiscover()
+
+django_autodiscover()
 
 # Pattern to match a course key or a library key
 COURSELIKE_KEY_PATTERN = r'(?P<course_key_string>({}|{}))'.format(
     r'[^/]+/[^/]+/[^/]+', r'[^/:]+:[^/+]+\+[^/+]+(\+[^/]+)?'
 )
+
 # Pattern to match a library key only
 LIBRARY_KEY_PATTERN = r'(?P<library_key_string>library-v1:[^/+]+\+[^/+]+)'
 
diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py
index 55c62c177e..ab39532e5c 100644
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -12,6 +12,7 @@ from django.db import models
 from django.db.models import Q
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import force_text
 
 from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
 from request_cache.middleware import RequestCache, ns_request_cached
@@ -133,6 +134,8 @@ class CourseMode(models.Model):
     )
     DEFAULT_MODE_SLUG = settings.COURSE_MODE_DEFAULTS['slug']
 
+    ALL_MODES = [AUDIT, CREDIT_MODE, HONOR, NO_ID_PROFESSIONAL_MODE, PROFESSIONAL, VERIFIED, ]
+
     # Modes utilized for audit/free enrollments
     AUDIT_MODES = [AUDIT, HONOR]
 
@@ -488,6 +491,16 @@ class CourseMode(models.Model):
         """
         return slug in [cls.PROFESSIONAL, cls.NO_ID_PROFESSIONAL_MODE]
 
+    @classmethod
+    def is_mode_upgradeable(cls, mode_slug):
+        """
+        Returns True if the given mode can be upgraded to another.
+
+        Note: Although, in practice, learners "upgrade" from verified to credit,
+        that particular upgrade path is excluded by this method.
+        """
+        return mode_slug in cls.AUDIT_MODES
+
     @classmethod
     def is_verified_mode(cls, course_mode_tuple):
         """Check whether the given modes is_verified or not.
@@ -693,6 +706,59 @@ def invalidate_course_mode_cache(sender, **kwargs):   # pylint: disable=unused-a
     RequestCache.clear_request_cache(name=CourseMode.CACHE_NAMESPACE)
 
 
+def get_cosmetic_verified_display_price(course):
+    """
+    Returns the minimum verified cert course price as a string preceded by correct currency, or 'Free'.
+    """
+    return get_course_prices(course, verified_only=True)[1]
+
+
+def get_cosmetic_display_price(course):
+    """
+    Returns the course price as a string preceded by correct currency, or 'Free'.
+    """
+    return get_course_prices(course)[1]
+
+
+def get_course_prices(course, verified_only=False):
+    """
+    Return registration_price and cosmetic_display_prices.
+    registration_price is the minimum price for the course across all course modes.
+    cosmetic_display_prices is the course price as a string preceded by correct currency, or 'Free'.
+    """
+    # Find the
+    if verified_only:
+        registration_price = CourseMode.min_course_price_for_verified_for_currency(
+            course.id,
+            settings.PAID_COURSE_REGISTRATION_CURRENCY[0]
+        )
+    else:
+        registration_price = CourseMode.min_course_price_for_currency(
+            course.id,
+            settings.PAID_COURSE_REGISTRATION_CURRENCY[0]
+        )
+
+    currency_symbol = settings.PAID_COURSE_REGISTRATION_CURRENCY[1]
+
+    if registration_price > 0:
+        price = registration_price
+    # Handle course overview objects which have no cosmetic_display_price
+    elif hasattr(course, 'cosmetic_display_price'):
+        price = course.cosmetic_display_price
+    else:
+        price = None
+
+    if price:
+        # Translators: This will look like '$50', where {currency_symbol} is a symbol such as '$' and {price} is a
+        # numerical amount in that currency. Adjust this display as needed for your language.
+        cosmetic_display_price = _("{currency_symbol}{price}").format(currency_symbol=currency_symbol, price=price)
+    else:
+        # Translators: This refers to the cost of the course. In this case, the course costs nothing so it is free.
+        cosmetic_display_price = _('Free')
+
+    return registration_price, force_text(cosmetic_display_price)
+
+
 class CourseModesArchive(models.Model):
     """
     Store the past values of course_mode that a course had in the past. We decided on having
diff --git a/common/djangoapps/course_modes/tests/factories.py b/common/djangoapps/course_modes/tests/factories.py
index 3f3d876997..f170059adb 100644
--- a/common/djangoapps/course_modes/tests/factories.py
+++ b/common/djangoapps/course_modes/tests/factories.py
@@ -5,7 +5,7 @@ import random
 
 from factory import lazy_attribute
 from factory.django import DjangoModelFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from course_modes.models import CourseMode
 
@@ -16,7 +16,7 @@ class CourseModeFactory(DjangoModelFactory):
     class Meta(object):
         model = CourseMode
 
-    course_id = SlashSeparatedCourseKey('MITx', '999', 'Robot_Super_Course')
+    course_id = CourseLocator('MITx', '999', 'Robot_Super_Course')
     mode_slug = 'audit'
     currency = 'usd'
     expiration_datetime = None
diff --git a/common/djangoapps/course_modes/tests/test_models.py b/common/djangoapps/course_modes/tests/test_models.py
index fc5bb8987f..90dab57cae 100644
--- a/common/djangoapps/course_modes/tests/test_models.py
+++ b/common/djangoapps/course_modes/tests/test_models.py
@@ -11,13 +11,17 @@ from datetime import datetime, timedelta
 import ddt
 import pytz
 from django.core.exceptions import ValidationError
-from django.test import TestCase
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from django.test import TestCase, override_settings
+from mock import patch
 from opaque_keys.edx.locator import CourseLocator
 
 from course_modes.helpers import enrollment_mode_display
-from course_modes.models import CourseMode, Mode, invalidate_course_mode_cache
+from course_modes.models import CourseMode, Mode, invalidate_course_mode_cache, get_cosmetic_display_price
 from course_modes.tests.factories import CourseModeFactory
+from xmodule.modulestore.tests.factories import CourseFactory
+from xmodule.modulestore.tests.django_utils import (
+    ModuleStoreTestCase,
+)
 
 
 @ddt.ddt
@@ -28,7 +32,7 @@ class CourseModeModelTest(TestCase):
 
     def setUp(self):
         super(CourseModeModelTest, self).setUp()
-        self.course_key = SlashSeparatedCourseKey('Test', 'TestCourse', 'TestCourseRun')
+        self.course_key = CourseLocator('Test', 'TestCourse', 'TestCourseRun')
         CourseMode.objects.all().delete()
 
     def tearDown(self):
@@ -151,7 +155,7 @@ class CourseModeModelTest(TestCase):
         modes = CourseMode.modes_for_course(self.course_key)
         self.assertEqual([expired_mode_value, mode1], modes)
 
-        modes = CourseMode.modes_for_course(SlashSeparatedCourseKey('TestOrg', 'TestCourse', 'TestRun'))
+        modes = CourseMode.modes_for_course(CourseLocator('TestOrg', 'TestCourse', 'TestRun'))
         self.assertEqual([CourseMode.DEFAULT_MODE], modes)
 
     def test_verified_mode_for_course(self):
@@ -474,3 +478,26 @@ class CourseModeModelTest(TestCase):
             self.assertTrue(is_error_expected, "Did not expect a ValidationError to be thrown.")
         else:
             self.assertFalse(is_error_expected, "Expected a ValidationError to be thrown.")
+
+
+class TestDisplayPrices(ModuleStoreTestCase):
+    @override_settings(PAID_COURSE_REGISTRATION_CURRENCY=["USD", "$"])
+    def test_get_cosmetic_display_price(self):
+        """
+        Check that get_cosmetic_display_price() returns the correct price given its inputs.
+        """
+        course = CourseFactory.create()
+        registration_price = 99
+        course.cosmetic_display_price = 10
+        with patch('course_modes.models.CourseMode.min_course_price_for_currency', return_value=registration_price):
+            # Since registration_price is set, it overrides the cosmetic_display_price and should be returned
+            self.assertEqual(get_cosmetic_display_price(course), "$99")
+
+        registration_price = 0
+        with patch('course_modes.models.CourseMode.min_course_price_for_currency', return_value=registration_price):
+            # Since registration_price is not set, cosmetic_display_price should be returned
+            self.assertEqual(get_cosmetic_display_price(course), "$10")
+
+        course.cosmetic_display_price = 0
+        # Since both prices are not set, there is no price, thus "Free"
+        self.assertEqual(get_cosmetic_display_price(course), "Free")
diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py
index f034b060fc..86f7db25ca 100644
--- a/common/djangoapps/course_modes/views.py
+++ b/common/djangoapps/course_modes/views.py
@@ -23,6 +23,7 @@ from course_modes.models import CourseMode
 from courseware.access import has_access
 from edxmako.shortcuts import render_to_response
 from lms.djangoapps.commerce.utils import EcommerceService
+from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
 from openedx.core.djangoapps.embargo import api as embargo_api
 from openedx.features.enterprise_support import api as enterprise_api
 from student.models import CourseEnrollment
@@ -151,6 +152,13 @@ class ChooseModeView(View):
             "responsive": True,
             "nav_hidden": True,
         }
+        context.update(
+            get_experiment_user_metadata_context(
+                request,
+                course,
+                request.user,
+            )
+        )
 
         title_content = _("Congratulations!  You are now enrolled in {course_name}").format(
             course_name=course.display_name_with_default_escaped
diff --git a/common/djangoapps/static_replace/test/test_static_replace.py b/common/djangoapps/static_replace/test/test_static_replace.py
index 0e8443c815..7c259fed36 100644
--- a/common/djangoapps/static_replace/test/test_static_replace.py
+++ b/common/djangoapps/static_replace/test/test_static_replace.py
@@ -10,7 +10,7 @@ from django.test import override_settings
 from django.utils.http import urlencode, urlquote
 from mock import Mock, patch
 from nose.tools import assert_equals, assert_false, assert_true  # pylint: disable=no-name-in-module
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from PIL import Image
 
 from static_replace import (
@@ -32,7 +32,7 @@ from xmodule.modulestore.tests.factories import CourseFactory, check_mongo_calls
 from xmodule.modulestore.xml import XMLModuleStore
 
 DATA_DIRECTORY = 'data_dir'
-COURSE_KEY = SlashSeparatedCourseKey('org', 'course', 'run')
+COURSE_KEY = CourseKey.from_string('org/course/run')
 STATIC_SOURCE = '"/static/file.png"'
 
 
diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py
index abc62219f5..561121c8e2 100644
--- a/common/djangoapps/student/admin.py
+++ b/common/djangoapps/student/admin.py
@@ -1,13 +1,13 @@
 """ Django admin pages for student app """
 from config_models.admin import ConfigurationModelAdmin
 from django import forms
+from django.contrib import admin
 from django.contrib.admin.sites import NotRegistered
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.utils.translation import ugettext_lazy as _
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
-from ratelimitbackend import admin
 
 from student.models import (
     CourseAccessRole,
diff --git a/common/djangoapps/student/forms.py b/common/djangoapps/student/forms.py
index 0bc46f80cb..92d17ffa74 100644
--- a/common/djangoapps/student/forms.py
+++ b/common/djangoapps/student/forms.py
@@ -23,18 +23,6 @@ from student.models import CourseEnrollmentAllowed
 from util.password_policy_validators import validate_password_strength
 
 
-USERNAME_TOO_SHORT_MSG = _("Username must be minimum of two characters long")
-USERNAME_TOO_LONG_MSG = _("Username cannot be more than %(limit_value)s characters long")
-
-# Translators: This message is shown when the Unicode usernames are NOT allowed
-USERNAME_INVALID_CHARS_ASCII = _("Usernames can only contain Roman letters, western numerals (0-9), "
-                                 "underscores (_), and hyphens (-).")
-
-# Translators: This message is shown only when the Unicode usernames are allowed
-USERNAME_INVALID_CHARS_UNICODE = _("Usernames can only contain letters, numerals, underscore (_), numbers "
-                                   "and @/./+/-/_ characters.")
-
-
 class PasswordResetFormNoActive(PasswordResetForm):
     error_messages = {
         'unknown': _("That e-mail address doesn't have an associated "
@@ -61,7 +49,6 @@ class PasswordResetFormNoActive(PasswordResetForm):
 
     def save(
             self,
-            domain_override=None,
             subject_template_name='emails/password_reset_subject.txt',
             email_template_name='registration/password_reset_email.html',
             use_https=False,
@@ -77,13 +64,10 @@ class PasswordResetFormNoActive(PasswordResetForm):
         # django.contrib.auth.forms.PasswordResetForm directly, which has this import in this place.
         from django.core.mail import send_mail
         for user in self.users_cache:
-            if not domain_override:
-                site_name = configuration_helpers.get_value(
-                    'SITE_NAME',
-                    settings.SITE_NAME
-                )
-            else:
-                site_name = domain_override
+            site_name = configuration_helpers.get_value(
+                'SITE_NAME',
+                settings.SITE_NAME
+            )
             context = {
                 'email': user.email,
                 'site_name': site_name,
@@ -127,12 +111,12 @@ def validate_username(username):
 
     username_re = slug_re
     flags = None
-    message = USERNAME_INVALID_CHARS_ASCII
+    message = accounts_settings.USERNAME_INVALID_CHARS_ASCII
 
     if settings.FEATURES.get("ENABLE_UNICODE_USERNAME"):
         username_re = r"^{regex}$".format(regex=settings.USERNAME_REGEX_PARTIAL)
         flags = re.UNICODE
-        message = USERNAME_INVALID_CHARS_UNICODE
+        message = accounts_settings.USERNAME_INVALID_CHARS_UNICODE
 
     validator = RegexValidator(
         regex=username_re,
@@ -156,9 +140,9 @@ class UsernameField(forms.CharField):
             min_length=accounts_settings.USERNAME_MIN_LENGTH,
             max_length=accounts_settings.USERNAME_MAX_LENGTH,
             error_messages={
-                "required": USERNAME_TOO_SHORT_MSG,
-                "min_length": USERNAME_TOO_SHORT_MSG,
-                "max_length": USERNAME_TOO_LONG_MSG,
+                "required": accounts_settings.USERNAME_BAD_LENGTH_MSG,
+                "min_length": accounts_settings.USERNAME_BAD_LENGTH_MSG,
+                "max_length": accounts_settings.USERNAME_BAD_LENGTH_MSG,
             }
         )
 
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 96d325d1a7..f6b4452ec8 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -13,7 +13,6 @@ file and check it in at the same time as your model changes. To do that,
 import hashlib
 import json
 import logging
-from slumber.exceptions import HttpClientError
 import uuid
 from collections import OrderedDict, defaultdict, namedtuple
 from datetime import datetime, timedelta
@@ -37,11 +36,14 @@ from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_noop
 from django_countries.fields import CountryField
+from edx_rest_api_client.exceptions import SlumberBaseException
+from eventtracking import tracker
 from model_utils.models import TimeStampedModel
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from pytz import UTC
 from simple_history.models import HistoricalRecords
+from slumber.exceptions import HttpClientError, HttpServerError
 
 import dogstats_wrapper as dog_stats_api
 import lms.lib.comment_client as cc
@@ -49,7 +51,6 @@ import request_cache
 from certificates.models import GeneratedCertificate
 from course_modes.models import CourseMode
 from enrollment.api import _default_course_mode
-from eventtracking import tracker
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.xmodule_django.models import CourseKeyField, NoneToEmptyManager
@@ -60,6 +61,7 @@ from util.query import use_read_replica_if_available
 
 UNENROLL_DONE = Signal(providing_args=["course_enrollment", "skip_refund"])
 ENROLL_STATUS_CHANGE = Signal(providing_args=["event", "user", "course_id", "mode", "cost", "currency"])
+REFUND_ORDER = Signal(providing_args=["course_enrollment"])
 log = logging.getLogger(__name__)
 AUDIT_LOG = logging.getLogger("audit")
 SessionStore = import_module(settings.SESSION_ENGINE).SessionStore  # pylint: disable=invalid-name
@@ -1623,11 +1625,23 @@ class CourseEnrollment(models.Model):
         order_number = attribute.value
         try:
             order = ecommerce_api_client(self.user).orders(order_number).get()
+
         except HttpClientError:
             log.warning(
                 u"Encountered HttpClientError while getting order details from ecommerce. "
                 u"Order={number} and user {user}".format(number=order_number, user=self.user.id))
+            return None
 
+        except HttpServerError:
+            log.warning(
+                u"Encountered HttpServerError while getting order details from ecommerce. "
+                u"Order={number} and user {user}".format(number=order_number, user=self.user.id))
+            return None
+
+        except SlumberBaseException:
+            log.warning(
+                u"Encountered an error while getting order details from ecommerce. "
+                u"Order={number} and user {user}".format(number=order_number, user=self.user.id))
             return None
 
         refund_window_start_date = max(
@@ -1664,6 +1678,55 @@ class CourseEnrollment(models.Model):
                 self._course_overview = None
         return self._course_overview
 
+    @property
+    def upgrade_deadline(self):
+        """
+        Returns the upgrade deadline for this enrollment, if it is upgradeable.
+
+        If the seat cannot be upgraded, None is returned.
+
+        Note:
+            When loading this model, use `select_related` to retrieve the associated schedule object.
+
+        Returns:
+            datetime|None
+        """
+        log.debug('Schedules: Determining upgrade deadline for CourseEnrollment %d...', self.id)
+        if not CourseMode.is_mode_upgradeable(self.mode):
+            log.debug(
+                'Schedules: %s mode of %s is not upgradeable. Returning None for upgrade deadline.',
+                self.mode, self.course_id
+            )
+            return None
+
+        try:
+            if self.schedule:
+                log.debug(
+                    'Schedules: Pulling upgrade deadline for CourseEnrollment %d from Schedule %d.',
+                    self.id, self.schedule.id
+                )
+                return self.schedule.upgrade_deadline
+        except ObjectDoesNotExist:
+            # NOTE: Schedule has a one-to-one mapping with CourseEnrollment. If no schedule is associated
+            # with this enrollment, Django will raise an exception rather than return None.
+            log.debug('Schedules: No schedule exists for CourseEnrollment %d.', self.id)
+            pass
+
+        try:
+            verified_mode = CourseMode.verified_mode_for_course(self.course_id)
+
+            if verified_mode:
+                log.debug('Schedules: Defaulting to verified mode expiration date-time for %s.', self.course_id)
+                return verified_mode.expiration_datetime
+            else:
+                log.debug('Schedules: No verified mode located for %s.', self.course_id)
+        except CourseMode.DoesNotExist:
+            log.debug('Schedules: %s has no verified mode.', self.course_id)
+            pass
+
+        log.debug('Schedules: Returning default of `None`')
+        return None
+
     def is_verified_enrollment(self):
         """
         Check the course enrollment mode is verified or not
diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py
index e5c39de629..44bf74b9d2 100644
--- a/common/djangoapps/student/tests/factories.py
+++ b/common/djangoapps/student/tests/factories.py
@@ -8,7 +8,7 @@ from django.contrib.auth.models import AnonymousUser, Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from factory import lazy_attribute
 from factory.django import DjangoModelFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from pytz import UTC
 
 from course_modes.models import CourseMode
@@ -144,7 +144,7 @@ class CourseEnrollmentFactory(DjangoModelFactory):
         model = CourseEnrollment
 
     user = factory.SubFactory(UserFactory)
-    course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+    course_id = CourseKey.from_string('edX/toy/2012_Fall')
 
 
 class CourseAccessRoleFactory(DjangoModelFactory):
@@ -152,7 +152,7 @@ class CourseAccessRoleFactory(DjangoModelFactory):
         model = CourseAccessRole
 
     user = factory.SubFactory(UserFactory)
-    course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+    course_id = CourseKey.from_string('edX/toy/2012_Fall')
     role = 'TestRole'
 
 
@@ -161,7 +161,7 @@ class CourseEnrollmentAllowedFactory(DjangoModelFactory):
         model = CourseEnrollmentAllowed
 
     email = 'test@edx.org'
-    course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+    course_id = CourseKey.from_string('edX/toy/2012_Fall')
 
 
 class PendingEmailChangeFactory(DjangoModelFactory):
diff --git a/common/djangoapps/student/tests/test_authz.py b/common/djangoapps/student/tests/test_authz.py
index 51b9282120..2395d58e07 100644
--- a/common/djangoapps/student/tests/test_authz.py
+++ b/common/djangoapps/student/tests/test_authz.py
@@ -6,7 +6,7 @@ from ccx_keys.locator import CCXLocator
 from django.contrib.auth.models import AnonymousUser, User
 from django.core.exceptions import PermissionDenied
 from django.test import TestCase
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from student.auth import add_users, has_studio_read_access, has_studio_write_access, remove_users, user_has_role
 from student.roles import CourseCreatorRole, CourseInstructorRole, CourseStaffRole
@@ -182,7 +182,7 @@ class CourseGroupTest(TestCase):
         self.global_admin = AdminFactory()
         self.creator = User.objects.create_user('testcreator', 'testcreator+courses@edx.org', 'foo')
         self.staff = User.objects.create_user('teststaff', 'teststaff+courses@edx.org', 'foo')
-        self.course_key = SlashSeparatedCourseKey('mitX', '101', 'test')
+        self.course_key = CourseLocator('mitX', '101', 'test')
 
     def test_add_user_to_course_group(self):
         """
diff --git a/common/djangoapps/student/tests/test_bulk_email_settings.py b/common/djangoapps/student/tests/test_bulk_email_settings.py
index ede3d3f4bc..7add268a20 100644
--- a/common/djangoapps/student/tests/test_bulk_email_settings.py
+++ b/common/djangoapps/student/tests/test_bulk_email_settings.py
@@ -8,7 +8,7 @@ import unittest
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 
 # This import is for an lms djangoapp.
 # Its testcases are only run under lms.
@@ -101,7 +101,7 @@ class TestStudentDashboardEmailViewXMLBacked(SharedModuleStoreTestCase):
         student = UserFactory.create()
         CourseEnrollmentFactory.create(
             user=student,
-            course_id=SlashSeparatedCourseKey.from_deprecated_string(self.course_name)
+            course_id=CourseKey.from_string(self.course_name)
         )
         self.client.login(username=student.username, password="test")
 
diff --git a/common/djangoapps/student/tests/test_create_account.py b/common/djangoapps/student/tests/test_create_account.py
index 7eb9b55772..da11e8e1a6 100644
--- a/common/djangoapps/student/tests/test_create_account.py
+++ b/common/djangoapps/student/tests/test_create_account.py
@@ -22,8 +22,10 @@ from notification_prefs import NOTIFICATION_PREF_KEY
 from openedx.core.djangoapps.external_auth.models import ExternalAuthMap
 from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
+from openedx.core.djangoapps.user_api.accounts import (
+    USERNAME_BAD_LENGTH_MSG, USERNAME_INVALID_CHARS_ASCII, USERNAME_INVALID_CHARS_UNICODE
+)
 from openedx.core.djangoapps.user_api.preferences.api import get_user_preference
-from student.forms import USERNAME_INVALID_CHARS_ASCII, USERNAME_INVALID_CHARS_UNICODE
 from student.models import UserAttribute
 from student.views import REGISTRATION_AFFILIATE_ID, REGISTRATION_UTM_CREATED_AT, REGISTRATION_UTM_PARAMETERS
 
@@ -476,16 +478,16 @@ class TestCreateAccountValidation(TestCase):
 
         # Missing
         del params["username"]
-        assert_username_error("Username must be minimum of two characters long")
+        assert_username_error(USERNAME_BAD_LENGTH_MSG)
 
         # Empty, too short
         for username in ["", "a"]:
             params["username"] = username
-            assert_username_error("Username must be minimum of two characters long")
+            assert_username_error(USERNAME_BAD_LENGTH_MSG)
 
         # Too long
         params["username"] = "this_username_has_31_characters"
-        assert_username_error("Username cannot be more than 30 characters long")
+        assert_username_error(USERNAME_BAD_LENGTH_MSG)
 
         # Invalid
         params["username"] = "invalid username"
diff --git a/common/djangoapps/student/tests/test_long_username_email.py b/common/djangoapps/student/tests/test_long_username_email.py
index b1e15adbbf..f949440ba2 100644
--- a/common/djangoapps/student/tests/test_long_username_email.py
+++ b/common/djangoapps/student/tests/test_long_username_email.py
@@ -5,6 +5,8 @@ import json
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
+from openedx.core.djangoapps.user_api.accounts import USERNAME_BAD_LENGTH_MSG
+
 
 class TestLongUsernameEmail(TestCase):
 
@@ -34,7 +36,7 @@ class TestLongUsernameEmail(TestCase):
         obj = json.loads(response.content)
         self.assertEqual(
             obj['value'],
-            "Username cannot be more than 30 characters long",
+            USERNAME_BAD_LENGTH_MSG,
         )
 
     def test_long_email(self):
diff --git a/common/djangoapps/student/tests/test_models.py b/common/djangoapps/student/tests/test_models.py
index 4f1f3421cc..ad8d68d071 100644
--- a/common/djangoapps/student/tests/test_models.py
+++ b/common/djangoapps/student/tests/test_models.py
@@ -1,17 +1,27 @@
 # pylint: disable=missing-docstring
 
+import datetime
 import hashlib
 
+import ddt
+import factory
+import pytz
 from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
+from django.db.models import signals
 from django.db.models.functions import Lower
 
+from course_modes.models import CourseMode
+from openedx.core.djangoapps.schedules.models import Schedule
+from openedx.core.djangoapps.schedules.tests.factories import ScheduleFactory
+from openedx.core.djangolib.testing.utils import skip_unless_lms
 from student.models import CourseEnrollment
-from student.tests.factories import CourseEnrollmentFactory, UserFactory
+from student.tests.factories import CourseEnrollmentFactory, UserFactory, CourseModeFactory
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
 
+@ddt.ddt
 class CourseEnrollmentTests(SharedModuleStoreTestCase):
     @classmethod
     def setUpClass(cls):
@@ -20,8 +30,8 @@ class CourseEnrollmentTests(SharedModuleStoreTestCase):
 
     def setUp(self):
         super(CourseEnrollmentTests, self).setUp()
-        self.user = UserFactory.create()
-        self.user_2 = UserFactory.create()
+        self.user = UserFactory()
+        self.user_2 = UserFactory()
 
     def test_enrollment_status_hash_cache_key(self):
         username = 'test-user'
@@ -103,3 +113,29 @@ class CourseEnrollmentTests(SharedModuleStoreTestCase):
             CourseEnrollment.objects.users_enrolled_in(self.course.id, include_inactive=True)
         )
         self.assertListEqual([self.user, self.user_2], all_enrolled_users)
+
+    @skip_unless_lms
+    # NOTE: We mute the post_save signal to prevent Schedules from being created for new enrollments
+    @factory.django.mute_signals(signals.post_save)
+    def test_upgrade_deadline(self):
+        """ The property should use either the CourseMode or related Schedule to determine the deadline. """
+        course_mode = CourseModeFactory(
+            course_id=self.course.id,
+            mode_slug=CourseMode.VERIFIED,
+            # This must be in the future to ensure it is returned by downstream code.
+            expiration_datetime=datetime.datetime.now(pytz.UTC) + datetime.timedelta(days=1)
+        )
+        enrollment = CourseEnrollmentFactory(course_id=self.course.id, mode=CourseMode.AUDIT)
+        self.assertEqual(Schedule.objects.all().count(), 0)
+        self.assertEqual(enrollment.upgrade_deadline, course_mode.expiration_datetime)
+
+        # The schedule's upgrade deadline should be used if a schedule exists
+        schedule = ScheduleFactory(enrollment=enrollment)
+        self.assertEqual(enrollment.upgrade_deadline, schedule.upgrade_deadline)
+
+    @skip_unless_lms
+    @ddt.data(*(set(CourseMode.ALL_MODES) - set(CourseMode.AUDIT_MODES)))
+    def test_upgrade_deadline_for_non_upgradeable_enrollment(self, mode):
+        """ The property should return None if an upgrade cannot be upgraded. """
+        enrollment = CourseEnrollmentFactory(course_id=self.course.id, mode=mode)
+        self.assertIsNone(enrollment.upgrade_deadline)
diff --git a/common/djangoapps/student/tests/test_refunds.py b/common/djangoapps/student/tests/test_refunds.py
index cb4be3a13f..11849cbd0a 100644
--- a/common/djangoapps/student/tests/test_refunds.py
+++ b/common/djangoapps/student/tests/test_refunds.py
@@ -2,7 +2,6 @@
     Tests for enrollment refund capabilities.
 """
 import logging
-from slumber.exceptions import HttpClientError
 import unittest
 from datetime import datetime, timedelta
 
@@ -15,7 +14,9 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.test.client import Client
 from django.test.utils import override_settings
+from edx_rest_api_client.exceptions import SlumberBaseException
 from mock import patch
+from slumber.exceptions import HttpClientError, HttpServerError
 
 # These imports refer to lms djangoapps.
 # Their testcases are only run under lms.
@@ -214,15 +215,16 @@ class RefundableTest(SharedModuleStoreTestCase):
         resp = self.client.post(reverse('student.views.dashboard', args=[]))
         self.assertEqual(resp.status_code, 200)
 
+    @ddt.data(HttpServerError, HttpClientError, SlumberBaseException)
     @override_settings(ECOMMERCE_API_URL=TEST_API_URL)
-    def test_refund_cutoff_date_with_client_error(self):
+    def test_refund_cutoff_date_with_api_error(self, exception):
         """ Verify that dashboard will not throw internal server error if HttpClientError
-         raised while getting order detail for ecommerce.
-         """
+        raised while getting order detail for ecommerce.
+        """
         # importing this after overriding value of ECOMMERCE_API_URL
         from commerce.tests.mocks import mock_order_endpoint
 
         self.client.login(username=self.user.username, password=self.USER_PASSWORD)
-        with mock_order_endpoint(order_number=self.ORDER_NUMBER, exception=HttpClientError):
+        with mock_order_endpoint(order_number=self.ORDER_NUMBER, exception=exception, reset_on_exit=False):
             response = self.client.post(reverse('student.views.dashboard', args=[]))
             self.assertEqual(response.status_code, 200)
diff --git a/common/djangoapps/student/tests/test_reset_password.py b/common/djangoapps/student/tests/test_reset_password.py
index 9b4fbbfcd6..61b2488db3 100644
--- a/common/djangoapps/student/tests/test_reset_password.py
+++ b/common/djangoapps/student/tests/test_reset_password.py
@@ -13,6 +13,7 @@ from django.contrib.auth.tokens import default_token_generator
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
 from django.test.client import RequestFactory
+from django.test.utils import override_settings
 from django.utils.http import int_to_base36
 from edx_oauth2_provider.tests.factories import AccessTokenFactory, ClientFactory, RefreshTokenFactory
 from mock import Mock, patch
@@ -174,40 +175,33 @@ class ResetPasswordTests(EventTestMixin, CacheIsolationTestCase):
 
     @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', "Test only valid in LMS")
     @patch('django.core.mail.send_mail')
-    @ddt.data(('Crazy Awesome Site', 'Crazy Awesome Site'), (None, 'edX'))
+    @ddt.data(('Crazy Awesome Site', 'Crazy Awesome Site'), ('edX', 'edX'))
     @ddt.unpack
-    def test_reset_password_email_domain(self, domain_override, platform_name, send_email):
+    def test_reset_password_email_site(self, site_name, platform_name, send_email):
         """
         Tests that the right url domain and platform name is included in
         the reset password email
         """
         with patch("django.conf.settings.PLATFORM_NAME", platform_name):
-            req = self.request_factory.post(
-                '/password_reset/', {'email': self.user.email}
-            )
-            req.is_secure = Mock(return_value=True)
-            req.get_host = Mock(return_value=domain_override)
-            req.user = self.user
-            password_reset(req)
-            _, msg, _, _ = send_email.call_args[0]
+            with patch("django.conf.settings.SITE_NAME", site_name):
+                req = self.request_factory.post(
+                    '/password_reset/', {'email': self.user.email}
+                )
+                req.user = self.user
+                password_reset(req)
+                _, msg, _, _ = send_email.call_args[0]
 
-            reset_intro_msg = "you requested a password reset for your user account at {}".format(platform_name)
-            self.assertIn(reset_intro_msg, msg)
+                reset_msg = "you requested a password reset for your user account at {}"
+                reset_msg = reset_msg.format(site_name)
 
-            reset_link = "https://{}/"
-            if domain_override:
-                reset_link = reset_link.format(domain_override)
-            else:
-                reset_link = reset_link.format(settings.SITE_NAME)
+                self.assertIn(reset_msg, msg)
 
-            self.assertIn(reset_link, msg)
+                sign_off = "The {} Team".format(platform_name)
+                self.assertIn(sign_off, msg)
 
-            sign_off = "The {} Team".format(platform_name)
-            self.assertIn(sign_off, msg)
-
-            self.assert_event_emitted(
-                SETTING_CHANGE_INITIATED, user_id=self.user.id, setting=u'password', old=None, new=None
-            )
+                self.assert_event_emitted(
+                    SETTING_CHANGE_INITIATED, user_id=self.user.id, setting=u'password', old=None, new=None
+                )
 
     @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', "Test only valid in LMS")
     @patch("openedx.core.djangoapps.site_configuration.helpers.get_value", fake_get_value)
@@ -287,6 +281,35 @@ class ResetPasswordTests(EventTestMixin, CacheIsolationTestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertFalse(User.objects.get(pk=self.user.pk).is_active)
 
+    @override_settings(PASSWORD_MIN_LENGTH=2)
+    @override_settings(PASSWORD_MAX_LENGTH=10)
+    @ddt.data(
+        {
+            'password': '1',
+            'error_message': 'Password: Invalid Length (must be 2 characters or more)',
+        },
+        {
+            'password': '01234567891',
+            'error_message': 'Password: Invalid Length (must be 10 characters or fewer)'
+        }
+    )
+    def test_password_reset_with_invalid_length(self, password_dict):
+        """Tests that if we provide password characters less then PASSWORD_MIN_LENGTH,
+        or more than PASSWORD_MAX_LENGTH, password reset will fail with error message.
+        """
+
+        url = reverse(
+            'password_reset_confirm',
+            kwargs={'uidb36': self.uidb36, 'token': self.token}
+        )
+        request_params = {'new_password1': password_dict['password'], 'new_password2': password_dict['password']}
+        confirm_request = self.request_factory.post(url, data=request_params)
+
+        # Make a password reset request with minimum/maximum passwords characters.
+        response = password_reset_confirm_wrapper(confirm_request, self.uidb36, self.token)
+
+        self.assertEqual(response.context_data['err_msg'], password_dict['error_message'])
+
     @patch('student.views.password_reset_confirm')
     @patch("openedx.core.djangoapps.site_configuration.helpers.get_value", fake_get_value)
     def test_reset_password_good_token_configuration_override(self, reset_confirm):
diff --git a/common/djangoapps/student/tests/test_roles.py b/common/djangoapps/student/tests/test_roles.py
index 20c24dae51..ac1301a5dc 100644
--- a/common/djangoapps/student/tests/test_roles.py
+++ b/common/djangoapps/student/tests/test_roles.py
@@ -3,7 +3,7 @@ Tests of student.roles
 """
 import ddt
 from django.test import TestCase
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 
 from courseware.tests.factories import InstructorFactory, StaffFactory, UserFactory
 from student.roles import (
@@ -26,7 +26,7 @@ class RolesTestCase(TestCase):
 
     def setUp(self):
         super(RolesTestCase, self).setUp()
-        self.course_key = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        self.course_key = CourseKey.from_string('edX/toy/2012_Fall')
         self.course_loc = self.course_key.make_usage_key('course', '2012_Fall')
         self.anonymous_user = AnonymousUserFactory()
         self.student = UserFactory()
@@ -43,8 +43,8 @@ class RolesTestCase(TestCase):
     def test_group_name_case_sensitive(self):
         uppercase_course_id = "ORG/COURSE/NAME"
         lowercase_course_id = uppercase_course_id.lower()
-        uppercase_course_key = SlashSeparatedCourseKey.from_deprecated_string(uppercase_course_id)
-        lowercase_course_key = SlashSeparatedCourseKey.from_deprecated_string(lowercase_course_id)
+        uppercase_course_key = CourseKey.from_string(uppercase_course_id)
+        lowercase_course_key = CourseKey.from_string(lowercase_course_id)
 
         role = "role"
 
@@ -165,8 +165,8 @@ class RolesTestCase(TestCase):
 @ddt.ddt
 class RoleCacheTestCase(TestCase):
 
-    IN_KEY = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
-    NOT_IN_KEY = SlashSeparatedCourseKey('edX', 'toy', '2013_Fall')
+    IN_KEY = CourseKey.from_string('edX/toy/2012_Fall')
+    NOT_IN_KEY = CourseKey.from_string('edX/toy/2013_Fall')
 
     ROLES = (
         (CourseStaffRole(IN_KEY), ('staff', IN_KEY, 'edX')),
diff --git a/common/djangoapps/student/tests/test_views.py b/common/djangoapps/student/tests/test_views.py
index 5cd9a8d340..a5cd234665 100644
--- a/common/djangoapps/student/tests/test_views.py
+++ b/common/djangoapps/student/tests/test_views.py
@@ -18,7 +18,7 @@ from pyquery import PyQuery as pq
 
 from student.cookies import get_user_info_cookie_data
 from student.helpers import DISABLE_UNENROLL_CERT_STATES
-from student.models import CourseEnrollment, UserProfile
+from student.models import CourseEnrollment, REFUND_ORDER, UserProfile
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
@@ -91,16 +91,19 @@ class TestStudentDashboardUnenrollments(SharedModuleStoreTestCase):
         self.cert_status = cert_status
 
         with patch('student.views.cert_info', side_effect=self.mock_cert):
-            response = self.client.post(
-                reverse('change_enrollment'),
-                {'enrollment_action': 'unenroll', 'course_id': self.course.id}
-            )
+            with patch('commerce.signals.handle_refund_order') as mock_refund_handler:
+                REFUND_ORDER.connect(mock_refund_handler)
+                response = self.client.post(
+                    reverse('change_enrollment'),
+                    {'enrollment_action': 'unenroll', 'course_id': self.course.id}
+                )
 
-            self.assertEqual(response.status_code, status_code)
-            if status_code == 200:
-                course_enrollment.assert_called_with(self.user, self.course.id)
-            else:
-                course_enrollment.assert_not_called()
+                self.assertEqual(response.status_code, status_code)
+                if status_code == 200:
+                    course_enrollment.assert_called_with(self.user, self.course.id)
+                    self.assertTrue(mock_refund_handler.called)
+                else:
+                    course_enrollment.assert_not_called()
 
     def test_no_cert_status(self):
         """ Assert that the dashboard loads when cert_status is None."""
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index 0052115d95..f2b7e49549 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -2,14 +2,12 @@
 """
 Miscellaneous tests for the student app.
 """
-import json
 import logging
 import unittest
 from datetime import datetime, timedelta
 from urllib import quote
 
 import ddt
-import httpretty
 import pytz
 from config_models.models import cache
 from django.conf import settings
@@ -21,7 +19,6 @@ from markupsafe import escape
 from mock import Mock, patch
 from nose.plugins.attrib import attr
 from opaque_keys.edx.locations import CourseLocator, SlashSeparatedCourseKey
-from provider.constants import CONFIDENTIAL
 from pyquery import PyQuery as pq
 
 import shoppingcart  # pylint: disable=import-error
@@ -753,6 +750,8 @@ class EnrollInCourseTest(EnrollmentEventTestMixin, CacheIsolationTestCase):
     def test_enrollment(self):
         user = User.objects.create_user("joe", "joe@joe.com", "password")
         course_id = SlashSeparatedCourseKey("edX", "Test101", "2013")
+        # Cannot be converted to CourseLocator or CourseKey.from_string because both do not support
+        # course keys without a run. The test specifically tests functionality when run is not specified.
         course_id_partial = SlashSeparatedCourseKey("edX", "Test101", None)
 
         # Test basic enrollment
@@ -799,7 +798,7 @@ class EnrollInCourseTest(EnrollmentEventTestMixin, CacheIsolationTestCase):
     def test_enrollment_non_existent_user(self):
         # Testing enrollment of newly unsaved user (i.e. no database entry)
         user = User(username="rusty", email="rusty@fake.edx.org")
-        course_id = SlashSeparatedCourseKey("edX", "Test101", "2013")
+        course_id = CourseLocator("edX", "Test101", "2013")
 
         self.assertFalse(CourseEnrollment.is_enrolled(user, course_id))
 
@@ -816,7 +815,7 @@ class EnrollInCourseTest(EnrollmentEventTestMixin, CacheIsolationTestCase):
     @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
     def test_enrollment_by_email(self):
         user = User.objects.create(username="jack", email="jack@fake.edx.org")
-        course_id = SlashSeparatedCourseKey("edX", "Test101", "2013")
+        course_id = CourseLocator("edX", "Test101", "2013")
 
         CourseEnrollment.enroll_by_email("jack@fake.edx.org", course_id)
         self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
@@ -854,8 +853,8 @@ class EnrollInCourseTest(EnrollmentEventTestMixin, CacheIsolationTestCase):
     @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
     def test_enrollment_multiple_classes(self):
         user = User(username="rusty", email="rusty@fake.edx.org")
-        course_id1 = SlashSeparatedCourseKey("edX", "Test101", "2013")
-        course_id2 = SlashSeparatedCourseKey("MITx", "6.003z", "2012")
+        course_id1 = CourseLocator("edX", "Test101", "2013")
+        course_id2 = CourseLocator("MITx", "6.003z", "2012")
 
         CourseEnrollment.enroll(user, course_id1)
         self.assert_enrollment_event_was_emitted(user, course_id1)
@@ -877,7 +876,7 @@ class EnrollInCourseTest(EnrollmentEventTestMixin, CacheIsolationTestCase):
     @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
     def test_activation(self):
         user = User.objects.create(username="jack", email="jack@fake.edx.org")
-        course_id = SlashSeparatedCourseKey("edX", "Test101", "2013")
+        course_id = CourseLocator("edX", "Test101", "2013")
         self.assertFalse(CourseEnrollment.is_enrolled(user, course_id))
 
         # Creating an enrollment doesn't actually enroll a student
@@ -914,7 +913,7 @@ class EnrollInCourseTest(EnrollmentEventTestMixin, CacheIsolationTestCase):
 
     def test_change_enrollment_modes(self):
         user = User.objects.create(username="justin", email="jh@fake.edx.org")
-        course_id = SlashSeparatedCourseKey("edX", "Test101", "2013")
+        course_id = CourseLocator("edX", "Test101", "2013")
 
         CourseEnrollment.enroll(user, course_id, "audit")
         self.assert_enrollment_event_was_emitted(user, course_id)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 3ac0e6c579..2c857443f5 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -119,7 +119,8 @@ from student.models import (
     UserStanding,
     anonymous_id_for_user,
     create_comments_service_user,
-    unique_id_for_user
+    unique_id_for_user,
+    REFUND_ORDER
 )
 from student.tasks import send_activation_email
 from third_party_auth import pipeline, provider
@@ -127,7 +128,7 @@ from util.bad_request_rate_limiter import BadRequestRateLimiter
 from util.db import outer_atomic
 from util.json_request import JsonResponse
 from util.milestones_helpers import get_pre_requisite_courses_not_completed
-from util.password_policy_validators import validate_password_strength
+from util.password_policy_validators import validate_password_length, validate_password_strength
 from xmodule.modulestore.django import modulestore
 
 log = logging.getLogger("edx.student")
@@ -1267,6 +1268,7 @@ def change_enrollment(request, check_access=True):
             return HttpResponseBadRequest(_("Your certificate prevents you from unenrolling from this course"))
 
         CourseEnrollment.unenroll(user, course_id)
+        REFUND_ORDER.send(sender=None, course_enrollment=enrollment)
         return HttpResponse()
     else:
         return HttpResponseBadRequest(_("Enrollment action is invalid"))
@@ -2434,8 +2436,7 @@ def password_reset(request):
     if form.is_valid():
         form.save(use_https=request.is_secure(),
                   from_email=configuration_helpers.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL),
-                  request=request,
-                  domain_override=request.get_host())
+                  request=request)
         # When password change is complete, a "edx.user.settings.changed" event will be emitted.
         # But because changing the password is multi-step, we also emit an event here so that we can
         # track where the request was initiated.
@@ -2476,7 +2477,30 @@ def uidb36_to_uidb64(uidb36):
     return uidb64
 
 
-def validate_password(user, password):
+def validate_password(password):
+    """
+    Validate password overall strength if ENFORCE_PASSWORD_POLICY is enable
+    otherwise only validate the length of the password.
+
+    Args:
+        password: the user's proposed new password.
+
+    Returns:
+        err_msg: an error message if there's a violation of one of the password
+            checks. Otherwise, `None`.
+    """
+
+    try:
+        if settings.FEATURES.get('ENFORCE_PASSWORD_POLICY', False):
+            validate_password_strength(password)
+        else:
+            validate_password_length(password)
+
+    except ValidationError as err:
+        return _('Password: ') + '; '.join(err.messages)
+
+
+def validate_password_security_policy(user, password):
     """
     Tie in password policy enforcement as an optional level of
     security protection
@@ -2486,19 +2510,11 @@ def validate_password(user, password):
         password: the user's proposed new password.
 
     Returns:
-        is_valid_password: a boolean indicating if the new password
-            passes the validation.
         err_msg: an error message if there's a violation of one of the password
             checks. Otherwise, `None`.
     """
+
     err_msg = None
-
-    if settings.FEATURES.get('ENFORCE_PASSWORD_POLICY', False):
-        try:
-            validate_password_strength(password)
-        except ValidationError as err:
-            err_msg = _('Password: ') + '; '.join(err.messages)
-
     # also, check the password reuse policy
     if not PasswordHistory.is_allowable_password_reuse(user, password):
         if user.is_staff:
@@ -2524,9 +2540,7 @@ def validate_password(user, password):
             num_days
         ).format(num=num_days)
 
-    is_password_valid = err_msg is None
-
-    return is_password_valid, err_msg
+    return err_msg
 
 
 def password_reset_confirm_wrapper(request, uidb36=None, token=None):
@@ -2552,16 +2566,24 @@ def password_reset_confirm_wrapper(request, uidb36=None, token=None):
 
     if request.method == 'POST':
         password = request.POST['new_password1']
-        is_password_valid, password_err_msg = validate_password(user, password)
-        if not is_password_valid:
+        valid_link = False
+        error_message = validate_password_security_policy(user, password)
+        if not error_message:
+            # if security is not violated, we need to validate password
+            error_message = validate_password(password)
+            if error_message:
+                # password reset link will be valid if there is no security violation
+                valid_link = True
+
+        if error_message:
             # We have a password reset attempt which violates some security
-            # policy. Use the existing Django template to communicate that
+            # policy, or any other validation. Use the existing Django template to communicate that
             # back to the user.
             context = {
-                'validlink': False,
+                'validlink': valid_link,
                 'form': None,
                 'title': _('Password reset unsuccessful'),
-                'err_msg': password_err_msg,
+                'err_msg': error_message,
             }
             context.update(platform_name)
             return TemplateResponse(
diff --git a/common/djangoapps/track/admin.py b/common/djangoapps/track/admin.py
index 6aa141a3e2..f450a92324 100644
--- a/common/djangoapps/track/admin.py
+++ b/common/djangoapps/track/admin.py
@@ -2,7 +2,7 @@
 django admin pages for courseware model
 '''
 
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from track.models import TrackingLog
 
diff --git a/common/djangoapps/util/admin.py b/common/djangoapps/util/admin.py
index c8da7cf4d6..0f4f7b2354 100644
--- a/common/djangoapps/util/admin.py
+++ b/common/djangoapps/util/admin.py
@@ -1,6 +1,6 @@
 """Admin interface for the util app. """
 
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from util.models import RateLimitConfiguration
 
diff --git a/common/djangoapps/util/tests/test_sandboxing.py b/common/djangoapps/util/tests/test_sandboxing.py
index 2b944a25a4..2dd9ae6c60 100644
--- a/common/djangoapps/util/tests/test_sandboxing.py
+++ b/common/djangoapps/util/tests/test_sandboxing.py
@@ -4,8 +4,8 @@ Tests for sandboxing.py in util app
 
 from django.test import TestCase
 from django.test.utils import override_settings
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
-from opaque_keys.edx.locator import LibraryLocator
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locator import CourseLocator, LibraryLocator
 
 from util.sandboxing import can_execute_unsafe_code
 
@@ -19,7 +19,7 @@ class SandboxingTest(TestCase):
         """
         Test to make sure that a non-match returns false
         """
-        self.assertFalse(can_execute_unsafe_code(SlashSeparatedCourseKey('edX', 'notful', 'empty')))
+        self.assertFalse(can_execute_unsafe_code(CourseLocator('edX', 'notful', 'empty')))
         self.assertFalse(can_execute_unsafe_code(LibraryLocator('edY', 'test_bank')))
 
     @override_settings(COURSES_WITH_UNSAFE_CODE=['edX/full/.*'])
@@ -27,14 +27,14 @@ class SandboxingTest(TestCase):
         """
         Test to make sure that a match works across course runs
         """
-        self.assertTrue(can_execute_unsafe_code(SlashSeparatedCourseKey('edX', 'full', '2012_Fall')))
-        self.assertTrue(can_execute_unsafe_code(SlashSeparatedCourseKey('edX', 'full', '2013_Spring')))
+        self.assertTrue(can_execute_unsafe_code(CourseKey.from_string('edX/full/2012_Fall')))
+        self.assertTrue(can_execute_unsafe_code(CourseKey.from_string('edX/full/2013_Spring')))
         self.assertFalse(can_execute_unsafe_code(LibraryLocator('edX', 'test_bank')))
 
     def test_courselikes_with_unsafe_code_default(self):
         """
         Test that the default setting for COURSES_WITH_UNSAFE_CODE is an empty setting, e.g. we don't use @override_settings in these tests
         """
-        self.assertFalse(can_execute_unsafe_code(SlashSeparatedCourseKey('edX', 'full', '2012_Fall')))
-        self.assertFalse(can_execute_unsafe_code(SlashSeparatedCourseKey('edX', 'full', '2013_Spring')))
+        self.assertFalse(can_execute_unsafe_code(CourseLocator('edX', 'full', '2012_Fall')))
+        self.assertFalse(can_execute_unsafe_code(CourseLocator('edX', 'full', '2013_Spring')))
         self.assertFalse(can_execute_unsafe_code(LibraryLocator('edX', 'test_bank')))
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 0991e8a488..29e3a925f5 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -5,6 +5,7 @@ import json
 import logging
 from cStringIO import StringIO
 from datetime import datetime, timedelta
+import dateutil.parser
 
 import requests
 from lazy import lazy
@@ -1393,9 +1394,10 @@ class CourseSummary(object):
     A lightweight course summary class, which constructs split/mongo course summary without loading
     the course. It is used at cms for listing courses to global staff user.
     """
-    course_info_fields = ['display_name', 'display_coursenumber', 'display_organization']
+    course_info_fields = ['display_name', 'display_coursenumber', 'display_organization', 'end']
 
-    def __init__(self, course_locator, display_name=u"Empty", display_coursenumber=None, display_organization=None):
+    def __init__(self, course_locator, display_name=u"Empty", display_coursenumber=None, display_organization=None,
+                 end=None):
         """
         Initialize and construct course summary
 
@@ -1412,6 +1414,8 @@ class CourseSummary(object):
 
         display_organization (unicode|None): Course organization that is specified & appears in the courseware
 
+        end (unicode|None): Course end date.  Must contain timezone.
+
         """
         self.display_coursenumber = display_coursenumber
         self.display_organization = display_organization
@@ -1419,6 +1423,9 @@ class CourseSummary(object):
 
         self.id = course_locator  # pylint: disable=invalid-name
         self.location = course_locator.make_usage_key('course', 'course')
+        self.end = end
+        if end is not None and not isinstance(end, datetime):
+            self.end = dateutil.parser.parse(end)
 
     @property
     def display_org_with_default(self):
@@ -1439,3 +1446,9 @@ class CourseSummary(object):
         if self.display_coursenumber:
             return self.display_coursenumber
         return self.location.course
+
+    def has_ended(self):
+        """
+        Returns whether the course has ended.
+        """
+        return course_metadata_utils.has_course_ended(self.end)
diff --git a/common/lib/xmodule/xmodule/library_content_module.py b/common/lib/xmodule/xmodule/library_content_module.py
index 7e52ba15f5..f11033e1a7 100644
--- a/common/lib/xmodule/xmodule/library_content_module.py
+++ b/common/lib/xmodule/xmodule/library_content_module.py
@@ -624,7 +624,7 @@ class LibraryContentDescriptor(LibraryContentFields, MakoModuleDescriptor, XmlDe
         ]
         definition = {
             attr_name: json.loads(attr_value)
-            for attr_name, attr_value in xml_object.attrib
+            for attr_name, attr_value in xml_object.attrib.items()
         }
         return definition, children
 
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
index b25a07415b..ef72921691 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
@@ -40,7 +40,7 @@ from xblock.test.tools import TestRuntime
 if not settings.configured:
     settings.configure()
 
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator, LibraryLocator
 from xmodule.exceptions import InvalidVersionError
 from xmodule.modulestore import ModuleStoreEnum
@@ -323,7 +323,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup):
         )
         # try an unknown mapping, it should be the 'default' store
         self.assertEqual(self.store.get_modulestore_type(
-            SlashSeparatedCourseKey('foo', 'bar', '2012_Fall')), default_ms
+            CourseKey.from_string('foo/bar/2012_Fall')), default_ms
         )
 
     @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split)
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
index 90b6fd395b..57423b4170 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
@@ -29,7 +29,7 @@ from opaque_keys.edx.locations import Location
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.mongo import MongoKeyValueStore
 from xmodule.modulestore.draft import DraftModuleStore
-from opaque_keys.edx.locations import SlashSeparatedCourseKey, AssetLocation
+from opaque_keys.edx.locations import AssetLocation
 from opaque_keys.edx.locator import LibraryLocator, CourseLocator
 from opaque_keys.edx.keys import UsageKey
 from xmodule.modulestore.xml_exporter import export_course_to_xml
@@ -160,7 +160,7 @@ class TestMongoModuleStoreBase(unittest.TestCase):
                 static_content_store=content_store,
                 do_import_static=False,
                 verbose=True,
-                target_id=SlashSeparatedCourseKey('guestx', 'foo', 'bar')
+                target_id=CourseKey.from_string('guestx/foo/bar')
             )
 
         return content_store, draft_store
@@ -216,7 +216,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
 
         for course_key in [
 
-            SlashSeparatedCourseKey(*fields)
+            CourseKey.from_string('/'.join(fields))
             for fields in [
                 ['edX', 'simple', '2012_Fall'],
                 ['edX', 'simple_with_draft', '2012_Fall'],
@@ -230,8 +230,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
             course = self.draft_store.get_course(course_key)
             assert_not_none(course)
             assert_true(self.draft_store.has_course(course_key))
-            mix_cased = SlashSeparatedCourseKey(
-                course_key.org.upper(), course_key.course.upper(), course_key.run.lower()
+            mix_cased = CourseKey.from_string(
+                '/'.join([course_key.org.upper(), course_key.course.upper(), course_key.run.lower()])
             )
             assert_false(self.draft_store.has_course(mix_cased))
             assert_true(self.draft_store.has_course(mix_cased, ignore_case=True))
@@ -247,7 +247,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         course_ids = [course.id for course in courses]
 
         for course_key in [
-            SlashSeparatedCourseKey(*fields)
+            CourseKey.from_string('/'.join(fields))
             for fields in [
                 ['guestx', 'foo', 'bar']
             ]
@@ -259,7 +259,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         course_ids = [course.id for course in courses]
 
         for course_key in [
-            SlashSeparatedCourseKey(*fields)
+            CourseKey.from_string('/'.join(fields))
             for fields in [
                 ['edX', 'simple', '2012_Fall'],
                 ['edX', 'simple_with_draft', '2012_Fall'],
@@ -276,7 +276,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         """
         for course_key in [
 
-            SlashSeparatedCourseKey(*fields)
+            CourseKey.from_string('/'.join(fields))
             for fields in [
                 ['edX', 'simple', 'no_such_course'], ['edX', 'no_such_course', '2012_Fall'],
                 ['NO_SUCH_COURSE', 'Test_iMport_courSe', '2012_Fall'],
@@ -285,8 +285,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
             course = self.draft_store.get_course(course_key)
             assert_is_none(course)
             assert_false(self.draft_store.has_course(course_key))
-            mix_cased = SlashSeparatedCourseKey(
-                course_key.org.lower(), course_key.course.upper(), course_key.run.upper()
+            mix_cased = CourseKey.from_string(
+                '/'.join([course_key.org.lower(), course_key.course.upper(), course_key.run.upper()])
             )
             assert_false(self.draft_store.has_course(mix_cased))
             assert_false(self.draft_store.has_course(mix_cased, ignore_case=True))
@@ -449,13 +449,13 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         for course_number in self.courses:
             course_locations = self.draft_store.get_courses_for_wiki(course_number)
             assert_equals(len(course_locations), 1)
-            assert_equals(SlashSeparatedCourseKey('edX', course_number, '2012_Fall'), course_locations[0])
+            assert_equals(CourseKey.from_string('/'.join(['edX', course_number, '2012_Fall'])), course_locations[0])
 
         course_locations = self.draft_store.get_courses_for_wiki('no_such_wiki')
         assert_equals(len(course_locations), 0)
 
         # set toy course to share the wiki with simple course
-        toy_course = self.draft_store.get_course(SlashSeparatedCourseKey('edX', 'toy', '2012_Fall'))
+        toy_course = self.draft_store.get_course(CourseKey.from_string('edX/toy/2012_Fall'))
         toy_course.wiki_slug = 'simple'
         self.draft_store.update_item(toy_course, ModuleStoreEnum.UserID.test)
 
@@ -467,23 +467,23 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         course_locations = self.draft_store.get_courses_for_wiki('simple')
         assert_equals(len(course_locations), 2)
         for course_number in ['toy', 'simple']:
-            assert_in(SlashSeparatedCourseKey('edX', course_number, '2012_Fall'), course_locations)
+            assert_in(CourseKey.from_string('/'.join(['edX', course_number, '2012_Fall'])), course_locations)
 
         # configure simple course to use unique wiki_slug.
-        simple_course = self.draft_store.get_course(SlashSeparatedCourseKey('edX', 'simple', '2012_Fall'))
+        simple_course = self.draft_store.get_course(CourseKey.from_string('edX/simple/2012_Fall'))
         simple_course.wiki_slug = 'edX.simple.2012_Fall'
         self.draft_store.update_item(simple_course, ModuleStoreEnum.UserID.test)
         # it should be retrievable with its new wiki_slug
         course_locations = self.draft_store.get_courses_for_wiki('edX.simple.2012_Fall')
         assert_equals(len(course_locations), 1)
-        assert_in(SlashSeparatedCourseKey('edX', 'simple', '2012_Fall'), course_locations)
+        assert_in(CourseKey.from_string('edX/simple/2012_Fall'), course_locations)
 
     @XBlock.register_temp_plugin(ReferenceTestXBlock, 'ref_test')
     def test_reference_converters(self):
         """
         Test that references types get deserialized correctly
         """
-        course_key = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        course_key = CourseKey.from_string('edX/toy/2012_Fall')
 
         def setup_test():
             course = self.draft_store.get_course(course_key)
@@ -563,7 +563,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         Test to make sure that we have a course image in the contentstore,
         then export it to ensure it gets copied to both file locations.
         """
-        course_key = SlashSeparatedCourseKey('edX', 'simple', '2012_Fall')
+        course_key = CourseKey.from_string('edX/simple/2012_Fall')
         location = course_key.make_asset_key('asset', 'images_course_image.jpg')
 
         # This will raise if the course image is missing
@@ -581,7 +581,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         Make sure that if a non-default image path is specified that we
         don't export it to the static default location
         """
-        course = self.draft_store.get_course(SlashSeparatedCourseKey('edX', 'toy', '2012_Fall'))
+        course = self.draft_store.get_course(CourseKey.from_string('edX/toy/2012_Fall'))
         assert_true(course.course_image, 'just_a_test.jpg')
 
         root_dir = path(mkdtemp())
@@ -595,7 +595,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         Make sure we elegantly passover our code when there isn't a static
         image
         """
-        course = self.draft_store.get_course(SlashSeparatedCourseKey('edX', 'simple_with_draft', '2012_Fall'))
+        course = self.draft_store.get_course(CourseKey.from_string('edX/simple_with_draft/2012_Fall'))
         root_dir = path(mkdtemp())
         self.addCleanup(shutil.rmtree, root_dir)
         export_course_to_xml(self.draft_store, self.content_store, course.id, root_dir, 'test_export')
@@ -619,7 +619,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase):
         course = 'tree{}'.format(name)
         run = name
 
-        if not self.draft_store.has_course(SlashSeparatedCourseKey(org, course, run)):
+        if not self.draft_store.has_course(CourseKey.from_string('/'.join[org, course, run])):
             self.draft_store.create_course(org, course, run, user_id)
 
             locations = {
@@ -755,7 +755,7 @@ class TestMongoKeyValueStore(unittest.TestCase):
     def setUp(self):
         super(TestMongoKeyValueStore, self).setUp()
         self.data = {'foo': 'foo_value'}
-        self.course_id = SlashSeparatedCourseKey('org', 'course', 'run')
+        self.course_id = CourseKey.from_string('org/course/run')
         self.parent = self.course_id.make_usage_key('parent', 'p')
         self.children = [self.course_id.make_usage_key('child', 'a'), self.course_id.make_usage_key('child', 'b')]
         self.metadata = {'meta': 'meta_val'}
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py b/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py
index 8bf1446300..f70f209241 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py
@@ -211,7 +211,7 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase):
         """
         def verify_course_summery_fields(course_summary):
             """ Verify that every `course_summary` object has all the required fields """
-            expected_fields = CourseSummary.course_info_fields + ['id', 'location']
+            expected_fields = CourseSummary.course_info_fields + ['id', 'location', 'has_ended']
             return all([hasattr(course_summary, field) for field in expected_fields])
 
         self.assertTrue(all(verify_course_summery_fields(course_summary) for course_summary in course_summaries))
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py
index 4da26acfd0..1407885741 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py
@@ -12,7 +12,8 @@ from xmodule.modulestore import ModuleStoreEnum
 from xmodule.x_module import XModuleMixin
 
 from xmodule.tests import DATA_DIR
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locator import CourseLocator
 from xmodule.modulestore.tests.test_modulestore import check_has_course_method
 
 
@@ -51,13 +52,13 @@ class TestXMLModuleStore(unittest.TestCase):
             load_error_modules=False)
 
         # Look up the errors during load. There should be none.
-        errors = modulestore.get_course_errors(SlashSeparatedCourseKey("edX", "toy", "2012_Fall"))
+        errors = modulestore.get_course_errors(CourseKey.from_string("edX/toy/2012_Fall"))
         assert errors == []
 
     @patch("xmodule.modulestore.xml.glob.glob", side_effect=glob_tildes_at_end)
     def test_tilde_files_ignored(self, _fake_glob):
         modulestore = XMLModuleStore(DATA_DIR, source_dirs=['tilde'], load_error_modules=False)
-        about_location = SlashSeparatedCourseKey('edX', 'tilde', '2012_Fall').make_usage_key(
+        about_location = CourseKey.from_string('edX/tilde/2012_Fall').make_usage_key(
             'about', 'index',
         )
         about_module = modulestore.get_item(about_location)
@@ -78,7 +79,7 @@ class TestXMLModuleStore(unittest.TestCase):
         self.assertEqual(len(course_locations), 0)
 
         # now set toy course to share the wiki with simple course
-        toy_course = store.get_course(SlashSeparatedCourseKey('edX', 'toy', '2012_Fall'))
+        toy_course = store.get_course(CourseKey.from_string('edX/toy/2012_Fall'))
         toy_course.wiki_slug = 'simple'
 
         course_locations = store.get_courses_for_wiki('toy')
@@ -87,7 +88,7 @@ class TestXMLModuleStore(unittest.TestCase):
         course_locations = store.get_courses_for_wiki('simple')
         self.assertEqual(len(course_locations), 2)
         for course_number in ['toy', 'simple']:
-            self.assertIn(SlashSeparatedCourseKey('edX', course_number, '2012_Fall'), course_locations)
+            self.assertIn(CourseKey.from_string('/'.join(['edX', course_number, '2012_Fall'])), course_locations)
 
     def test_has_course(self):
         """
@@ -95,8 +96,8 @@ class TestXMLModuleStore(unittest.TestCase):
         """
         check_has_course_method(
             XMLModuleStore(DATA_DIR, source_dirs=['toy', 'simple']),
-            SlashSeparatedCourseKey('edX', 'toy', '2012_Fall'),
-            locator_key_fields=SlashSeparatedCourseKey.KEY_FIELDS
+            CourseKey.from_string('edX/toy/2012_Fall'),
+            locator_key_fields=CourseLocator.KEY_FIELDS
         )
 
     def test_branch_setting(self):
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py b/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py
index 6cc5913374..bb9e5f3e65 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py
@@ -11,7 +11,7 @@ from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.inheritance import InheritanceMixin
 from xmodule.modulestore.xml_importer import _update_and_import_module, _update_module_location
 from xmodule.modulestore.tests.mongo_connection import MONGO_PORT_NUM, MONGO_HOST
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from xmodule.tests import DATA_DIR
 from uuid import uuid4
 import unittest
@@ -143,7 +143,7 @@ class RemapNamespaceTest(ModuleStoreNoSettings):
         self.xblock.save()
 
         # Move to different runtime w/ different course id
-        target_location_namespace = SlashSeparatedCourseKey("org", "course", "run")
+        target_location_namespace = CourseKey.from_string("org/course/run")
         new_version = _update_and_import_module(
             self.xblock,
             modulestore(),
diff --git a/common/lib/xmodule/xmodule/tests/test_error_module.py b/common/lib/xmodule/xmodule/tests/test_error_module.py
index a59cc56452..34c558e3cc 100644
--- a/common/lib/xmodule/xmodule/tests/test_error_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_error_module.py
@@ -5,7 +5,8 @@ import unittest
 from xmodule.tests import get_test_system
 from xmodule.error_module import ErrorDescriptor, ErrorModule, NonStaffErrorDescriptor
 from xmodule.modulestore.xml import CourseLocationManager
-from opaque_keys.edx.locations import SlashSeparatedCourseKey, Location
+from opaque_keys.edx.locator import CourseLocator
+from opaque_keys.edx.locations import Location
 from xmodule.x_module import XModuleDescriptor, XModule, STUDENT_VIEW
 from mock import MagicMock, Mock, patch
 from xblock.runtime import Runtime, IdReader
@@ -19,7 +20,7 @@ class SetupTestErrorModules(unittest.TestCase):
     def setUp(self):
         super(SetupTestErrorModules, self).setUp()
         self.system = get_test_system()
-        self.course_id = SlashSeparatedCourseKey('org', 'course', 'run')
+        self.course_id = CourseLocator('org', 'course', 'run')
         self.location = self.course_id.make_usage_key('foo', 'bar')
         self.valid_xml = u"<problem>ABC \N{SNOWMAN}</problem>"
         self.error_msg = "Error"
diff --git a/common/lib/xmodule/xmodule/tests/test_html_module.py b/common/lib/xmodule/xmodule/tests/test_html_module.py
index 2b272487ff..ec2413907c 100644
--- a/common/lib/xmodule/xmodule/tests/test_html_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_html_module.py
@@ -1,7 +1,7 @@
 import unittest
 
 from mock import Mock
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
 
@@ -15,7 +15,7 @@ def instantiate_descriptor(**field_data):
     Instantiate descriptor with most properties.
     """
     system = get_test_descriptor_system()
-    course_key = SlashSeparatedCourseKey('org', 'course', 'run')
+    course_key = CourseLocator('org', 'course', 'run')
     usage_key = course_key.make_usage_key('html', 'SampleHtml')
     return system.construct_xblock_from_class(
         HtmlDescriptor,
diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index f557d7959a..cd752004eb 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -19,6 +19,7 @@ from xmodule.x_module import XModuleMixin
 from xmodule.fields import Date
 from xmodule.tests import DATA_DIR
 from xmodule.modulestore.inheritance import InheritanceMixin
+from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 from xblock.core import XBlock
@@ -576,7 +577,7 @@ class ImportTestCase(BaseCourseTestCase):
 
         modulestore = XMLModuleStore(DATA_DIR, source_dirs=['toy'])
 
-        toy_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        toy_id = CourseKey.from_string('edX/toy/2012_Fall')
 
         course = modulestore.get_course(toy_id)
         chapters = course.get_children()
@@ -654,7 +655,7 @@ class ImportTestCase(BaseCourseTestCase):
         """
         modulestore = XMLModuleStore(DATA_DIR, source_dirs=['toy'])
 
-        toy_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        toy_id = CourseKey.from_string('edX/toy/2012_Fall')
 
         course = modulestore.get_course(toy_id)
 
diff --git a/common/lib/xmodule/xmodule/tests/test_import_static.py b/common/lib/xmodule/xmodule/tests/test_import_static.py
index 10de01d2a1..68b7d9d073 100644
--- a/common/lib/xmodule/xmodule/tests/test_import_static.py
+++ b/common/lib/xmodule/xmodule/tests/test_import_static.py
@@ -4,7 +4,7 @@ Tests that check that we ignore the appropriate files when importing courses.
 import unittest
 from mock import Mock
 from xmodule.modulestore.xml_importer import import_static_content
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from xmodule.tests import DATA_DIR
 
 
@@ -12,7 +12,7 @@ class IgnoredFilesTestCase(unittest.TestCase):
     "Tests for ignored files"
     def test_ignore_tilde_static_files(self):
         course_dir = DATA_DIR / "tilde"
-        course_id = SlashSeparatedCourseKey("edX", "tilde", "Fall_2012")
+        course_id = CourseLocator("edX", "tilde", "Fall_2012")
         content_store = Mock()
         content_store.generate_thumbnail.return_value = ("content", "location")
         import_static_content(course_dir, content_store, course_id)
@@ -27,7 +27,7 @@ class IgnoredFilesTestCase(unittest.TestCase):
         Test for ignored Mac OS metadata files (filename starts with "._")
         """
         course_dir = DATA_DIR / "dot-underscore"
-        course_id = SlashSeparatedCourseKey("edX", "dot-underscore", "2014_Fall")
+        course_id = CourseLocator("edX", "dot-underscore", "2014_Fall")
         content_store = Mock()
         content_store.generate_thumbnail.return_value = ("content", "location")
         import_static_content(course_dir, content_store, course_id)
diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/common/lib/xmodule/xmodule/tests/test_video.py
index 51c43006b1..45e93fab74 100644
--- a/common/lib/xmodule/xmodule/tests/test_video.py
+++ b/common/lib/xmodule/xmodule/tests/test_video.py
@@ -24,7 +24,7 @@ import ddt
 from django.conf import settings
 from django.test.utils import override_settings
 
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from opaque_keys.edx.keys import CourseKey
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
@@ -92,7 +92,7 @@ def instantiate_descriptor(**field_data):
     Instantiate descriptor with most properties.
     """
     system = get_test_descriptor_system()
-    course_key = SlashSeparatedCourseKey('org', 'course', 'run')
+    course_key = CourseLocator('org', 'course', 'run')
     usage_key = course_key.make_usage_key('video', 'SampleProblem')
     return system.construct_xblock_from_class(
         VideoDescriptor,
diff --git a/common/lib/xmodule/xmodule/tests/xml/__init__.py b/common/lib/xmodule/xmodule/tests/xml/__init__.py
index 2c777c69c6..000d5e4606 100644
--- a/common/lib/xmodule/xmodule/tests/xml/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/xml/__init__.py
@@ -9,7 +9,7 @@ from unittest import TestCase
 from xmodule.x_module import XMLParsingSystem, policy_key
 from xmodule.mako_module import MakoDescriptorSystem
 from xmodule.modulestore.xml import CourseLocationManager
-from opaque_keys.edx.locations import SlashSeparatedCourseKey, Location
+from opaque_keys.edx.keys import CourseKey
 
 from xblock.runtime import KvsFieldData, DictKeyValueStore
 
@@ -19,7 +19,7 @@ class InMemorySystem(XMLParsingSystem, MakoDescriptorSystem):  # pylint: disable
     The simplest possible XMLParsingSystem
     """
     def __init__(self, xml_import_data):
-        self.course_id = SlashSeparatedCourseKey.from_deprecated_string(xml_import_data.course_id)
+        self.course_id = CourseKey.from_string(xml_import_data.course_id)
         self.default_class = xml_import_data.default_class
         self._descriptors = {}
 
diff --git a/common/static/common/js/utils/edx.utils.validate.js b/common/static/common/js/utils/edx.utils.validate.js
index a6af7aedff..94dff74add 100644
--- a/common/static/common/js/utils/edx.utils.validate.js
+++ b/common/static/common/js/utils/edx.utils.validate.js
@@ -21,7 +21,7 @@
                 var _fn = {
                     validate: {
 
-                        template: _.template('<li><%= content %></li>'),
+                        template: _.template('<li><%- content %></li>'),
 
                         msg: {
                             email: gettext("The email address you've provided isn't formatted correctly."),
@@ -107,7 +107,7 @@
                             regex: new RegExp(
                             [
                                 '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+)*',
-                                '|^"([\\001-\\010\\013\\014\\016-\\037!#-\\[\\]-\\177]|\\\\[\\001-\\011\\013\\014\\016-\\177])*"',
+                                '|^"([\\001-\\010\\013\\014\\016-\\037!#-\\[\\]-\\177]|\\\\[\\001-\\011\\013\\014\\016-\\177])*"', // eslint-disable-line max-len
                                 ')@((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\\.)+[A-Z]{2,6}\\.?$)',
                                 '|\\[(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\]$'
                             ].join(''), 'i'
@@ -124,7 +124,7 @@
 
                         getLabel: function(id) {
                         // Extract the field label, remove the asterisk (if it appears) and any extra whitespace
-                            return $('label[for=' + id + ']').text().split('*')[0].trim();
+                            return $('label[for=' + id + '] > span.label-text').text().split('*')[0].trim();
                         },
 
                         getMessage: function($el, tests) {
@@ -132,16 +132,21 @@
                                 label,
                                 context,
                                 content,
-                                customMsg;
+                                customMsg,
+                                liveValidationMsg;
 
                             _.each(tests, function(value, key) {
                                 if (!value) {
                                     label = _fn.validate.getLabel($el.attr('id'));
                                     customMsg = $el.data('errormsg-' + key) || false;
+                                    liveValidationMsg =
+                                        $('#' + $el.attr('id') + '-validation-error-msg').text() || false;
 
                                 // If the field has a custom error msg attached, use it
                                     if (customMsg) {
                                         content = customMsg;
+                                    } else if (liveValidationMsg) {
+                                        content = liveValidationMsg;
                                     } else {
                                         context = {field: label};
 
@@ -154,7 +159,9 @@
                                         content = _.sprintf(_fn.validate.msg[key], context);
                                     }
 
-                                    txt.push(_fn.validate.template({content: content}));
+                                    txt.push(_fn.validate.template({
+                                        content: content
+                                    }));
                                 }
                             });
 
@@ -173,7 +180,7 @@
                 return {
                     validate: _fn.validate.field
                 };
-            })();
+            }());
 
             return utils;
         });
diff --git a/common/test/acceptance/pages/lms/instructor_dashboard.py b/common/test/acceptance/pages/lms/instructor_dashboard.py
index 6b59e6ac00..ea0f7b0a1f 100644
--- a/common/test/acceptance/pages/lms/instructor_dashboard.py
+++ b/common/test/acceptance/pages/lms/instructor_dashboard.py
@@ -119,9 +119,11 @@ class InstructorDashboardPage(CoursePage):
         return ecommerce_section
 
     def is_rescore_unsupported_message_visible(self):
-        return u'This component cannot be rescored.' in unicode(
-            self.q(css='.request-response-error').html
-        )
+        if (self.q(css='.request-response-error').present):
+            return u'This component cannot be rescored.' in unicode(
+                self.q(css='.request-response-error').html
+            )
+        return False
 
     @staticmethod
     def get_asset_path(file_name):
diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py
index 116068681a..b0ef31309d 100644
--- a/common/test/acceptance/tests/lms/test_lms.py
+++ b/common/test/acceptance/tests/lms/test_lms.py
@@ -344,10 +344,7 @@ class RegisterFromCombinedPageTest(UniqueCourseTest):
         # Verify that the expected errors are displayed.
         errors = self.register_page.wait_for_errors()
         self.assertIn(u'Please enter your Public Username.', errors)
-        self.assertIn(
-            u'You must agree to the édX Terms of Service and Honor Code',
-            errors
-        )
+        self.assertIn(u'You must agree to the édX Terms of Service and Honor Code', errors)
         self.assertIn(u'Please select your Country.', errors)
         self.assertIn(u'Please tell us your favorite movie.', errors)
 
diff --git a/common/test/acceptance/tests/lms/test_lms_courseware.py b/common/test/acceptance/tests/lms/test_lms_courseware.py
index e86fd7e78d..1219ddd1a8 100644
--- a/common/test/acceptance/tests/lms/test_lms_courseware.py
+++ b/common/test/acceptance/tests/lms/test_lms_courseware.py
@@ -285,6 +285,7 @@ class ProctoredExamTest(UniqueCourseTest):
         self.assertTrue(self.courseware_page.is_timer_bar_present)
 
         self.courseware_page.stop_timed_exam()
+        self.courseware_page.wait_for_page()
         self.assertTrue(self.courseware_page.has_submitted_exam_message())
 
         LogoutPage(self.browser).visit()
diff --git a/common/test/acceptance/tests/lms/test_lms_dashboard.py b/common/test/acceptance/tests/lms/test_lms_dashboard.py
index 06f0aaa768..62c3562f72 100644
--- a/common/test/acceptance/tests/lms/test_lms_dashboard.py
+++ b/common/test/acceptance/tests/lms/test_lms_dashboard.py
@@ -158,8 +158,6 @@ class LmsDashboardPageTest(BaseLmsDashboardTest):
                        "%3Futm_campaign%3Dsocial-sharing%26utm_medium%3Dsocial-post%26utm_source%3Dtwitter")
         self.assertEqual(twitter_widget.attrs('title')[0], 'Share on Twitter')
         self.assertEqual(twitter_widget.attrs('data-tooltip')[0], 'Share on Twitter')
-        self.assertEqual(twitter_widget.attrs('aria-haspopup')[0], 'true')
-        self.assertEqual(twitter_widget.attrs('aria-expanded')[0], 'false')
         self.assertEqual(twitter_widget.attrs('target')[0], '_blank')
         self.assertIn(twitter_url, twitter_widget.attrs('href')[0])
         self.assertIn(twitter_url, twitter_widget.attrs('onclick')[0])
@@ -170,8 +168,6 @@ class LmsDashboardPageTest(BaseLmsDashboardTest):
                         "quote=I%27m+taking+Test")
         self.assertEqual(facebook_widget.attrs('title')[0], 'Share on Facebook')
         self.assertEqual(facebook_widget.attrs('data-tooltip')[0], 'Share on Facebook')
-        self.assertEqual(facebook_widget.attrs('aria-haspopup')[0], 'true')
-        self.assertEqual(facebook_widget.attrs('aria-expanded')[0], 'false')
         self.assertEqual(facebook_widget.attrs('target')[0], '_blank')
         self.assertIn(facebook_url, facebook_widget.attrs('href')[0])
         self.assertIn(facebook_url, facebook_widget.attrs('onclick')[0])
diff --git a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
index fe1147f7a1..287b665f09 100644
--- a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
+++ b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
@@ -395,8 +395,8 @@ class ProctoredExamsTest(BaseInstructorDashboardTest):
 
         # Stop the timed exam.
         self.courseware_page.stop_timed_exam()
+        LogoutPage(self.browser).visit()
 
-    @skip("EDUCATOR-949")
     def test_can_add_remove_allowance(self):
         """
         Make sure that allowances can be added and removed.
@@ -426,7 +426,6 @@ class ProctoredExamsTest(BaseInstructorDashboardTest):
         # Then, the added record should be visible
         self.assertTrue(allowance_section.is_allowance_record_visible)
 
-    @skip("EDUCATOR-551, EDUCATOR-949")
     def test_can_reset_attempts(self):
         """
         Make sure that Exam attempts are visible and can be reset.
@@ -1375,7 +1374,6 @@ class StudentAdminTest(BaseInstructorDashboardTest):
         self.username, _ = self.log_in_as_instructor()
         self.instructor_dashboard_page = self.visit_instructor_dashboard()
 
-    @skip("EDUCATOR-552, EDUCATOR-949")
     def test_rescore_nonrescorable(self):
         student_admin_section = self.instructor_dashboard_page.select_student_admin(StudentSpecificAdmin)
         student_admin_section.set_student_email_or_username(self.username)
diff --git a/conf/locale/ar/LC_MESSAGES/django.mo b/conf/locale/ar/LC_MESSAGES/django.mo
index 7b9ef1cf80..b467626ee8 100644
Binary files a/conf/locale/ar/LC_MESSAGES/django.mo and b/conf/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po
index 919fb47fe6..a02164c2c8 100644
--- a/conf/locale/ar/LC_MESSAGES/django.po
+++ b/conf/locale/ar/LC_MESSAGES/django.po
@@ -136,7 +136,7 @@
 # طاهر <charaf.le.prince@gmail.com>, 2014
 # e2f_ar r3 <e2f_ar_r3@outlook.com>, 2017
 # e2f_ar t3 <e2f_ar_t3@outlook.com>, 2016
-# Safaa_fadl <fadlaoui_safaa@yahoo.fr>, 2014
+# Safaa_fadl <inactive+Safaa_fadl@transifex.com>, 2014
 # Hassan05 <hassan.upb@gmail.com>, 2014
 # Jad Freij <jkfreij@gmail.com>, 2014
 # Mahmoud Elkhateeb <eng.elkhteeb@gmail.com>, 2013
@@ -146,6 +146,7 @@
 # Najwan Al Rousan <najwanrousan@gmail.com>, 2013
 # Ned Batchelder <ned@edx.org>, 2016
 # Omar Al-Ithawi <oithawi@qrf.org>, 2015-2016
+# Sahbi Gdaiem <sahbi.g@gmail.com>, 2017
 # Sarina Canelake <sarina@edx.org>, 2014
 # shefaa abu jabel <shefaa.aj@gmail.com>, 2016-2017
 # Soha Assali <soha+transifex@qordoba.com>, 2015-2016
@@ -167,7 +168,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-03-16 12:39+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n"
@@ -396,6 +397,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr "لا يمكن لمسار الشهادة الموثقة أن يكون مجانياً "
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "مجّانًا"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -438,6 +461,10 @@ msgstr "المشرف"
 msgid "Moderator"
 msgstr "مشرف المنتدى"
 
+#: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
 #: common/djangoapps/django_comment_common/models.py
 msgid "Community TA"
 msgstr "مساعد أستاذ لشؤون المتعلّمين"
@@ -1945,9 +1972,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr "تعذّر تفسير ’{student_answer}‘ كرقم."
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -2068,6 +2094,11 @@ msgstr "مُقيّم خارجي"
 msgid "Math Expression Input"
 msgstr "إدخال تعبير رياضي"
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2301,6 +2332,10 @@ msgstr "قاموس لحفظ حالة أنواع المدخلات"
 msgid "Dictionary with the current student responses"
 msgstr "قاموس بردود الطالب الحالية"
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr "سواء تم حفظ الإجابات أم لا منذ آخر تقديم"
@@ -2383,6 +2418,8 @@ msgstr ""
 #: lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "إرسال"
@@ -3040,6 +3077,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "منشورات المساق"
 
@@ -5959,6 +5997,15 @@ msgid ""
 msgstr ""
 " بصفتك أحد الطلّاب، لا يمكن عرض هذا النوع من المكوّنات أثناء استعراض المساق."
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "مخطّط المنهج الدراسي"
@@ -5976,27 +6023,28 @@ msgstr "العلامات"
 msgid "Textbooks"
 msgstr "الكتب"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "مجّانًا"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
+msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
@@ -7478,6 +7526,14 @@ msgstr "عمليات تمديد تاريخ الاستحقاق لـ {0} {1} ({2})
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr "لا  تدعم جميع مسائل امتحان الدخول ميّزة إعادة التقييم."
@@ -7488,6 +7544,12 @@ msgstr "لا  تدعم جميع مسائل امتحان الدخول ميّزة
 msgid "rescored"
 msgstr "إعادة التقييم"
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -7792,10 +7854,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr "فيما إذا ستُعرض هذه الوحدة في فهرس المحتويات"
@@ -9364,6 +9441,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr "سُجِّل خروجك"
@@ -9406,9 +9488,6 @@ msgstr ""
 "ترغب بمنع هذه الصلاحيات، انقر على زر \"إلغاء\"."
 
 #: lms/templates/oauth2_provider/authorize.html
-#: cms/templates/course-create-rerun.html cms/templates/index.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -9426,10 +9505,8 @@ msgstr "حدث خطأ"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
+" user account at %(platform_name)s."
 msgstr ""
-"وصلتك رسالة البريد الالكتروني هذه بناءً على طلبك بتغيير كلمة المرور لحسابك "
-"على %(site_name)s."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -9550,7 +9627,6 @@ msgstr "معاينة"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "إغلاق "
@@ -9817,6 +9893,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -10239,6 +10317,22 @@ msgstr "إعادة تعيين اللغة على رمز اللغة الافترا
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr "إعادة تعيين اللغة على تفضيل المستخدم: {preview_language_code}"
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -10375,6 +10469,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr "فعّل ميزة تحسين الصفحة الرئيسية للمساق."
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -10617,6 +10730,11 @@ msgstr "يجب الموافقة على {terms_of_service} الخاصة بمنص
 msgid "Review the Terms of Service"
 msgstr "استعراض شروط الخدمة"
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr "مفتاح الدورة للدورة التدريبية التي تود جعلها تشعبية بشكل تلقائي. "
@@ -11365,7 +11483,7 @@ msgstr "المحتوى"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "جاري التحميل"
 
@@ -11382,6 +11500,16 @@ msgstr "الإعدادات"
 msgid "Course Number"
 msgstr "رقم المساق "
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -11409,7 +11537,6 @@ msgstr "رقم المساق: "
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "المساقات"
 
@@ -11500,11 +11627,14 @@ msgstr "عرض"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr "معاينة إعداد اللغة"
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "إعادة الضبط"
 
@@ -11514,6 +11644,11 @@ msgstr "إعادة الضبط"
 msgid "Legal"
 msgstr "القانوني"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -11597,7 +11732,6 @@ msgid "Usermenu dropdown"
 msgstr "قائمة المستخدم"
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "تسجيل الخروج"
 
@@ -11803,12 +11937,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "العودة إلى {link_start}الصفحة الرئيسية{link_end}."
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "جرت عملية تغيير عنوان البريد الإلكتروني بنجاح!"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr ""
 "سيظهر عنوان بريدك الإلكتروني الجديد في {link_start}لوحة المعلومات{link_end} "
@@ -12819,14 +12951,18 @@ msgid "Add comment"
 msgstr "إضافة تعليق"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "تصحيح أخطاء طاقم المساق"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "العمليات"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr "تغيير عدد محاولات المتعلم إلى صفر"
@@ -12846,6 +12982,10 @@ msgstr "إعادة تقييم ورقة المتعلم"
 msgid "Rescore Only If Score Improves"
 msgstr "إعادة التقييم فقط في حالة تحسن النتيجة"
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "حقول الوحدة الدراسية"
@@ -13064,7 +13204,7 @@ msgstr ""
 "الخاصّة بك {link_end}. أما إذا لم تقصد القيام بذلك، يُمكنك "
 "{undo_link_start}إعادة التسجيل{link_end}."
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "لوحة المعلومات لـ:"
 
@@ -14199,6 +14339,7 @@ msgid "Auto Enroll"
 msgstr "التسجيل الآلي "
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
@@ -14207,6 +14348,7 @@ msgstr ""
 "يتم تسجيلهم بعد في {platform_name} سيتم إدراجهم تلقائياً."
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -14228,6 +14370,7 @@ msgid "Notify users by email"
 msgstr "إعلام المستخدمين عبر البريد الإلكتروني"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -14631,6 +14774,7 @@ msgstr "{span_start}القسم الحالي{span_end}"
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "تاريخ الاستحقاق {date}"
 
@@ -14639,6 +14783,7 @@ msgid "{section_format} due {{date}}"
 msgstr "{section_format} مستحق في {{date}}"
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "جرى تقييم هذا المحتوى"
 
@@ -14788,6 +14933,7 @@ msgstr "خصِّص بحثك"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "محتويات المساق {course_number}"
 
@@ -14800,7 +14946,8 @@ msgstr "خدمات المساق"
 msgid "Courseware"
 msgstr "محتويات المساق"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "العلامات"
 
@@ -14862,6 +15009,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "مرحبًا بك في المساق {course_name} التابع للمؤسسة {org}!"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "تابع المساق"
 
@@ -14878,13 +15027,10 @@ msgid "Handout Navigation"
 msgstr "تصفّح النشرات "
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "أخبار- MITx 6.002x "
@@ -17712,32 +17858,6 @@ msgstr "لذا يرجى توفير تفاصيل كافية لتبرير هذه 
 msgid "Reason"
 msgstr "السبب"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"في حال تم <em>التحقق من  </em> هذا الخيار، فإن المستخدمين الذين لم يقوموا "
-"بالتسجيل بعد على المنصة {platform_name} سيتم إلحاقهم بالمساق تلقائيّاً."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"في حال بقي هذا الخيار <em>دون التحقق منه </em>، فلن يتم إلحاق المستخدمين "
-"الذين لم يقوموا بالتسجيل بعد على المنصة {platform_name} بالمساق، لكن سيسمح "
-"لهم بالتسجيل فور أن يقوموا بإنشاء حساب."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr ""
-"في حال تم <em>التحقق من </em> هذا الخيار، سيتلقى المستخدمون إشعاراً بالبريد "
-"الإلكتروني."
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "تسجيل الطلاب"
@@ -17776,11 +17896,9 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
 msgstr ""
-"في حال تم <em>التحقق من</em> هذا الخيار، فإنّ المستخدمين الذين لم يقوموا "
-"بالتسجيل بعد في المساق، سيتم إلحاقهم به تلقائيّاً."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -17914,16 +18032,30 @@ msgid "Add Moderator"
 msgstr "إضافة مشرف للمنتدى "
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "مساعدو مشرفي منتدى النقاش"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -18167,9 +18299,8 @@ msgid "View a specific learner's grades and progress"
 msgstr "عرض علامات وتقدم أحد الطلاب."
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
-"عنوان البريد الإلكتروني {platform_name} للمتعلم أو اسم المستخدم الخاص به *"
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Learner email address or username"
@@ -18184,8 +18315,8 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr "تعديل درجات الطالب في مسألة محددة"
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
-msgstr "موقع المسألة في الدورة *"
+msgid "Location of problem in course"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Example"
@@ -18222,6 +18353,23 @@ msgstr ""
 " في حالة تحسن النتيجة\" بتحديث نتيجة الطالب فقط في حالة تغير النتيجة لصالح "
 "الطالب."
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr "تاريخ المسألة"
@@ -18344,7 +18492,6 @@ msgstr "تفاصيل البرنامج"
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr "البرامج"
 
@@ -18367,28 +18514,9 @@ msgid ""
 msgstr ""
 "لم تجد لغتك المفضّلة؟ {link_start}تطوّع لتقوم بدور المترجم! {link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "تأكيد"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "مفتوح بشكل مشروط"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "موافق"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "افتح"
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "المشرف على النظام"
 
@@ -18396,27 +18524,23 @@ msgstr "المشرف على النظام"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "سلّة التسوّق"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr "الصفحة الرئيسية لمنصّة {platform_name}"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "كيفية العمل"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "المدارس"
 
@@ -18427,12 +18551,10 @@ msgstr "استكشاف الدورات التدريبية"
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "تسجيل الدخول"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "عالمي"
 
@@ -19261,7 +19383,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr "تعمل مخدمات المنصة {platform_name} حالياً بمستوى تحميل يتجاوز طاقتها"
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "إعدادات الحساب"
 
@@ -19273,40 +19394,6 @@ msgstr "يرجى الانتظار"
 msgid "Sign in or Register"
 msgstr "يرجى تسجيل الدخول أو التسجيل"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "الملف الشخصي للمتعلّم"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "الحسابات المترابطة"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "مربوط"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "غير مربوط"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "افصل"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "اربط"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr "دعم الطلاب"
@@ -19510,7 +19597,8 @@ msgstr "العودة إلى لوحة المعلومات"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -19541,6 +19629,134 @@ msgstr ""
 msgid "Add article"
 msgstr "إضافة مقال"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -19587,7 +19803,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "إيجاد المساقات"
 
@@ -19621,18 +19836,6 @@ msgstr ""
 "{tos_link_start}شروط الخدمة{tos_link_end} و{honor_link_start}ميثاق "
 "الشرف{honor_link_end}"
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "قائمة منسدلة لخيارات إضافية"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr "ملفي الشخصي"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr "سجِّل الآن"
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -19820,19 +20023,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr "الملفات والتحميل "
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "عمليات الصفحة"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "تحميل ملف جديد"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "جاري إضافة ملفّات إلى مساقك"
@@ -20048,6 +20246,15 @@ msgstr "حذف هذا المكوِّن"
 msgid "Drag to reorder"
 msgstr "السحب لإعادة الترتيب"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "عمليات الصفحة"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr "فتح محتويات المساق في نظام إدارة التعلّم LMS"
@@ -20306,10 +20513,6 @@ msgstr ""
 " الضوء على مناقشات معيّنة في المنتديات، والإعلان عن التغييرات المُدخلة على "
 "الجدول، والردّ على أسئلة الطلّاب. ويمكنك إضافة تحديثات أو تعديلها بلغة HTML."
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "المخطّط الكلّي للمساق"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -20328,10 +20531,6 @@ msgstr ""
 "الدورة التدريبية؛ إعداد فريق الدورة التدريبية؛ مراجعة تحديثات الدورة "
 "التدريبية وغيرها من الأصول للمواد المؤرخة؛ وتنظيم المناقشات والويكي."
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "رفض العملية"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "تحذير"
@@ -21689,10 +21888,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "المساقات الجاري معالجتها"
@@ -22389,6 +22584,14 @@ msgstr "اليوم الأخير الذي يكون فيه المساق مفعّل
 msgid "Course End Time"
 msgstr "وقت انتهاء المساق"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "تاريخ بدء التسجيل"
@@ -23068,18 +23271,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -23121,8 +23341,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -23288,10 +23508,6 @@ msgstr "تصفّح المساق"
 msgid "Outline"
 msgstr "المخطّط الكلّي"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "التحديثات"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "استيراد"
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.mo b/conf/locale/ar/LC_MESSAGES/djangojs.mo
index 2a330e6c26..719ea97f6c 100644
Binary files a/conf/locale/ar/LC_MESSAGES/djangojs.mo and b/conf/locale/ar/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.po b/conf/locale/ar/LC_MESSAGES/djangojs.po
index 4319030425..b5ce303bff 100644
--- a/conf/locale/ar/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ar/LC_MESSAGES/djangojs.po
@@ -124,8 +124,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-06 15:25+0000\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -235,7 +235,7 @@ msgstr "جاري التحميل"
 #: common/static/common/templates/discussion/alert-popup.underscore
 #: common/static/common/templates/discussion/forum-action-close.underscore
 #: common/static/common/templates/discussion/search-alert.underscore
-#: lms/templates/student_profile/share_modal.underscore
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "إغلاق"
 
@@ -2755,7 +2755,6 @@ msgstr ""
 "اللغة الرئيسية التي يعتمدها أفراد الفريق بشكل أساسي للتواصل فيما بينهم"
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "البلد"
 
@@ -3855,7 +3854,6 @@ msgstr "وسم رمز التسجيل على أنّه غير مستخدم"
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 #: lms/templates/financial-assistance/financial_assessment_form.underscore
 msgid "Username"
 msgstr "اسم المستخدم"
@@ -3868,6 +3866,10 @@ msgstr "البريد الإلكتروني"
 msgid "Revoke access"
 msgstr "إلغاء صلاحيات الوصول"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr "أدخل اسم المستخدم أو البريد الإلكتروني"
@@ -3876,6 +3878,10 @@ msgstr "أدخل اسم المستخدم أو البريد الإلكتروني"
 msgid "Please enter a username or email."
 msgstr "يُرجى إدخال اسم مستخدم او عنوان بريد إلكتروني."
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "نأسف لحدوث خطأ في تغيير صلاحيات المستخدم."
@@ -4281,6 +4287,24 @@ msgstr ""
 "للطالب صاحب الرقم ’<%- student_id %>‘. تأكد من إدخال هذان المُعطيان بشكل "
 "صحيح"
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4488,6 +4512,14 @@ msgstr "تمت بنجاح عملية إعادة تقييم المسألة لتح
 msgid "Failed to rescore problem to improve score for user."
 msgstr "عذراً، لم تنجح عملية إعادة تقييم المسألة بهدف تحسين نتيجة المستخدم."
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "تعذّر حفظ البيانات."
@@ -4728,7 +4760,6 @@ msgid "Year of Birth"
 msgstr "سنة الميلاد"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "اللغة المفضّلة"
 
@@ -4848,84 +4879,6 @@ msgstr "معلومات الحساب"
 msgid "Order History"
 msgstr "المشتريات السابقة"
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "ترقيم صفحات الإنجازات"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "يمكن للمتعلّمين في منصّة {platform_name} رؤية:"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "ملفّي الشخصي المحدود"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "كامل ملفّي الشخصي"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "إضافة البلد"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "إضافة اللغة"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "نبذة عني"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr ""
-"تفضّل بإعطاء المتعلّمين الآخرين فكرة عامة عنك: مكان سكنك، اهتماماتك، سبب "
-"التحاقك بهذه المساقات، أو ما ترغب في تعلّمه."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "صفحة إعدادات الحساب"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-"يجب أن تحدّد سنة ميلادك قبل أن تتمكّن من مشاركة صفحتك الشخصية بأكملها. "
-"ولتحدّد سنة ميلادك، يُرجى الانتقال إلى صفحة إعدادات الحساب "
-"{account_settings_page_link}."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"يجب أن يكون عمرك ما فوق 13 سنة لتتمكّن من مشاركة صفحتك الشخصية بأكملها. فإذا"
-" كان عمرك ما فوق 13 سنة، يُرجى التأكّد من أنّك حدّدت سنة ميلادك في صفحة "
-"الإعدادات {account_settings_page_link}."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "صورة الملف الشخصي"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "صورة الصفحة الشخصية للمستخدم {username}"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr "نبذة عنّي"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "الإنجازات"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr "الملف الشخصي"
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "نأسف لحدوث خطأ في تحميل الصورة"
@@ -5394,6 +5347,11 @@ msgstr "يجب أن يأتي تاريخ انتهاء المساق بعد تار
 msgid "The course start date must be later than the enrollment start date."
 msgstr "يجب أن يأتي تاريخ بدء المساق بعد تاريخ التسجيل فيه."
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -5467,6 +5425,10 @@ msgstr ""
 msgid "or"
 msgstr "أو"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "هناك إشكالات في المصادقة على هذا المكوِّن."
@@ -5654,16 +5616,18 @@ msgstr "ليس قيد الاستخدام"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
-msgstr[0] "مستخدم في {count} وحدة"
-msgstr[1] "مستخدم في {count} وحدة"
-msgstr[2] "مستخدم في {count} وحدة"
-msgstr[3] "مستخدم في {count} وحدة"
-msgstr[4] "مستخدم في {count} وحدة"
-msgstr[5] "مستخدم في {count} وحدة"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #. Translators: this refers to a collection of groups.
 #: cms/static/js/views/group_configuration_item.js
@@ -5824,10 +5788,6 @@ msgstr "هل أنت متأكد من رغبتك في تقييد وصول {email}
 msgid "{display_name} Settings"
 msgstr "إعدادات {display_name}"
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr "تغيير الإعدادات لـ  {display_name}"
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr "نشر {display_name}"
@@ -5842,6 +5802,10 @@ msgstr "نشر جميع التغييرات غير المنشورة لهذا {ite
 msgid "Publish"
 msgstr "نشر"
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr "أساسي"
@@ -5855,6 +5819,10 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr "تعديل: %(title)s"
 
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr "الوحدة"
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "مكوِّن"
@@ -5916,7 +5884,8 @@ msgstr "المخطّط الكلّي للمساق"
 msgid "Date added"
 msgstr "تاريخ الإضافة "
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -7113,10 +7082,6 @@ msgstr "تكبير جميع الأقسام"
 msgid "Collapse All"
 msgstr "طي جميع الأقسام"
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr "الوحدة"
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr "تاريخ البدء"
@@ -8017,76 +7982,6 @@ msgstr "أو أنشئ حساباً جديداً باستخدام"
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr "شارك \"%(display_name)s\" جائزتك"
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr "شارك"
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr "%(created)s التي حصلت عليها"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr "ماهو إنجازك القادم؟"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr "ابدآ العمل في اتجاه هدفك التالي."
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr "ابحث عن مادة"
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr "حدث خطأ. حاول تحميل الصفحة مرة أخرى."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr "إنّك حاليًّا تشارك ملفًّا شخصيًّا محدودًا."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr "هذا المتعلم يشارك ملفاً شخصياً محدوداً."
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr "شارك على Mozilla Backpack"
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-"لمشاركة شهادتك على Mozilla Backpack، يجب عليك أولاً إنشاء حساب Backpack. "
-"أكمل الخطوات التالية لإضافة شهادتك إلى Backpack."
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-"أنشئ  حساب  %(link_start)s Mozilla Backpack %(link_end)s، أو سجل دخولك إلى "
-"حسابك الموجود"
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-"%(download_link_start)s حمل الصورة (اضغط زر الفأرة الأيمن، حفظ باسم) "
-"%(link_end)s ومن ثم %(upload_link_start)sحمل%(link_end)s إلى Backpack.</li>"
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8671,6 +8566,76 @@ msgstr "عذرًا، لا توجد أي نتائج."
 msgid "Back to Dashboard"
 msgstr "العودة إلى لوحة المعلومات"
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr "شارك \"%(display_name)s\" جائزتك"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr "شارك"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr "%(created)s التي حصلت عليها"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr "ماهو إنجازك القادم؟"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr "ابدآ العمل في اتجاه هدفك التالي."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr "ابحث عن مادة"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr "حدث خطأ. حاول تحميل الصفحة مرة أخرى."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr "إنّك حاليًّا تشارك ملفًّا شخصيًّا محدودًا."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr "هذا المتعلم يشارك ملفاً شخصياً محدوداً."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr "شارك على Mozilla Backpack"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+"لمشاركة شهادتك على Mozilla Backpack، يجب عليك أولاً إنشاء حساب Backpack. "
+"أكمل الخطوات التالية لإضافة شهادتك إلى Backpack."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+"أنشئ  حساب  %(link_start)s Mozilla Backpack %(link_end)s، أو سجل دخولك إلى "
+"حسابك الموجود"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+"%(download_link_start)s حمل الصورة (اضغط زر الفأرة الأيمن، حفظ باسم) "
+"%(link_end)s ومن ثم %(upload_link_start)sحمل%(link_end)s إلى Backpack.</li>"
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr "الحدّ من صلاحية الوصول"
@@ -8919,6 +8884,20 @@ msgstr "تفعيل"
 msgid "Deactivate"
 msgstr "تعطيل"
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -9089,6 +9068,10 @@ msgstr "لن يجري إصدار الوحدات غير المنشورة"
 msgid "Unpublished changes to content that will release in the future"
 msgstr "تغييرات غير منشورة جرى إدخالها على المحتوى وسيجري إصدارها مستقبليًّا"
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -9634,12 +9617,6 @@ msgstr "مع %(section_or_subsection)s"
 msgid "Staff and Learners"
 msgstr "الموظفون والمتعلمون"
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9924,6 +9901,32 @@ msgstr ""
 "حدّد أي قواعد إضافية أو استنثاءات القواعد التي يجب أن تُطبّق عند مراجعة "
 "مقاطع الفيديو. مثال، يمكنك نحديد فيما إذا كانت الآلات الحاسبة مسموحة."
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr "جرى تحميل الملف بنجاح"
@@ -9964,9 +9967,9 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
-msgstr "تعديل الاسم"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
+msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
 #, python-format
diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po
index 7246b9dd6e..fbf7872c49 100644
--- a/conf/locale/en/LC_MESSAGES/django.po
+++ b/conf/locale/en/LC_MESSAGES/django.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-20 11:48+0000\n"
-"PO-Revision-Date: 2017-07-20 11:48:32.252217\n"
+"POT-Creation-Date: 2017-08-02 12:48+0000\n"
+"PO-Revision-Date: 2017-08-02 12:48:04.261143\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -248,6 +248,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr ""
 
+#. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (0.1a)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr ""
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr ""
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -308,31 +330,6 @@ msgstr ""
 msgid "User profile"
 msgstr ""
 
-#: common/djangoapps/student/forms.py
-msgid "Username must be minimum of two characters long"
-msgstr ""
-
-#: common/djangoapps/student/forms.py
-#, python-format
-msgid "Username cannot be more than %(limit_value)s characters long"
-msgstr ""
-
-#. Translators: This message is shown when the Unicode usernames are NOT
-#. allowed
-#: common/djangoapps/student/forms.py
-msgid ""
-"Usernames can only contain Roman letters, western numerals (0-9), "
-"underscores (_), and hyphens (-)."
-msgstr ""
-
-#. Translators: This message is shown only when the Unicode usernames are
-#. allowed
-#: common/djangoapps/student/forms.py
-msgid ""
-"Usernames can only contain letters, numerals, underscore (_), numbers and "
-"@/./+/-/_ characters."
-msgstr ""
-
 #: common/djangoapps/student/forms.py
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
@@ -2114,6 +2111,8 @@ msgstr ""
 #: lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr ""
@@ -2674,6 +2673,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr ""
 
@@ -5218,6 +5218,15 @@ msgid ""
 "specific student."
 msgstr ""
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr ""
@@ -5258,28 +5267,6 @@ msgstr ""
 msgid "Enroll now"
 msgstr ""
 
-#. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (0.1a)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
-#: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
-#, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr ""
-
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
-#: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
 msgstr ""
@@ -6952,10 +6939,20 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid ""
 "This component's access settings contradict its parent's access settings."
@@ -8743,6 +8740,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -9264,6 +9263,120 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr ""
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid ""
+"Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores "
+"(_), and hyphens (-)."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid ""
+"Usernames can only contain letters, numerals, and @/./+/-/_ characters."
+msgstr ""
+
+#. Translators: This message is shown to users who attempt to create a new
+#. account using
+#. an invalid email format.
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+#, python-brace-format
+msgid "\"{email}\" is not a valid email address."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+#, python-brace-format
+msgid ""
+"It looks like {email_address} belongs to an existing account. Try again with"
+" a different email address."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+#, python-brace-format
+msgid ""
+"It looks like {username} belongs to an existing account. Try again with a "
+"different username."
+msgstr ""
+
+#. Translators: This message is shown to users who enter a
+#. username/email/password
+#. with an inappropriate length (too short or too long).
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+#, python-brace-format
+msgid "Username must be between {min} and {max} characters long."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+#, python-brace-format
+msgid "Enter a valid email address that contains at least {min} characters."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Please enter a password."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Password is not long enough."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+#, python-brace-format
+msgid "Password cannot be longer than {max} character."
+msgstr ""
+
+#. Translators: This message is shown to users who enter a password matching
+#. the username they enter(ed).
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Password cannot be the same as the username."
+msgstr ""
+
+#. Translators: These messages are shown to users who do not enter information
+#. into the required field or enter it incorrectly.
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Please enter your Full Name."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "The email addresses do not match."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Please select your Country."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Please enter your City."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Please tell us your goals."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Please select your highest level of education completed."
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/accounts/__init__.py
+msgid "Please enter your mailing address."
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -9349,24 +9462,6 @@ msgstr ""
 msgid "Remember me"
 msgstr ""
 
-#. Translators: This message is shown to users who attempt to create a new
-#. account using an email address associated with an existing account.
-#: openedx/core/djangoapps/user_api/views.py
-#, python-brace-format
-msgid ""
-"It looks like {email_address} belongs to an existing account. Try again with"
-" a different email address."
-msgstr ""
-
-#. Translators: This message is shown to users who attempt to create a new
-#. account using a username associated with an existing account.
-#: openedx/core/djangoapps/user_api/views.py
-#, python-brace-format
-msgid ""
-"It looks like {username} belongs to an existing account. Try again with a "
-"different username."
-msgstr ""
-
 #. Translators: These instructions appear on the registration form,
 #. immediately
 #. below a field meant to hold the user's email address.
@@ -9380,10 +9475,6 @@ msgstr ""
 msgid "Confirm Email"
 msgstr ""
 
-#: openedx/core/djangoapps/user_api/views.py
-msgid "The email addresses do not match."
-msgstr ""
-
 #. Translators: This example name is used as a placeholder in
 #. a field on the registration form meant to hold the user's name.
 #: openedx/core/djangoapps/user_api/views.py
@@ -9462,10 +9553,6 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
-#: openedx/core/djangoapps/user_api/views.py
-msgid "Please select your Country."
-msgstr ""
-
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Review the Honor Code"
 msgstr ""
@@ -9502,6 +9589,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr ""
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr ""
@@ -10213,6 +10305,7 @@ msgstr ""
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr ""
 
@@ -10229,6 +10322,16 @@ msgstr ""
 msgid "Course Number"
 msgstr ""
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -10346,11 +10449,14 @@ msgstr ""
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr ""
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr ""
 
@@ -10360,6 +10466,11 @@ msgstr ""
 msgid "Legal"
 msgstr ""
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -13092,6 +13203,7 @@ msgstr ""
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr ""
 
@@ -13100,6 +13212,7 @@ msgid "{section_format} due {{date}}"
 msgstr ""
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr ""
 
@@ -13241,6 +13354,7 @@ msgstr ""
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr ""
 
@@ -13254,6 +13368,7 @@ msgid "Courseware"
 msgstr ""
 
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr ""
 
@@ -13315,6 +13430,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr ""
 
@@ -13331,6 +13448,7 @@ msgid "Handout Navigation"
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
@@ -17469,7 +17587,8 @@ msgstr ""
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -17500,6 +17619,134 @@ msgstr ""
 msgid "Add article"
 msgstr ""
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -18171,10 +18418,6 @@ msgid ""
 "respond to student questions. You add or edit updates in HTML."
 msgstr ""
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr ""
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -18188,10 +18431,6 @@ msgid ""
 "and seed the discussions and wiki."
 msgstr ""
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr ""
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr ""
@@ -19415,6 +19654,10 @@ msgid ""
 "assistance."
 msgstr ""
 
+#: cms/templates/index.html
+msgid "Archived Courses"
+msgstr ""
+
 #: cms/templates/index.html
 msgid "Libraries"
 msgstr ""
@@ -19962,6 +20205,14 @@ msgstr ""
 msgid "Course End Time"
 msgstr ""
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr ""
@@ -20557,18 +20808,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -20610,8 +20878,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -20757,10 +21025,6 @@ msgstr ""
 msgid "Outline"
 msgstr ""
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr ""
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr ""
@@ -21449,7 +21713,7 @@ msgid "Your changes were saved."
 msgstr ""
 
 #: wiki/views/article.py
-msgid "A new revision of the article was succesfully added."
+msgid "A new revision of the article was successfully added."
 msgstr ""
 
 #: wiki/views/article.py
diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po
index b907f89fb8..a8a3d33527 100644
--- a/conf/locale/en/LC_MESSAGES/djangojs.po
+++ b/conf/locale/en/LC_MESSAGES/djangojs.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-20 11:47+0000\n"
-"PO-Revision-Date: 2017-07-20 11:48:32.711353\n"
+"POT-Creation-Date: 2017-08-02 12:47+0000\n"
+"PO-Revision-Date: 2017-08-02 12:48:04.567443\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -4218,6 +4218,10 @@ msgstr ""
 msgid "We couldn't create your account."
 msgstr ""
 
+#: lms/static/js/student_account/views/RegisterView.js
+msgid "(required)"
+msgstr ""
+
 #: lms/static/js/student_account/views/RegisterView.js
 msgid "You've successfully signed into %(currentProvider)s."
 msgstr ""
@@ -4886,6 +4890,11 @@ msgstr ""
 msgid "The course start date must be later than the enrollment start date."
 msgstr ""
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -4955,6 +4964,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr ""
diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo
index dbbe737fe1..ace785e06d 100644
Binary files a/conf/locale/eo/LC_MESSAGES/django.mo and b/conf/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po
index fd53263f0c..12aa896acc 100644
--- a/conf/locale/eo/LC_MESSAGES/django.po
+++ b/conf/locale/eo/LC_MESSAGES/django.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-20 11:48+0000\n"
-"PO-Revision-Date: 2017-07-20 11:48:32.252217\n"
+"POT-Creation-Date: 2017-08-01 21:22+0000\n"
+"PO-Revision-Date: 2017-08-01 21:22:49.685108\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -283,6 +283,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr "Vérïfïéd mödés çännöt ßé fréé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
 
+#. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (0.1a)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price} Ⱡ'σяєм ιρѕυ#"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "Fréé Ⱡ'σяєм ι#"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -2578,6 +2600,8 @@ msgstr ""
 #: lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "Süßmït Ⱡ'σяєм ιρѕυ#"
@@ -3342,6 +3366,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "Çöürsé Händöüts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
 
@@ -6768,6 +6793,19 @@ msgstr ""
 "Thïs týpé öf çömpönént çännöt ßé shöwn whïlé vïéwïng thé çöürsé äs ä "
 "spéçïfïç stüdént. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+"Nümßér öf däýs ä léärnér häs tö üpgrädé äftér çöntént ïs mädé äväïläßlé "
+"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя#"
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+"Dïsäßlé thé dýnämïç üpgrädé déädlïné för thïs çöürsé rün. Ⱡ'σяєм ιρѕυм ∂σłσя"
+" ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "Sýlläßüs Ⱡ'σяєм ιρѕυм ∂#"
@@ -6812,28 +6850,6 @@ msgstr ""
 msgid "Enroll now"
 msgstr "Énröll nöw Ⱡ'σяєм ιρѕυм ∂σłσ#"
 
-#. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (0.1a)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
-#: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
-#, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price} Ⱡ'σяєм ιρѕυ#"
-
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
-#: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "Fréé Ⱡ'σяєм ι#"
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
 msgstr "Ýöür énröllmént: Àüdït träçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
@@ -8955,12 +8971,26 @@ msgstr ""
 "Thïs çömpönént's äççéss séttïngs référ tö délétéd ör ïnvälïd gröüp "
 "çönfïgürätïöns. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+"Thïs ünït's äççéss séttïngs référ tö délétéd ör ïnvälïd gröüp "
+"çönfïgürätïöns. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#"
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 "Thïs çömpönént's äççéss séttïngs référ tö délétéd ör ïnvälïd gröüps. Ⱡ'σяєм "
 "ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #"
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+"Thïs ünït's äççéss séttïngs référ tö délétéd ör ïnvälïd gröüps. Ⱡ'σяєм ιρѕυм"
+" ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid ""
 "This component's access settings contradict its parent's access settings."
@@ -11247,6 +11277,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -11948,6 +11980,26 @@ msgstr ""
 "Énäßlé çöürsé hömé pägé ïmprövéménts. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
 "¢σηѕє¢тєтυ#"
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr "Sïté thémé çhängéd tö {site_theme} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr "Thémé {site_theme} döés nöt éxïst Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+"Sïté thémé révértéd tö thé défäült Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#"
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr "Thémïng Àdmïnïsträtïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -12226,6 +12278,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr "Révïéw thé Térms öf Sérvïçé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#"
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr "{header_open}{title}{header_close}{body} Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr ""
@@ -13093,6 +13150,7 @@ msgstr "Çöntént Ⱡ'σяєм ιρѕυм #"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "Löädïng Ⱡ'σяєм ιρѕυм #"
 
@@ -13109,6 +13167,16 @@ msgstr "Séttïngs Ⱡ'σяєм ιρѕυм ∂#"
 msgid "Course Number"
 msgstr "Çöürsé Nümßér Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr "Çöürsé Öütlïné Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr "Dïsmïss Ⱡ'σяєм ιρѕυм #"
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -13230,11 +13298,14 @@ msgstr "Vïéw Ⱡ'σяєм ι#"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr "Prévïéw Längüägé Séttïng Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "Rését Ⱡ'σяєм ιρѕ#"
 
@@ -13244,6 +13315,11 @@ msgstr "Rését Ⱡ'σяєм ιρѕ#"
 msgid "Legal"
 msgstr "Légäl Ⱡ'σяєм ιρѕ#"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr "Ûpdätés Ⱡ'σяєм ιρѕυм #"
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -16734,6 +16810,7 @@ msgstr "{span_start}çürrént séçtïön{span_end} Ⱡ'σяєм ιρѕυм ∂
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "düé {date} Ⱡ'σяєм ιρѕυм #"
 
@@ -16742,6 +16819,7 @@ msgid "{section_format} due {{date}}"
 msgstr "{section_format} düé {{date}} Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "Thïs çöntént ïs grädéd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
 
@@ -16913,6 +16991,7 @@ msgstr "Réfïné Ýöür Séärçh Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт 
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "{course_number} Çöürséwäré Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
 
@@ -16926,6 +17005,7 @@ msgid "Courseware"
 msgstr "Çöürséwäré Ⱡ'σяєм ιρѕυм ∂σłσ#"
 
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "Böökmärks Ⱡ'σяєм ιρѕυм ∂σł#"
 
@@ -16996,6 +17076,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "Wélçömé tö {org}'s {course_name}! Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "Résümé Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
 
@@ -17012,6 +17094,7 @@ msgid "Handout Navigation"
 msgstr "Händöüt Nävïgätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr "Çöürsé Tööls Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
@@ -22372,10 +22455,17 @@ msgstr "Rétürn tö Ýöür Däshßöärd Ⱡ'σяєм ιρѕυм ∂σłσя 
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 "Thïs wéßsïté üsés çöökïés tö énsüré ýöü gét thé ßést éxpérïénçé ön öür "
-"wéßsïté. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#"
+"wéßsïté. Ìf ýöü çöntïnüé ßröwsïng thïs sïté, wé ündérständ thät ýöü äççépt "
+"thé üsé öf çöökïés. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg "
+"єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт "
+"єηιм α∂ мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт "
+"αłιqυιρ єχ єα ¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη "
+"νσłυρтαтє νєłιт єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт "
+"σ¢¢αє¢αт ¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια#"
 
 #: lms/templates/widgets/cookie-consent.html
 msgid "Got it!"
@@ -22405,6 +22495,147 @@ msgstr "Çöürsé Wïkï Ⱡ'σяєм ιρѕυм ∂σłσя #"
 msgid "Add article"
 msgstr "Àdd ärtïçlé Ⱡ'σяєм ιρѕυм ∂σłσя #"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr "Längüägé Çödé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr "För éxämplé üsé én för Énglïsh Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+"Pléäsé réfrésh thé pägé tö séé thé çhängés äpplïéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
+"αмєт, ¢σηѕє¢тєтυя α#"
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr "Prévïéw Thémé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr "Àll Rïghts Résérvéd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr "Àttrïßütïön Ⱡ'σяєм ιρѕυм ∂σłσя #"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr "Nönçömmérçïäl Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr "Nö Dérïvätïvés Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr "Shäré Àlïké Ⱡ'σяєм ιρѕυм ∂σłσя #"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+"Çréätïvé Çömmöns lïçénséd çöntént, wïth térms äs föllöw: Ⱡ'σяєм ιρѕυм ∂σłσя "
+"ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr "Sömé Rïghts Résérvéd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr "Ìmpörtänt Çöürsé Dätés Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr "Tödäý ïs {date} Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr "Séärçh thé çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr "Stärt Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr "{subsection_format} düé {{date}} Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+"Thïs ïs ýöür läst vïsïtéd çöürsé séçtïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя #"
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+"Thïs çöürsé häs nöt stärtéd ýét. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+"Wé'ré stïll wörkïng ön çöürsé çöntént. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя#"
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+"Thïs çöürsé häs nöt stärtéd ýét, änd wïll läünçh ön {launch_date_html}. "
+"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr "Révïéws Ⱡ'σяєм ιρѕυм #"
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+"Thïs çöürsé döés nöt hävé äný üpdätés. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя#"
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr "Séärçh Résülts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr "Çönnéçtéd Àççöünts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr "Lïnkéd Ⱡ'σяєм ιρѕυ#"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr "Nöt Lïnkéd Ⱡ'σяєм ιρѕυм ∂σłσ#"
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr "Ûnlïnk Ⱡ'σяєм ιρѕυ#"
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr "Lïnk Ⱡ'σяєм ι#"
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr "Léärnér Pröfïlé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -23307,10 +23538,6 @@ msgstr ""
 "¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт єѕѕє "
 "¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕ#"
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "Çöürsé Öütlïné Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -23333,10 +23560,6 @@ msgstr ""
 " αłιqυα. υт єηιм α∂ мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ "
 "ηιѕι υт αłιqυιρ єχ єα ¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ι#"
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "Dïsmïss Ⱡ'σяєм ιρѕυм #"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "Wärnïng Ⱡ'σяєм ιρѕυм #"
@@ -25857,6 +26080,16 @@ msgstr "Läst däý ýöür çöürsé ïs äçtïvé Ⱡ'σяєм ιρѕυм 
 msgid "Course End Time"
 msgstr "Çöürsé Énd Tïmé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr "Çértïfïçätés Àväïläßlé Däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#"
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+"Bý défäült, 48 höürs äftér çöürsé énd däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя #"
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "Énröllmént Stärt Däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
@@ -26682,6 +26915,14 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr "Àççéss ïs nöt réstrïçtéd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+"Àççéss tö thïs ünït ïs nöt réstrïçtéd, ßüt vïsïßïlïtý mïght ßé äfféçtéd ßý "
+"ïnhérïtéd séttïngs. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
@@ -26690,6 +26931,14 @@ msgstr ""
 "Àççéss tö thïs çömpönént ïs nöt réstrïçtéd, ßüt vïsïßïlïtý mïght ßé äfféçtéd"
 " ßý ïnhérïtéd séttïngs. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+"Ýöü çän réstrïçt äççéss tö thïs ünït tö léärnérs ïn spéçïfïç énröllmént "
+"träçks ör çöntént gröüps. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
@@ -26698,6 +26947,13 @@ msgstr ""
 "Ýöü çän réstrïçt äççéss tö thïs çömpönént tö léärnérs ïn spéçïfïç énröllmént"
 " träçks ör çöntént gröüps. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+"Ýöü çän réstrïçt äççéss tö thïs ünït tö léärnérs ïn spéçïfïç çöntént gröüps."
+" Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυ#"
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -26750,11 +27006,11 @@ msgstr "Séléçt öné ör möré gröüps: Ⱡ'σяєм ιρѕυм ∂σłσя
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
-"Thïs gröüp nö löngér éxïsts. Çhöösé änöthér gröüp ör dö nöt réstrïçt äççéss "
-"tö thïs çömpönént. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
+"Thïs gröüp nö löngér éxïsts.  Çhöösé änöthér gröüp ör rémövé thé äççéss "
+"réstrïçtïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
 
 #: cms/templates/emails/activation_email.txt
 msgid ""
@@ -26955,10 +27211,6 @@ msgstr "Çöürsé Nävïgätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α
 msgid "Outline"
 msgstr "Öütlïné Ⱡ'σяєм ιρѕυм #"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "Ûpdätés Ⱡ'σяєм ιρѕυм #"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "Ìmpört Ⱡ'σяєм ιρѕυ#"
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo
index b2a74a5030..fb84a1312b 100644
Binary files a/conf/locale/eo/LC_MESSAGES/djangojs.mo and b/conf/locale/eo/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.po b/conf/locale/eo/LC_MESSAGES/djangojs.po
index 99ae8dbed9..c2e0118e0f 100644
--- a/conf/locale/eo/LC_MESSAGES/djangojs.po
+++ b/conf/locale/eo/LC_MESSAGES/djangojs.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-20 11:47+0000\n"
-"PO-Revision-Date: 2017-07-20 11:48:32.711353\n"
+"POT-Creation-Date: 2017-08-01 21:22+0000\n"
+"PO-Revision-Date: 2017-08-01 21:22:50.339993\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -5828,6 +5828,13 @@ msgstr ""
 "Thé çöürsé stärt däté müst ßé lätér thän thé énröllmént stärt däté. Ⱡ'σяєм "
 "ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #"
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+"Thé çértïfïçäté äväïläßlé däté müst ßé lätér thän thé énröllmént stärt däté."
+" Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυ#"
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -5922,6 +5929,11 @@ msgstr ""
 msgid "or"
 msgstr "ör Ⱡ'σя#"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+"Thïs ünït häs välïdätïön ïssüés. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr ""
diff --git a/conf/locale/es_419/LC_MESSAGES/django.mo b/conf/locale/es_419/LC_MESSAGES/django.mo
index 7a3ad0c5a7..7ec9c609b0 100644
Binary files a/conf/locale/es_419/LC_MESSAGES/django.mo and b/conf/locale/es_419/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_419/LC_MESSAGES/django.po b/conf/locale/es_419/LC_MESSAGES/django.po
index 13f0a451ed..b50606ca8a 100644
--- a/conf/locale/es_419/LC_MESSAGES/django.po
+++ b/conf/locale/es_419/LC_MESSAGES/django.po
@@ -194,7 +194,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-07-03 19:43+0000\n"
 "Last-Translator: Eduardo Zambrano <ezambrano@edx.org>\n"
 "Language-Team: Spanish (Latin America) (http://www.transifex.com/open-edx/edx-platform/language/es_419/)\n"
@@ -424,6 +424,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr "Los modos verificados no pueden ser gratuitos."
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "Gratis"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -471,6 +493,10 @@ msgstr "Administrador"
 msgid "Moderator"
 msgstr "Moderador"
 
+#: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
 #: common/djangoapps/django_comment_common/models.py
 msgid "Community TA"
 msgstr "Profesor asistente de la comunidad"
@@ -1978,9 +2004,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr "No fue posible interpretar '{student_answer}' como un número."
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -2109,6 +2134,11 @@ msgstr "Calificador externo"
 msgid "Math Expression Input"
 msgstr "Respuesta de expresión matemática"
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2349,6 +2379,10 @@ msgstr "Diccionario para mantener el estado de los tipos de entrada"
 msgid "Dictionary with the current student responses"
 msgstr "Diccionario con las respuestas de los estudiantes actuales"
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr "Si las respuestas se han guardado después del último envío o no"
@@ -2432,6 +2466,8 @@ msgstr ""
 #: lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "Enviar"
@@ -3089,6 +3125,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "Materiales del curso"
 
@@ -6079,6 +6116,15 @@ msgstr ""
 "Este tipo de componente no se puede mostrar en la vista del curso como un "
 "estudiante específico."
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "Temario"
@@ -6096,27 +6142,28 @@ msgstr "Progreso"
 msgid "Textbooks"
 msgstr "Libros de texto"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "Gratis"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
+msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
@@ -7652,6 +7699,14 @@ msgstr "Extensiones de fecha de entrega para {0} {1} ({2})"
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr "No todos los problemas del examen de ingreso soportan re-evaluación."
@@ -7662,6 +7717,12 @@ msgstr "No todos los problemas del examen de ingreso soportan re-evaluación."
 msgid "rescored"
 msgstr "re calificado"
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -7968,10 +8029,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr "Define si se mostrará este módulo o no en la tabla de contenidos"
@@ -9588,6 +9664,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr "Sesión cerrada"
@@ -9633,9 +9714,6 @@ msgstr ""
 "clic en el botón 'Cancelar'."
 
 #: lms/templates/oauth2_provider/authorize.html
-#: cms/templates/course-create-rerun.html cms/templates/index.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -9653,10 +9731,8 @@ msgstr "Error"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
+" user account at %(platform_name)s."
 msgstr ""
-"Usted recibió este correo porque solicitó el restablecimiento de la "
-"contraseña asociada a su cuenta en %(site_name)s."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -9780,7 +9856,6 @@ msgstr "Vista previa"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "Cerrar"
@@ -10050,6 +10125,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -10481,6 +10558,22 @@ msgstr "Idioma reajustado al código de idioma por defecto"
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr "Idioma reajustado a preferencias del usuario: {preview_language_code}"
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -10622,6 +10715,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr "Habilitar las mejoras a la página de inicio del curso."
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -10870,6 +10982,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr "Revisar los Términos del Servicio"
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr "La clave del curso que queremos que tenga cohortes automáticamente."
@@ -11636,7 +11753,7 @@ msgstr "Contenido"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "Cargando"
 
@@ -11653,6 +11770,16 @@ msgstr "Configuración"
 msgid "Course Number"
 msgstr "Código del curso"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -11680,7 +11807,6 @@ msgstr "Número de curso:"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "Cursos"
 
@@ -11771,11 +11897,14 @@ msgstr "Ver"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr "Previsualizar configuración de idioma"
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "Reiniciar"
 
@@ -11785,6 +11914,11 @@ msgstr "Reiniciar"
 msgid "Legal"
 msgstr "Legal"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -11868,7 +12002,6 @@ msgid "Usermenu dropdown"
 msgstr "Menú desplegable de usuario"
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "Cerrar sesión"
 
@@ -12069,12 +12202,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "Regresar a la {link_start}Página de inicio{link_end}."
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "¡Cambio de correo electrónico exitoso!"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr ""
 "Deberías ver tu nuevo correo electrónico en tu {link_start}panel de "
@@ -13096,14 +13227,18 @@ msgid "Add comment"
 msgstr "Añadir comentario"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "Depuración del personal de soporte"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "Acciones"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr "Reiniciar los intentos del estudiante"
@@ -13123,6 +13258,10 @@ msgstr "Calificar el envío del estudiante nuevamente"
 msgid "Rescore Only If Score Improves"
 msgstr "Puntuar de nuevo solamente si se mejora la calificación"
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "Campos de módulo"
@@ -13341,7 +13480,7 @@ msgstr ""
 " al panel de control. Si deseas volver a suscribirte a las notificaciones, "
 "haz clic {undo_link_start}aquí{link_end}."
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "Panel de Control para:"
 
@@ -14527,6 +14666,7 @@ msgid "Auto Enroll"
 msgstr "Auto inscribirse"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
@@ -14535,6 +14675,7 @@ msgstr ""
 "han registrado en {platform_name} serán inscritos automáticamente."
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -14557,6 +14698,7 @@ msgid "Notify users by email"
 msgstr "Notificar a los usuarios por correo electrónico"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -14983,6 +15125,7 @@ msgstr "{span_start}sección actual{span_end}"
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "fecha límite: {date}"
 
@@ -14991,6 +15134,7 @@ msgid "{section_format} due {{date}}"
 msgstr "{section_format} fecha límite {{date}}"
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "Este contenido es calificable"
 
@@ -15141,6 +15285,7 @@ msgstr "Refinar su búsqueda"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "Material del curso {course_number}"
 
@@ -15153,7 +15298,8 @@ msgstr "Utilidades de curso"
 msgid "Courseware"
 msgstr "Contenidos"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "Marcadores"
 
@@ -15217,6 +15363,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "Bienvenido a {course_name}  {org}"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "Continuar con el curso"
 
@@ -15233,13 +15381,10 @@ msgid "Handout Navigation"
 msgstr "Navegación de documentos"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "Noticias - MITx 6.002x"
@@ -18166,32 +18311,6 @@ msgstr "Por favor suministre los detalles suficientes para esta acción."
 msgid "Reason"
 msgstr "Razón"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"Si esta opción está <em>marcada</em>, los usuarios que aún no se han "
-"registrado en {platform_name} serán inscritos automáticamente."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"Si esta opción está <em>sin marcar</em>, los usuarios que aún no se han "
-"registrado en {platform_name} no serán inscritos, pero se les permitirá la "
-"inscripción al curso una vez hayan creado su cuenta."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr ""
-"Si esta opción está <em>marcada</em>, los usuarios recibirán una "
-"notificación por correo electrónico."
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "Registrar/Inscribir estudiantes"
@@ -18231,11 +18350,9 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
 msgstr ""
-"Si esta opción esta <em>marcada</em>, los usuarios que aun no se han "
-"inscrito en tu curso, serán inscritos automáticamente."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -18375,16 +18492,30 @@ msgid "Add Moderator"
 msgstr "Añadir moderador"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "Profesores asistentes en los foros de discusión"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -18638,9 +18769,8 @@ msgid "View a specific learner's grades and progress"
 msgstr "Ver las notas y el progreso de un estudiante específico"
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
-"Dirección de email {platform_name} o nombre de usuario del estudiante *"
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Learner email address or username"
@@ -18655,8 +18785,8 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr "Ajustar la calificación del estudiante para una pregunta específica"
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
-msgstr "Localizador del problema dentro del curso *"
+msgid "Location of problem in course"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Example"
@@ -18695,6 +18825,23 @@ msgstr ""
 "nuevamente. La opción \"Recalificar solamente si se mejora la nota\" "
 "actualiza la nota del estudiante solamente si se mejora."
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr "Historial del problema"
@@ -18824,7 +18971,6 @@ msgstr "Detalles del programa"
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr "Programas"
 
@@ -18848,28 +18994,9 @@ msgstr ""
 "¿No está disponible el idioma de su preferencia? {link_start}Hágase "
 "traductor voluntario!{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "dialogo abierto"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "Aceptar"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "abierto"
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "Sysadmin"
 
@@ -18877,27 +19004,23 @@ msgstr "Sysadmin"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "Carro de compras"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr "{platform_name} Página de inicio"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "Cómo funciona"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "Instituciones"
 
@@ -18908,12 +19031,10 @@ msgstr "Explorar cursos"
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "Iniciar sesión"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "Global"
 
@@ -19756,7 +19877,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr "Actualmente los servidores  de {platform_name} están sobrecargados"
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
@@ -19768,40 +19888,6 @@ msgstr "Por favor espere"
 msgid "Sign in or Register"
 msgstr "Inicie sesión o regístrese"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "Perfil de usuario"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "Cuentas conectadas"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "Vinculado"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "Sin vincular"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "Desvincular"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "Vincular"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr "Soporte a estudiantes"
@@ -20010,7 +20096,8 @@ msgstr "Volver al panel principal"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -20041,6 +20128,134 @@ msgstr "Wiki del curso"
 msgid "Add article"
 msgstr "Añadir artículo"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -20089,7 +20304,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "Buscar Cursos"
 
@@ -20124,18 +20338,6 @@ msgstr ""
 "{tos_link_start}Términos del servicio{tos_link_end} y "
 "{honor_link_start}Código de Honor{honor_link_end}"
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "Despliegue de más opciones"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr "Mi Perfil"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr "Registrarse"
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -20322,19 +20524,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr "Archivos y cargas"
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "Acciones de página"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "Subir nuevo archivo"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "Añadiendo Archivos a su Curso"
@@ -20554,6 +20751,15 @@ msgstr "Borrar este componente"
 msgid "Drag to reorder"
 msgstr "Arrastre para reorganizar"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "Acciones de página"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr "Abrir el contenido del curso en el LMS"
@@ -20817,10 +21023,6 @@ msgstr ""
 "los estudiantes de forma general. En esta sección puede añadir o editar sus "
 "actualizaciones en lenguaje HTML."
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "Estructura del curso"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -20841,10 +21043,6 @@ msgstr ""
 "actualizaciones del curso y otros recursos con fecha, así como de crear y "
 "comenzar las discusiones y la wiki."
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "Descartar"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "Atención"
@@ -22246,10 +22444,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "Cursos que están siendo procesados"
@@ -22968,6 +23162,14 @@ msgstr "Último día que el curso estará activo"
 msgid "Course End Time"
 msgstr "Hora de finalización del curso"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "Fecha de inicio de inscripciones"
@@ -23680,18 +23882,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -23733,8 +23952,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -23902,10 +24121,6 @@ msgstr "Navegación del curso"
 msgid "Outline"
 msgstr "Estructura"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "Actualizaciones"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "Importar"
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.mo b/conf/locale/es_419/LC_MESSAGES/djangojs.mo
index 9f5e0f004c..bc7b65d4d4 100644
Binary files a/conf/locale/es_419/LC_MESSAGES/djangojs.mo and b/conf/locale/es_419/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.po b/conf/locale/es_419/LC_MESSAGES/djangojs.po
index c50e71cf26..fdd45f5749 100644
--- a/conf/locale/es_419/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_419/LC_MESSAGES/djangojs.po
@@ -127,9 +127,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-17 18:30+0000\n"
-"Last-Translator: Jose Antonio Sanchez Romero <isc.antonio.sr@gmail.com>\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
+"Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Spanish (Latin America) (http://www.transifex.com/open-edx/edx-platform/language/es_419/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,7 +241,7 @@ msgstr "Subiendo"
 #: common/static/common/templates/discussion/alert-popup.underscore
 #: common/static/common/templates/discussion/forum-action-close.underscore
 #: common/static/common/templates/discussion/search-alert.underscore
-#: lms/templates/student_profile/share_modal.underscore
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2714,7 +2714,6 @@ msgid ""
 msgstr "El idioma que usan los miembros del equipo para comunicarse."
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "País"
 
@@ -3836,7 +3835,6 @@ msgstr "Marcar código de inscripción como no utilizado"
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 #: lms/templates/financial-assistance/financial_assessment_form.underscore
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -3849,6 +3847,10 @@ msgstr "Correo electrónico"
 msgid "Revoke access"
 msgstr "Quitar el acceso"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr "Ingresa el nombre de usuario o el correo electrónico."
@@ -3858,6 +3860,10 @@ msgid "Please enter a username or email."
 msgstr ""
 "Por favor ingresa tu nombre de usuario o dirección de correo electrónico."
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "Error al cambiar los permisos del usuario."
@@ -4287,6 +4293,24 @@ msgstr ""
 "%>' para el estudiante '<%- student_id %>'.  Verifica que el problema y el "
 "estudiante estén identificados correctamente."
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4502,6 +4526,14 @@ msgid "Failed to rescore problem to improve score for user."
 msgstr ""
 "Falló al re puntuar el problema para mejorar la calificación del usuario."
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "Los datos no pudieron ser guardados."
@@ -4758,7 +4790,6 @@ msgid "Year of Birth"
 msgstr "Año de nacimiento"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "Preferencia de idioma"
 
@@ -4880,85 +4911,6 @@ msgstr "Información de la cuenta"
 msgid "Order History"
 msgstr "Historial de órdenes"
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "Paginación de Logros"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "Los usuarios de {platform_name} pueden ver mi:"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "Perfil limitado"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "Perfil completo"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "Añadir país"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "Añadir idioma"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "Sobre mí"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr ""
-"Comparte con otros usuarios algo sobre ti: donde vives, cuales son tus "
-"intereses, porque estás tomando estos cursos, o cuales son tus expectativas "
-"de aprendizaje."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "Página de configuración de cuenta."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-"Debes especificar un año de nacimiento antes de poder compartir tu perfil "
-"completo. Para definir un año de nacimiento, visita "
-"{account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"Debes tener 13 años o más para compartir un perfil completo.  Si tienes más "
-"de esta edad, asegúrate que has especificado un año de nacimiento en "
-"{account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "Foto de perfil"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "Foto de perfil para {username}"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr "Sobre Mí"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "Logros"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr "Perfil"
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "Error en subir imagen"
@@ -5421,6 +5373,11 @@ msgstr ""
 "La fecha de inicio del curso debe ser posterior a la fecha de inicio de "
 "inscripciones."
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -5499,6 +5456,10 @@ msgstr ""
 msgid "or"
 msgstr "o"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "El componente tiene errores de validación"
@@ -5682,12 +5643,14 @@ msgstr "No esta en uso"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
-msgstr[0] "Usado en {count} unidades"
-msgstr[1] "Usado en {count} unidades"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
+msgstr[0] ""
+msgstr[1] ""
 
 #. Translators: this refers to a collection of groups.
 #: cms/static/js/views/group_configuration_item.js
@@ -5853,10 +5816,6 @@ msgstr ""
 msgid "{display_name} Settings"
 msgstr "Ajustes de configuración para {display_name} "
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr "Cambiar los ajustes para {display_name}"
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr "Publicar {display_name}"
@@ -5871,6 +5830,10 @@ msgstr "Publicar todos los cambios no publicados para este {item}?"
 msgid "Publish"
 msgstr "Publicar"
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr "Básico"
@@ -5884,6 +5847,10 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr "Editando: %(title)s"
 
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr "Unidad"
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "Componente"
@@ -5945,7 +5912,8 @@ msgstr "Estructura del curso"
 msgid "Date added"
 msgstr "Fecha de adición"
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -7149,10 +7117,6 @@ msgstr "Expandir todo"
 msgid "Collapse All"
 msgstr "Colapsar todo"
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr "Unidad"
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr "Fecha inicial:"
@@ -8058,78 +8022,6 @@ msgstr "o crear una nueva aquí"
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr "Comparte tu insignia de \"%(display_name)s\" "
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr "Compartir"
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr "Obtenido %(created)s."
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr "¿Qué será tu próximo logro?"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr "Empieza a trabajar hacia tu próxima meta de aprendizaje."
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr "Busca un curso"
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr "Ocurrió un error. Intenta cargar la página nuevamente."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr "Actualmente está compartiendo un perfil limitado."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr "Este usuario está compartiendo un perfil limitado."
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr "Compartir en Mozilla Backpack"
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-"Para compartir tu certificado en Mozilla Backpack, debes tener una cuenta de"
-" Backpack primero. Completa los siguientes pasos para agregar tu certificado"
-" a Backpack."
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-"Crea una cuenta de %(link_start)sMozilla Backpack%(link_end)s, o inicia "
-"sesión usando una cuenta existente"
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-"%(download_link_start)sDescarga esta imagen (haz clic derecho o pulsa "
-"opción, guardar como)%(link_end)s y después "
-"%(upload_link_start)ssubirla%(link_end)s a tu mochila.</li>"
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8736,6 +8628,78 @@ msgstr "Lo sentimos, no se encuentran resultados"
 msgid "Back to Dashboard"
 msgstr "Volver al Panel de Control"
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr "Comparte tu insignia de \"%(display_name)s\" "
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr "Compartir"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr "Obtenido %(created)s."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr "¿Qué será tu próximo logro?"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr "Empieza a trabajar hacia tu próxima meta de aprendizaje."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr "Busca un curso"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr "Ocurrió un error. Intenta cargar la página nuevamente."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr "Actualmente está compartiendo un perfil limitado."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr "Este usuario está compartiendo un perfil limitado."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr "Compartir en Mozilla Backpack"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+"Para compartir tu certificado en Mozilla Backpack, debes tener una cuenta de"
+" Backpack primero. Completa los siguientes pasos para agregar tu certificado"
+" a Backpack."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+"Crea una cuenta de %(link_start)sMozilla Backpack%(link_end)s, o inicia "
+"sesión usando una cuenta existente"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+"%(download_link_start)sDescarga esta imagen (haz clic derecho o pulsa "
+"opción, guardar como)%(link_end)s y después "
+"%(upload_link_start)ssubirla%(link_end)s a tu mochila.</li>"
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr "Restrinja permisos"
@@ -8984,6 +8948,20 @@ msgstr "Activar"
 msgid "Deactivate"
 msgstr "Desactivar"
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -9155,6 +9133,10 @@ msgstr "Las unidades no publicadas no serán liberadas"
 msgid "Unpublished changes to content that will release in the future"
 msgstr "Cambios no publicados del contenido que será liberado en el futuro"
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -9708,12 +9690,6 @@ msgstr "con %(section_or_subsection)s"
 msgid "Staff and Learners"
 msgstr "Funcionarios y estudiantes"
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -10007,6 +9983,32 @@ msgstr ""
 " revisión de exámenes supervisados deba validar al revisar los videos. Por "
 "ejemplo, puede especificar que se permite el uso de calculadoras."
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr "Archivo subido con exito"
@@ -10047,9 +10049,9 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
-msgstr "Editar el nombre"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
+msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
 #, python-format
diff --git a/conf/locale/fr/LC_MESSAGES/django.mo b/conf/locale/fr/LC_MESSAGES/django.mo
index c4dfc4129b..3f960cd977 100644
Binary files a/conf/locale/fr/LC_MESSAGES/django.mo and b/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/fr/LC_MESSAGES/django.po b/conf/locale/fr/LC_MESSAGES/django.po
index a18fbd5881..b8d25df609 100644
--- a/conf/locale/fr/LC_MESSAGES/django.po
+++ b/conf/locale/fr/LC_MESSAGES/django.po
@@ -257,7 +257,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-05-10 21:24+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: French (http://www.transifex.com/open-edx/edx-platform/language/fr/)\n"
@@ -489,6 +489,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr "Les modes vérifiés ne peuvent être gratuit."
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "Gratuit"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -533,6 +555,10 @@ msgstr "Administrateur"
 msgid "Moderator"
 msgstr "Modérateur"
 
+#: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
 #: common/djangoapps/django_comment_common/models.py
 msgid "Community TA"
 msgstr "Assistant"
@@ -2005,9 +2031,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -2137,6 +2162,11 @@ msgstr "Évaluateur externe"
 msgid "Math Expression Input"
 msgstr ""
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2375,6 +2405,10 @@ msgstr ""
 msgid "Dictionary with the current student responses"
 msgstr "Dictionnaire des réponses actuelles des élèves"
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr ""
@@ -2450,6 +2484,8 @@ msgstr ""
 #: lms/templates/manage_user_standing.html lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "Soumettre"
@@ -3063,6 +3099,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "Documents de cours"
 
@@ -5868,6 +5905,15 @@ msgstr ""
 "Ce type de composant ne peut pas être affiché tout en consultant le cours "
 "comme étudiant spécifique."
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "Syllabus"
@@ -5885,27 +5931,28 @@ msgstr "Progression"
 msgid "Textbooks"
 msgstr "Manuels"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "Gratuit"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
+msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
@@ -7335,6 +7382,14 @@ msgstr ""
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr ""
@@ -7345,6 +7400,12 @@ msgstr ""
 msgid "rescored"
 msgstr ""
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -7637,10 +7698,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr ""
@@ -9040,6 +9116,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr ""
@@ -9077,11 +9158,11 @@ msgid ""
 "'Cancel' button."
 msgstr ""
 
+#: lms/templates/oauth2_provider/authorize.html
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
-msgstr "Annuler"
+msgstr ""
 
 #: lms/templates/oauth2_provider/authorize.html
 msgid "Allow"
@@ -9096,10 +9177,8 @@ msgstr "Erreur"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
+" user account at %(platform_name)s."
 msgstr ""
-"Vous recevez cet email parce que vous avez demandé une réinitialisation de "
-"votre mot de passe pour votre compte %(site_name)s."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -9221,7 +9300,6 @@ msgstr "Aperçu"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "Fermer"
@@ -9491,6 +9569,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -9886,6 +9966,22 @@ msgstr ""
 "Langue réinitialisée selon la préférence de l'utilisateur : "
 "{preview_language_code}"
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -10013,6 +10109,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr ""
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -10253,6 +10368,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr "Voir les conditions d'utilisation"
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr ""
@@ -11013,7 +11133,7 @@ msgstr "Contenu"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "Chargement en cours"
 
@@ -11030,6 +11150,16 @@ msgstr "Paramètres"
 msgid "Course Number"
 msgstr "Numéro du cours"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -11057,7 +11187,6 @@ msgstr "Numéro du cours :"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "Cours"
 
@@ -11148,11 +11277,14 @@ msgstr "Voir"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr ""
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -11162,6 +11294,11 @@ msgstr "Réinitialiser"
 msgid "Legal"
 msgstr "Légal"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -11245,7 +11382,6 @@ msgid "Usermenu dropdown"
 msgstr ""
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "Se déconnecter"
 
@@ -11443,12 +11579,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "Retour à {link_start}l'accueil{link_end}"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "Adresse e-mail modifiée avec succès !"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr ""
 "Vous devez voir votre nouvelle adresse e-mail sur votre {link_start}Tableau "
@@ -12435,14 +12569,18 @@ msgid "Add comment"
 msgstr "Ajouter un commentaire"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "Débogage équipe pédagogique"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "Actions"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr ""
@@ -12462,6 +12600,10 @@ msgstr ""
 msgid "Rescore Only If Score Improves"
 msgstr ""
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "Champs Module"
@@ -12677,7 +12819,7 @@ msgid ""
 " not mean to do this, {undo_link_start}you can re-subscribe{link_end}."
 msgstr ""
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "Tableau de bord pour :"
 
@@ -13577,12 +13719,14 @@ msgid "Auto Enroll"
 msgstr "Inscription Automatique"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
 msgstr ""
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -13600,6 +13744,7 @@ msgid "Notify users by email"
 msgstr "Notifier les utilisateurs par email"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -13969,6 +14114,7 @@ msgstr ""
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "Echéance le {date}"
 
@@ -13977,6 +14123,7 @@ msgid "{section_format} due {{date}}"
 msgstr ""
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr ""
 
@@ -14121,6 +14268,7 @@ msgstr "Affiner votre recherche"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "Contenu du cours {course_number}"
 
@@ -14133,7 +14281,8 @@ msgstr "Utilitaires du cours"
 msgid "Courseware"
 msgstr "Cours"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "Favoris"
 
@@ -14196,6 +14345,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "Bienvenue au cours {course_name} de {org} !"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "Reprendre le cours"
 
@@ -14212,13 +14363,10 @@ msgid "Handout Navigation"
 msgstr "Navigation des documents pédagogiques"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "Actualités - MITx 6.002x"
@@ -16939,32 +17087,6 @@ msgstr ""
 msgid "Reason"
 msgstr "Raison"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"Si cette option est <em>cochée</em>, les utilisateurs qui ne se sont pas "
-"encore inscrits dans {platform_name} seront automatiquement ajoutés. "
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"Si cette option <em>n'est pas cochée</em>, les utilisateurs qui ne se sont "
-"pas encore inscrits dans {platform_name} ne seront pas ajoutés mais ils "
-"seront autorisés à s'inscrire dès qu'ils auront créé leur compte. "
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr ""
-"Si cette option est <em>cochée</em>, les utilisateurs recevront une "
-"notification par e-mail."
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "Inscrire/Enregistrer des étudiants "
@@ -17004,11 +17126,9 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
 msgstr ""
-"Si cette option est <em>cochée</em>, les nouveaux étudiants seront "
-"automatiquement inscrits."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -17142,16 +17262,30 @@ msgid "Add Moderator"
 msgstr "Ajouter un Modérateur"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "Assistants"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -17393,7 +17527,7 @@ msgid "View a specific learner's grades and progress"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -17409,7 +17543,7 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
+msgid "Location of problem in course"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -17444,6 +17578,23 @@ msgid ""
 "improves in the learner's favor."
 msgstr ""
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr ""
@@ -17558,7 +17709,6 @@ msgstr ""
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr "Programmes"
 
@@ -17582,28 +17732,9 @@ msgstr ""
 "Vous ne trouvez pas votre langue préférée ? {link_start}Proposez-vous comme "
 "traducteur volontaire !{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "Confirmer"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "ouverture modale "
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "OK"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "ouvrir"
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "Administrateur système"
 
@@ -17611,27 +17742,23 @@ msgstr "Administrateur système"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "Panier"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr "{platform_name} Accueil"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "Comment ça marche"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "Écoles"
 
@@ -17642,12 +17769,10 @@ msgstr "Explorer les cours"
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "Connexion"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "Mondial"
 
@@ -18441,7 +18566,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr "Les serveurs de {platform_name} sont actuellement surchargés"
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "Paramètres du compte"
 
@@ -18453,40 +18577,6 @@ msgstr "Veuillez patienter"
 msgid "Sign in or Register"
 msgstr "Se connecter ou s'inscrire"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "Profil de participant"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "Comptes connectés"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "Lié"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "Non lié"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "Supprimer le lien"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "Lier"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr "Support Étudiant"
@@ -18683,7 +18773,8 @@ msgstr "Retour à votre tableau de bord"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -18714,6 +18805,134 @@ msgstr ""
 msgid "Add article"
 msgstr "Ajouter un article"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -18758,7 +18977,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "Trouver un cours"
 
@@ -18790,18 +19008,6 @@ msgstr ""
 "{tos_link_start}Conditions Générales d'Utilisation{tos_link_end} et "
 "{honor_link_start}Code d'Honneur{honor_link_end}"
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "Liste déroulante d'options supplémentaires"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr "Mon profil"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr "Inscription"
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -18990,19 +19196,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr "Fichiers & téléchargements"
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "Actions de la Page"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "Téléverser un nouveau fichier"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "Ajout de fichiers à votre cours"
@@ -19205,6 +19406,15 @@ msgstr "Supprimer ce composant"
 msgid "Drag to reorder"
 msgstr "Glissez pour modifier l'ordre"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "Actions de la Page"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr "Ouvrir le cours dans le LMS"
@@ -19462,10 +19672,6 @@ msgstr ""
 "et pour répondre aux questions des étudiants. Vous pouvez ajouter ou éditer "
 "les mises à jour en HTML."
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "Plan du Cours"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -19481,10 +19687,6 @@ msgid ""
 "and seed the discussions and wiki."
 msgstr ""
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr ""
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "Attention"
@@ -20771,10 +20973,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "Cours en Cours de Traitement"
@@ -21410,6 +21608,14 @@ msgstr "Dernier jour d'activité de votre Cours"
 msgid "Course End Time"
 msgstr "Heure de fin du Cours"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "Date de début des inscriptions"
@@ -22043,18 +22249,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -22096,8 +22319,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -22248,10 +22471,6 @@ msgstr ""
 msgid "Outline"
 msgstr "Plan du Cours"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "Annonces"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "Importer"
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.mo b/conf/locale/fr/LC_MESSAGES/djangojs.mo
index 1d3eb1b15d..35d7693865 100644
Binary files a/conf/locale/fr/LC_MESSAGES/djangojs.mo and b/conf/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.po b/conf/locale/fr/LC_MESSAGES/djangojs.po
index fd8561e19e..50e2d1f198 100644
--- a/conf/locale/fr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fr/LC_MESSAGES/djangojs.po
@@ -18,7 +18,7 @@
 # Encolpe Degoute <inactive+encolpe@transifex.com>, 2013
 # Eric Fortin, 2014,2016
 # Eric Fortin, 2014,2016
-# Florent Dijoux <florent.dijx@gmail.com>, 2016
+# Fox <florent.dijx@gmail.com>, 2016
 # Françoise Docq, 2014
 # Françoise Docq, 2014
 # Gérard Vidal <Gerard.Vidal@ens-lyon.fr>, 2014-2015
@@ -169,8 +169,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-06 15:25+0000\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: French (http://www.transifex.com/open-edx/edx-platform/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -280,7 +280,7 @@ msgstr "Chargement en cours"
 #: common/static/common/templates/discussion/alert-popup.underscore
 #: common/static/common/templates/discussion/forum-action-close.underscore
 #: common/static/common/templates/discussion/search-alert.underscore
-#: lms/templates/student_profile/share_modal.underscore
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "Fermer"
 
@@ -2708,7 +2708,6 @@ msgstr ""
 "communiquer entre eux."
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "Pays"
 
@@ -3801,7 +3800,6 @@ msgstr "Marquer le code d'inscription comme non utilisé"
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 #: lms/templates/financial-assistance/financial_assessment_form.underscore
 msgid "Username"
 msgstr "Nom d'utilisateur"
@@ -3814,6 +3812,10 @@ msgstr "Email"
 msgid "Revoke access"
 msgstr "Retirer l'accès"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr ""
@@ -3822,6 +3824,10 @@ msgstr ""
 msgid "Please enter a username or email."
 msgstr "Veuillez saisir un nom d'utilisateur ou un email."
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "Erreur lors du changement des permissions de l'utilisateur."
@@ -4223,6 +4229,24 @@ msgid ""
 "are complete and correct."
 msgstr ""
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4426,6 +4450,14 @@ msgstr ""
 msgid "Failed to rescore problem to improve score for user."
 msgstr ""
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "Les données n'ont pas pu être enregistrées"
@@ -4669,7 +4701,6 @@ msgid "Year of Birth"
 msgstr "Année de naissance"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "Langue préférée"
 
@@ -4788,84 +4819,6 @@ msgstr "Information du compte"
 msgid "Order History"
 msgstr "Historique des commandes"
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "Paginations des réalisations"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "Les utilisateurs de {platform_name} peuvent voir mon:"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "Profil restreint"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "Profil complet"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "Ajouter un Pays"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "Ajouter une langue"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "A propos de moi"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr ""
-"Parlez nous de vous : où habitez-vous, quels sont vos intérêts, pourquoi "
-"suivez-vous des cours ou ce que vous souhaitez apprendre."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "Paramètres du compte"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-"Vous devez renseigner votre année de naissance avant de pouvoir partager "
-"votre profil complet. Pour renseigner votre année de naissance, allez sur "
-"{account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"Vous devez avoir plus de 13 ans pour partager un profil complet. Si vous "
-"avez plus de 13 ans, assurez-vous que votre année de naissance est correcte "
-"dans {account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "Image du profil"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "Image de profil pour {username}"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr "À propos de moi"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "Accomplissements"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr "Profil"
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "Erreur lors du téléversement de l'image"
@@ -5331,6 +5284,11 @@ msgstr ""
 "La date de début de cours ne peut pas être antérieure à la date de début des"
 " inscriptions."
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -5411,6 +5369,10 @@ msgstr ""
 msgid "or"
 msgstr "ou"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "Ce composant a des problèmes de validation."
@@ -5594,12 +5556,14 @@ msgstr "Non utilisé"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
-msgstr[0] "Utilisé par {count} unités."
-msgstr[1] "Utilisés par {count} unités."
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
+msgstr[0] ""
+msgstr[1] ""
 
 #. Translators: this refers to a collection of groups.
 #: cms/static/js/views/group_configuration_item.js
@@ -5765,10 +5729,6 @@ msgstr ""
 msgid "{display_name} Settings"
 msgstr "Paramètres de {display_name}"
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr "Modifier les paramètres pour {display_name}"
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr "Publier {display_name}"
@@ -5783,6 +5743,10 @@ msgstr "Publier toutes les modifications non publiées pour cet {item} ?"
 msgid "Publish"
 msgstr "Publier"
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr "Basique"
@@ -5796,6 +5760,10 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr "Modification: %(title)s"
 
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr "Unité"
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "Composante"
@@ -5858,7 +5826,8 @@ msgstr ""
 msgid "Date added"
 msgstr "Date ajoutée"
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -7043,10 +7012,6 @@ msgstr "Tout déplier"
 msgid "Collapse All"
 msgstr "Tout replier"
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr "Unité"
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr "Date de début"
@@ -7919,70 +7884,6 @@ msgstr "ou en créer un nouveau ici"
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr ""
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr ""
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr "Vous partagez actuellement votre profil restreint."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8571,6 +8472,70 @@ msgstr "Désolé, aucun résultat trouvé."
 msgid "Back to Dashboard"
 msgstr "Retour au tableau de bord"
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr "Vous partagez actuellement votre profil restreint."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr "Accès Limité"
@@ -8816,6 +8781,20 @@ msgstr ""
 msgid "Deactivate"
 msgstr ""
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -8977,6 +8956,10 @@ msgstr "Les unités non publiées ne seront pas diffusées."
 msgid "Unpublished changes to content that will release in the future"
 msgstr ""
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -9513,12 +9496,6 @@ msgstr "avec %(section_or_subsection)s"
 msgid "Staff and Learners"
 msgstr ""
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9791,6 +9768,32 @@ msgid ""
 "specify that calculators are allowed."
 msgstr ""
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr "Chargement du fichier réussi"
@@ -9828,9 +9831,9 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
-msgstr "Modifier le nom"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
+msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
 #, python-format
diff --git a/conf/locale/he/LC_MESSAGES/django.mo b/conf/locale/he/LC_MESSAGES/django.mo
index 0fbba489bd..21331883ce 100644
Binary files a/conf/locale/he/LC_MESSAGES/django.mo and b/conf/locale/he/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/he/LC_MESSAGES/django.po b/conf/locale/he/LC_MESSAGES/django.po
index bb403d984e..a155b82854 100644
--- a/conf/locale/he/LC_MESSAGES/django.po
+++ b/conf/locale/he/LC_MESSAGES/django.po
@@ -10,6 +10,7 @@
 # e2f_HE c1 <e2f_HE_c1@outlook.com>, 2016-2017
 # e2f he_r1 <e2f_he_r1@outlook.com>, 2016
 # Nadav Stark <nadav@yeda.org.il>, 2015
+# Ned Batchelder <ned@edx.org>, 2017
 # qualityalltext <quality@alltext.co.il>, 2016
 # Ron Rozen <Ronrozen@gmail.com>, 2016
 # shay nativ, 2015
@@ -62,6 +63,7 @@
 # Nadav Stark <nadav@yeda.org.il>, 2015
 # qualityalltext <quality@alltext.co.il>, 2016-2017
 # Ron Rozen <Ronrozen@gmail.com>, 2016
+# Yoav Caspin <yoavc@pmo.gov.il>, 2017
 # #-#-#-#-#  wiki.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2017 edX
@@ -79,7 +81,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-03-29 06:21+0000\n"
 "Last-Translator: e2f_HE c1 <e2f_HE_c1@outlook.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/open-edx/edx-platform/language/he/)\n"
@@ -181,7 +183,7 @@ msgid ""
 "photos for verification.  This appies ONLY to modes that require "
 "verification."
 msgstr ""
-"אפשרות: לאחר תאריך/שעה אלו, לא יוכלו יותר המשתמשים לשלוח תמונות לאימות.  "
+"אופציונלי: לאחר תאריך/שעה אלו, לא יוכלו יותר המשתמשים לשלוח תמונות לאימות.  "
 "אפשרות זו חלה אך ורק על מצבים הדורשים אימות."
 
 #: common/djangoapps/course_modes/helpers.py
@@ -303,6 +305,28 @@ msgstr "לא ניתן להגדיר expiration_datetime במצבי חינוך מ
 msgid "Verified modes cannot be free."
 msgstr "מצבים מאומתים אינם יכולים להיות בחינם."
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "חינם"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -311,7 +335,7 @@ msgstr "פרק הזמן לפני תום הקורס שבו יפוג תוקפו ש
 #: common/djangoapps/course_modes/views.py
 #, python-brace-format
 msgid "Congratulations!  You are now enrolled in {course_name}"
-msgstr ""
+msgstr "ברכות!  אתה רשום כעת ב-{course_name}"
 
 #: common/djangoapps/course_modes/views.py
 #, python-brace-format
@@ -320,6 +344,9 @@ msgid ""
 "{partner_names}, sponsored by {enterprise_name}. Please select your "
 "enrollment information below."
 msgstr ""
+"ברוכ/ה הבאה {username}! את/ה עומד/ת להרשם לקורס {course_name}, מ "
+"{partner_names}, ממומן על ידי {enterprise_name}. בבקשה בחר/י למטה את המידע "
+"שלך עבור הרישום."
 
 #: common/djangoapps/course_modes/views.py
 msgid "Enrollment is closed"
@@ -346,6 +373,11 @@ msgid "Moderator"
 msgstr "מנחה"
 
 #: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
+#: common/djangoapps/django_comment_common/models.py
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Community TA"
 msgstr "עוזר הוראה קהילתי"
 
@@ -384,6 +416,7 @@ msgid ""
 "Usernames can only contain letters, numerals, underscore (_), numbers and "
 "@/./+/-/_ characters."
 msgstr ""
+"שמות משתמשים יכולים להכיל רק אותיות,קו תחתון (_) מספרים ותווים @/./+/-/_"
 
 #: common/djangoapps/student/forms.py
 msgid ""
@@ -628,12 +661,12 @@ msgstr "בית ספר יסודי"
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
 msgid "No formal education"
-msgstr ""
+msgstr "אין השכלה רשמית"
 
 #. Translators: 'Other' refers to the student's level of education
 #: common/djangoapps/student/models.py
 msgid "Other education"
-msgstr ""
+msgstr "השכלה מסוג אחר"
 
 #: common/djangoapps/student/models.py
 #, python-brace-format
@@ -724,35 +757,35 @@ msgstr "הקורס שאתה מחפש סגור להרשמה החל מ-{date}."
 
 #: common/djangoapps/student/views.py
 msgid "Photos are mismatched"
-msgstr ""
+msgstr "התמונות אינן תואמות"
 
 #: common/djangoapps/student/views.py
 msgid "Name missing from ID photo"
-msgstr ""
+msgstr "חסר שם בתמונה מזהה"
 
 #: common/djangoapps/student/views.py
 msgid "ID photo not provided"
-msgstr ""
+msgstr "לא סופקה תמונה מזהה"
 
 #: common/djangoapps/student/views.py
 msgid "ID is invalid"
-msgstr ""
+msgstr "מזהה אינו תקין"
 
 #: common/djangoapps/student/views.py
 msgid "Learner photo is blurry"
-msgstr ""
+msgstr "תמונת הלומד מטושטשת"
 
 #: common/djangoapps/student/views.py
 msgid "Name on ID does not match name on account"
-msgstr ""
+msgstr "השם בתעודה המזהה אינו תואם את השם בחשבון"
 
 #: common/djangoapps/student/views.py
 msgid "Learner photo not provided"
-msgstr ""
+msgstr "תמונת הלומד לא סופקה"
 
 #: common/djangoapps/student/views.py
 msgid "ID photo is blurry"
-msgstr ""
+msgstr "תמונה מזהה מטושטשת"
 
 #: common/djangoapps/student/views.py
 msgid "Course id not specified"
@@ -790,6 +823,10 @@ msgid ""
 "an email, check your spam folders or <a href=\"{support_url}\">contact "
 "{platform} Support</a>."
 msgstr ""
+"בכדי להתחבר, את/ה צריכ/ה להפעיל את החשבון שלך. <br /><br />כרגע שלחנו קישור "
+"להפעלה ל<strong>{email}</strong>. אם אינך קיבלת את הדוא\"ל, בדק/י את תיקיית "
+"דואר הזבל או <a href=\"{support_url}\">צור/י קשר עם התמיכה של "
+"{platform}</a>. "
 
 #: common/djangoapps/student/views.py
 #, python-brace-format
@@ -886,7 +923,7 @@ msgstr "חשבון עם דואר אלקטרוני '{email}' קיים כבר."
 #: common/djangoapps/student/views.py
 #, python-brace-format
 msgid "Registration using {provider} has timed out."
-msgstr ""
+msgstr "תם פרק הזמן להרשמה באמצעות {provider}."
 
 #: common/djangoapps/student/views.py
 msgid "An access_token is required when passing value ({}) for provider."
@@ -904,7 +941,7 @@ msgstr "ה-access_token  שסופק אינו חוקי."
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Account creation not allowed."
-msgstr ""
+msgstr "לא ניתן ליצור חשבון."
 
 #: common/djangoapps/student/views.py
 #, python-brace-format
@@ -913,11 +950,13 @@ msgid ""
 "wrong, please <a href=\"{support_url}\">contact support</a> to resolve this "
 "issue."
 msgstr ""
+"{html_start}החשבון שלך לא יכול להיות מופעל{html_end}משהו השתבש, בבקשה <a "
+"href=\"{support_url}\">צור/י קשר עם התמיכה</a> על מנת לפתור בעיה זו."
 
 #: common/djangoapps/student/views.py
 #, python-brace-format
 msgid "{html_start}Success{html_end} You have activated your account."
-msgstr ""
+msgstr "{html_start}הצלחה{html_end}הפעלת את החשבון שלך."
 
 #: common/djangoapps/student/views.py
 #, python-brace-format
@@ -926,11 +965,13 @@ msgid ""
 "receive email updates and alerts from us related to the courses you are "
 "enrolled in. Sign In to continue."
 msgstr ""
+"{html_start}הצלחה! הפעלת את החשבון שלך.{html_end} את/ה תקבל/י מאיתנו עדכונים"
+" והתראות הקשורים לקורסים שאת/ה רשומ/ה אליהם. להמשך התחבר/י."
 
 #: common/djangoapps/student/views.py
 #, python-brace-format
 msgid "{html_start}This account has already been activated.{html_end}"
-msgstr ""
+msgstr "{html_start}חשבון זה כבר הופעל{html_end}"
 
 #: common/djangoapps/student/views.py
 #, python-brace-format
@@ -1017,6 +1058,9 @@ msgid ""
 "forwarded directly to the login URL of the provider instead of being first "
 "prompted with a login dialog."
 msgstr ""
+"אם אופציה זו מאופשרת, משתמשים המבקרים בכתובת \"TPA מרומזת\" עבור ספק זה "
+"(לדוגמא כתובת הנגמרת עם ?tpa_hint=[provider_name]`) יעוברו ישירות אל כתובת "
+"ההתחברות של הספק במקום להגיע קודם אל תופס ההתחברות."
 
 #: common/djangoapps/third_party_auth/models.py
 msgid ""
@@ -1051,6 +1095,9 @@ msgid ""
 "third_party_auth.decorators.tpa_hint_ends_existing_session when a tpa_hint "
 "URL query parameter mapping to this provider is included in the request."
 msgstr ""
+"האם למחוק את נתוני הסשן כאשר ניגשים לתצוגה מעוצבת עם "
+"third_party_auth.decorators.tpa_hint_ends_existing_session כאשר שאילתת UR  "
+"tpa_hint המתמפה לספק זה כלולה בבקשה."
 
 #: common/djangoapps/third_party_auth/models.py
 msgid ""
@@ -1059,6 +1106,10 @@ msgid ""
 "(zero), the session will expire upon the user closing their browser. If left"
 " blank, the Django platform session default length will be used."
 msgstr ""
+"אם אפשרות זו מוגדרת, אז אורך סשן חיבור של משתמשים המתחברים בעזרת ספק SSO זה "
+"יהיו מוגבלים ללא יותר מערך זה. אם מוגדר 0 (אפס), אז הסשן יפוג ברגע שהמשתמש "
+"יסגור את הדפדפן שלו. אם נשאר ריק, ערך ברירת המחדל של פלטפורמט Django יהיה "
+"בשימוש."
 
 #: common/djangoapps/third_party_auth/models.py
 msgid ""
@@ -1066,6 +1117,8 @@ msgid ""
 "immediately after authenticating with the third party instead of the login "
 "page."
 msgstr ""
+"אם אפשרות זו נבחרה, משתמשים יועברו לדף הרישום מייד לאחר ההזדהות עם צד שלישי "
+"במקום דף ההתחברות."
 
 #: common/djangoapps/third_party_auth/models.py
 msgid "The Site that this SAML configuration belongs to."
@@ -1594,7 +1647,7 @@ msgstr "לא נענה"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "submitted"
-msgstr ""
+msgstr "הוגש"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "processing"
@@ -1795,15 +1848,14 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr "אינו יכול לפרש '{student_answer}' כמספר."
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
-msgstr ""
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
+msgstr "אין להשתמש במשתנים ({bad_variables}) בבעיות מספריות."
 
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid "Factorial function evaluated outside its domain:'{student_answer}'"
-msgstr ""
+msgstr "פונקציית עצרת משוערכת מחוץ לדומיין שלה: '{student_answer}'"
 
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
@@ -1847,7 +1899,6 @@ msgstr "חלה בעיה בתשובת הצוות עבור בעיה זו: גבול
 msgid "or"
 msgstr "או"
 
-#: common/lib/capa/capa/responsetypes.py
 #: cms/templates/widgets/problem-edit.html
 msgid "Text Input"
 msgstr "שדה הכנסת הטקסט"
@@ -1917,12 +1968,19 @@ msgstr "בודק חיצוני"
 msgid "Math Expression Input"
 msgstr "שדה נוסחה מתמטית"
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr "הזנת נתונים לא חוקיים: {bad_input} לא מאושר בתשובה."
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
 "Factorial function not permitted in answer for this problem. Provided answer"
 " was: {bad_input}"
 msgstr ""
+"פונקציות עצרת לא חוקיות בתשובה עבור בעיה זו. התשובה שניתנה הייתה: "
+"{bad_input}"
 
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
@@ -2004,7 +2062,7 @@ msgstr "מידע XML עבור הסברים"
 #: common/lib/xmodule/xmodule/x_module.py
 #: openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
 msgid "The display name for this component."
-msgstr ""
+msgstr "שם התצוגה עבור רכיב זה"
 
 #: common/lib/xmodule/xmodule/annotatable_module.py
 msgid "Annotation"
@@ -2042,13 +2100,13 @@ msgstr "משך הזמן לאחר תאריך היעד בו יתקבלו עדיי
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Show Results"
-msgstr ""
+msgstr "הצג תוצאות"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Defines when to show whether a learner's answer to the problem is correct. "
 "Configured on the subsection."
-msgstr ""
+msgstr "מגדיר מתי להציג האם תשובת הלומד לבעיה נכונה. מוגדר בתת פרק."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Always"
@@ -2150,9 +2208,13 @@ msgid "Dictionary with the current student responses"
 msgstr "מילון עם התשובות הנוכחיות של הסטודנט"
 
 #: common/lib/xmodule/xmodule/capa_base.py
-msgid "Whether or not the answers have been saved since last submit"
+msgid "Dictionary with the current student score"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Whether or not the answers have been saved since last submit"
+msgstr "בין אם התשובות נשמרו או לא נשמרו מאז ההגשה האחרונה"
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether the student has answered the problem"
 msgstr "האם הסטודנט ענה על הבעיה."
@@ -2228,6 +2290,8 @@ msgstr ""
 #: lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "הגש"
@@ -2276,7 +2340,7 @@ msgstr "רמז ({hint_num} מתוך {hints_count}):"
 #, python-brace-format
 msgid ""
 "Your answers were previously saved. Click '{button_name}' to grade them."
-msgstr ""
+msgstr "תשובותיך נשמרו קודם. לחץ על  '{button_name}' כדי לתת להן ציון."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #, python-brace-format
@@ -2305,7 +2369,7 @@ msgstr "נכון חלקית"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Answer submitted."
-msgstr ""
+msgstr "תשובה נענתה."
 
 #. Translators: 'closed' means the problem's due date has passed. You may no
 #. longer attempt to solve the problem.
@@ -2516,7 +2580,7 @@ msgstr "התאריך שבו כיתה זו מסיימת"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Date that certificates become available to learners"
-msgstr ""
+msgstr "תאריך בו התעודות הופכת זמינות ללומדים"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Cosmetic Course Display Price"
@@ -2533,7 +2597,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Advertised Start"
-msgstr ""
+msgstr "תחילת הקורס המפורסם"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2541,6 +2605,8 @@ msgid ""
 "for the course, such as \"Winter 2018\". If you enter null for this value, "
 "the start date that you have set for this course is used."
 msgstr ""
+"הזן את הטקסט שבו ברצונך להשתמש בתור מסגרת זמן להתחלה שפורסמה עבור הקורס, "
+"למשל \"חורף 2018\". אם תזין null, התאריך יהיה תאריך תחילת הקורס שהגדרת."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Pre-Requisite Courses"
@@ -2634,6 +2700,14 @@ msgid ""
 "\"default\" attribute to true. For example, \"Lydian Mode\": {\"id\": \"i4x-"
 "UniversityX-MUS101-course-2015_T1\", \"default\": true}."
 msgstr ""
+"הכנס/י קטגוריות דיון בתבנית הבאה:  \"שם הקטגוריה\": {\"id\": \"i4x-שם המוסד-"
+"מספר הקורס-קורס-שנה_סמסטר\"}. לדוגמא אחת קטגוריות דיון יכולה להיות \"Lydian "
+"Mode\": {\"id\": \"i4x-UniversityX-MUS101-course-2015_T1\"}. ערך ה \"id\" "
+"עבור כל קטגוריה חייב להיות יחודי. בערך ה \"id\", התווים היחודים  שניתן "
+"להשתמש בהם הם קו תחתון, מקף ונקודה. ניתן גם לציין קטגוריה כברירת מחדל עבור "
+"הודעות חדשות בדף הדיון על ידי הגדרת התכונה \"ברירת מחדל\" לאמת. לדוגמה,  "
+"\"Lydian Mode\": {\"id\": \"i4x-UniversityX-MUS101-course-2015_T1\", "
+"\"default\": true}."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Discussion Sorting Alphabetical"
@@ -2837,6 +2911,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "דפי מידע של הקורס"
 
@@ -3640,6 +3715,7 @@ msgid ""
 "The display name for this component. Analytics reports may also use the "
 "display name to identify this component."
 msgstr ""
+"שם הרכיב שמוצג. דוחות הניתוח יכולים להשתמש גם בשם התצוגה לזיהוי מרכיב זה."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "LTI ID"
@@ -3893,6 +3969,8 @@ msgid ""
 "Specify when to show answer correctness and score to learners. Valid values "
 "are \"always\", \"never\", and \"past_due\"."
 msgstr ""
+"מציין מתי להראת ללומד תשובה נכונה וציון. ערכים תקינים הם: \"תמיד\", \"אף "
+"פעם\" ו \"הזמן עבר\"."
 
 #. Translators: DO NOT translate the words in quotes here, they are
 #. specific words for the acceptable values.
@@ -4059,31 +4137,31 @@ msgstr ""
 #: common/lib/xmodule/xmodule/partitions/partitions_service.py
 #: cms/templates/group_configurations.html
 msgid "Enrollment Track Groups"
-msgstr ""
+msgstr "קבוצות מסלול הרשמה"
 
 #: common/lib/xmodule/xmodule/partitions/partitions_service.py
 msgid "Partition for segmenting users by enrollment track"
-msgstr ""
+msgstr "חלוקה לקבוצות משתמשים לפי מסלול הרשמה"
 
 #: common/lib/xmodule/xmodule/poll_module.py
 msgid "Whether this student has voted on the poll"
-msgstr ""
+msgstr "האם סטודנט זה השתתף בסקר"
 
 #: common/lib/xmodule/xmodule/poll_module.py
 msgid "Student answer"
-msgstr ""
+msgstr "תשובת הסטודנט"
 
 #: common/lib/xmodule/xmodule/poll_module.py
 msgid "Poll answers from all students"
-msgstr ""
+msgstr "תשובות כל הסטודנטים על הסקר"
 
 #: common/lib/xmodule/xmodule/poll_module.py
 msgid "Poll answers from xml"
-msgstr ""
+msgstr "תשובות לסקר מקובץ xml"
 
 #: common/lib/xmodule/xmodule/poll_module.py
 msgid "Poll question"
-msgstr ""
+msgstr "שאלה בסקר"
 
 #: common/lib/xmodule/xmodule/seq_module.py
 msgid "Enter the date by which problems are due."
@@ -4175,12 +4253,12 @@ msgstr "מבחן זה חסוי ללומד."
 #: common/lib/xmodule/xmodule/seq_module.py
 msgid ""
 "Because the course has ended, this assignment is hidden from the learner."
-msgstr ""
+msgstr "מכיוון שהקורס כבר נגמר, מטלה זו מוסתרת."
 
 #: common/lib/xmodule/xmodule/seq_module.py
 msgid ""
 "Because the due date has passed, this assignment is hidden from the learner."
-msgstr ""
+msgstr "מכיוון שתאריך היעד כבר חלף, מטלה זו מוסתרת."
 
 #: common/lib/xmodule/xmodule/seq_module.py
 msgid ""
@@ -4199,7 +4277,7 @@ msgstr "לא נבחר "
 
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "The display name for this component. (Not shown to learners)"
-msgstr ""
+msgstr "שם הרכיב שמופיע בתצוגה. (לא מופיע לתלמידים)"
 
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Content Experiment"
@@ -4802,7 +4880,7 @@ msgstr "בדוק את תחביר הערך שלך."
 
 #: lms/djangoapps/branding/api.py
 msgid "Take free online courses at edX.org"
-msgstr ""
+msgstr "הרשמו לקורסים מקוונים בחינם ב edX.org"
 
 #. Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'.
 #. Please do not translate any of these trademarks and company names.
@@ -4812,6 +4890,8 @@ msgid ""
 "© {org_name}.  All rights reserved except where noted.  EdX, Open edX and "
 "their respective logos are trademarks or registered trademarks of edX Inc."
 msgstr ""
+"© {org_name}.  כל הזכויות שמורות, למעט כשמצוין אחרת‏. EdX‏, Open edX והסמלים"
+" הם סימנים מסחריים רשומים או סימנים מסחריים של edX Inc."
 
 #. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: 'Open edX' is a brand, please keep this untranslated.
@@ -4827,7 +4907,7 @@ msgstr "מופעל על ידי Open edX"
 #: lms/djangoapps/branding/api.py
 #, python-brace-format
 msgid "{platform_name} for Business"
-msgstr ""
+msgstr "{platform_name} לעסקים"
 
 #: lms/djangoapps/branding/api.py lms/templates/static_templates/blog.html
 msgid "Blog"
@@ -4882,6 +4962,7 @@ msgstr "מדיניות נגישות"
 msgid "Sitemap"
 msgstr "מפת אתר"
 
+#: lms/djangoapps/branding/api.py
 #: lms/templates/static_templates/media-kit.html
 msgid "Media Kit"
 msgstr "ערכת מדיה"
@@ -4911,7 +4992,7 @@ msgstr "הורד את האפליקציה לנייד של {platform_name} מ-Goog
 #: lms/djangoapps/bulk_email/tasks.py
 #, python-brace-format
 msgid "\"{course_title}\" Course Staff"
-msgstr ""
+msgstr "\"{course_title}\" צוות הקורס"
 
 #: lms/djangoapps/ccx/plugins.py
 msgid "CCX Coach"
@@ -5395,6 +5476,7 @@ msgid "Percent of Students"
 msgstr "אחוז מהסטודנטים"
 
 #: lms/djangoapps/class_dashboard/dashboard_data.py
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Score"
 msgstr "תוצאה"
 
@@ -5440,7 +5522,7 @@ msgstr "נתיב לעמוד הקבלה להזמנה."
 
 #: lms/djangoapps/commerce/models.py
 msgid "Automatically approve valid refund requests, without manual processing"
-msgstr ""
+msgstr "אישור אוטומטי של בקשות החזר כספי תקפות, ללא עיבוד ידני"
 
 #: lms/djangoapps/commerce/signals.py
 #, python-brace-format
@@ -5602,6 +5684,7 @@ msgid "Upgrade to Verified Certificate"
 msgstr "שדרג לתעודה מאומתת"
 
 #: lms/djangoapps/courseware/date_summary.py
+#: cms/templates/group_configurations.html
 msgid "Learn More"
 msgstr "למד עוד"
 
@@ -5645,6 +5728,15 @@ msgid ""
 "specific student."
 msgstr "לא ניתן להציג סוג זה של רכיב בעת צפייה בקורס כסטודנט ספציפי."
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "סילבוס"
@@ -5662,27 +5754,28 @@ msgstr "התקדמות"
 msgid "Textbooks"
 msgstr "ספרי לימוד"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "חינם"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
+msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
@@ -6194,12 +6287,14 @@ msgid ""
 "Number of seconds to delay the sending of User Welcome email after user has "
 "been activated"
 msgstr ""
+"מספר שניות להשהיית המשלוח של הודעת 'ברוכים הבאים' לאחר ההפעלה של חשבון "
+"המשתמש"
 
 #: lms/djangoapps/email_marketing/models.py
 msgid ""
 "The number of seconds to delay/timeout wait to get cookie values from "
 "sailthru."
-msgstr ""
+msgstr "מספר השניות להשהייה/פסק הזמן להמתנה עד קבלת ערכי עוגיה מ-sailthru"
 
 #: lms/djangoapps/instructor/paidcourse_enrollment_report.py
 #, python-brace-format
@@ -6438,11 +6533,11 @@ msgstr "יעדים"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Enrollment Mode"
-msgstr ""
+msgstr "מצב הרשמה"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Verification Status"
-msgstr ""
+msgstr "מצב אימות"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Cohort"
@@ -6985,6 +7080,7 @@ msgstr "חברות"
 msgid "Cohorts"
 msgstr "קבוצות למידה"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html
 msgid "Discussions"
 msgstr "דיונים"
@@ -7012,7 +7108,7 @@ msgstr "מדדים"
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "Open Responses"
-msgstr ""
+msgstr "תגובות פתוחות"
 
 #. Translators: number sent refers to the number of emails sent
 #: lms/djangoapps/instructor/views/instructor_task_helpers.py
@@ -7120,6 +7216,14 @@ msgstr "הארכות תאריך יעד עבור {0} {1} ({2})"
 
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "This component cannot be rescored."
+msgstr "למרכיב זה לא ניתן לתת ציון מחדש."
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
 msgstr ""
 
 #: lms/djangoapps/instructor_task/api_helper.py
@@ -7132,6 +7236,12 @@ msgstr "לא כל הבעיות בכניסה לבחינה תומכות באפשר
 msgid "rescored"
 msgstr "תן ציון מחדש"
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -7421,10 +7531,25 @@ msgstr "(מתוך {total})"
 msgid ""
 "This component's access settings refer to deleted or invalid group "
 "configurations."
+msgstr "הגדרות גישת ברכיב זה מתייחסות לקבוצת הגדרות מחוקה או לא תקינה."
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
 msgstr ""
 
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
+msgstr "הגדרות גישה ברכיב זה מתיחסות לקבוצה מחוקה או לא תקינה."
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
 msgstr ""
 
 #: lms/djangoapps/lms_xblock/mixin.py
@@ -8952,7 +9077,7 @@ msgstr "קוסובו"
 #: lms/envs/common.py
 #, python-brace-format
 msgid "Welcome to {platform_name}."
-msgstr ""
+msgstr "ברוכ/ה הבא/ה ל {platform_name}."
 
 #: lms/envs/common.py
 #, python-brace-format
@@ -8961,6 +9086,14 @@ msgid ""
 "{start_bold}{platform_name}{end_bold} to offer you high-quality learning "
 "opportunities from the world's best universities."
 msgstr ""
+"{start_bold}{enterprise_name}{end_bold} חבר ל "
+"{start_bold}{platform_name}{end_bold} להציע הזדמנות לאיכות למידה גבוהה "
+"מהאונברסיטאות המבוילות בעולם."
+
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
 
 #: lms/templates/logout.html
 msgid "Signed Out"
@@ -9007,7 +9140,6 @@ msgstr ""
 #: lms/templates/oauth2_provider/authorize.html
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -9025,10 +9157,8 @@ msgstr "שגיאה"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
+" user account at %(platform_name)s."
 msgstr ""
-"אתה מקבל דואר אלקטרוני זה מפני שביקשת איפוס סיסמה עבור חשבון המשתמש שלך "
-"ב%(site_name)s."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -9149,7 +9279,6 @@ msgstr "תצוגה מקדימה"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "סגור"
@@ -9414,6 +9543,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -9609,7 +9740,7 @@ msgstr "כתובת URL ל-API פנימי"
 
 #: openedx/core/djangoapps/catalog/models.py
 msgid "DEPRECATED: Use the setting COURSE_CATALOG_API_URL."
-msgstr ""
+msgstr "יצא משימוש: השתמש/י בהגדרה COURSE_CATALOG_API_URL."
 
 #: openedx/core/djangoapps/catalog/models.py
 msgid ""
@@ -9622,17 +9753,18 @@ msgstr ""
 msgid ""
 "Username created for Course Catalog Integration, e.g. "
 "lms_catalog_service_user."
-msgstr ""
+msgstr "שם המשתמש שנוצר לשילוב קטלוג הקורסים, למשל lms_catalog_service_user."
 
 #: openedx/core/djangoapps/catalog/models.py
 msgid "Page Size"
-msgstr ""
+msgstr "גודל העמוד"
 
 #: openedx/core/djangoapps/catalog/models.py
 msgid ""
 "Maximum number of records in paginated response of a single request to "
 "catalog service."
 msgstr ""
+"המספר המקסימלי של רשומות בתגובה מחולקת לדפים עבור בקשה אחת לשירות הקטלוג."
 
 #: openedx/core/djangoapps/cors_csrf/models.py
 msgid ""
@@ -9829,6 +9961,22 @@ msgstr "איפוס השפה לקוד השפה המוגדר כברירת מחדל
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr "איפוס השפה להעדפת המשתמש: {preview_language_code}"
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -9958,6 +10106,25 @@ msgstr "נתיב המשמש לבניית כתובות URL לדפי שיווק ת
 msgid "Enable course home page improvements."
 msgstr "אפשר שיפורים בעמוד הבית של הקורס."
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -10071,37 +10238,41 @@ msgstr "נראה כי {username} שייך לחשבון קיים. נסה שוב 
 #. below a field meant to hold the user's email address.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "This is what you will use to login."
-msgstr ""
+msgstr "זה מה שתשתמש/י בו על מנת להתחבר."
 
 #. Translators: This label appears above a field on the registration form
 #. meant to confirm the user's email address.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Confirm Email"
-msgstr ""
+msgstr "אשר/י דוא\"ל"
 
 #: openedx/core/djangoapps/user_api/views.py
 msgid "The email addresses do not match."
-msgstr ""
+msgstr "כתובת הדוא\"ל אינה תואמת."
 
 #. Translators: This example name is used as a placeholder in
 #. a field on the registration form meant to hold the user's name.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Jane Q. Learner"
-msgstr ""
+msgstr "ג'יין קיו. לרנר"
 
 #. Translators: These instructions appear on the registration form,
 #. immediately
 #. below a field meant to hold the user's full name.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "This name will be used on any certificates that you earn."
-msgstr ""
+msgstr "השם הזה ישמש עבור כל תעודה שתקבל/י."
 
-#: cms/templates/register.html lms/templates/register-form.html
-#: lms/templates/register-shib.html lms/templates/signup_modal.html
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This label appears above a field on the registration form
+#. meant to hold the user's public username.
+#: openedx/core/djangoapps/user_api/views.py cms/templates/register.html
+#: lms/templates/register-form.html lms/templates/register-shib.html
+#: lms/templates/signup_modal.html
 #: themes/stanford-style/lms/templates/register-form.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Public Username"
-msgstr "שם קמפוס"
+msgstr "שם משתמש"
 
 #. Translators: These instructions appear on the registration form,
 #. immediately
@@ -10110,12 +10281,14 @@ msgstr "שם קמפוס"
 msgid ""
 "The name that will identify you in your courses. It cannot be changed later."
 msgstr ""
+"שם משתמש באנגלית וללא רווחים, שיזהה אותך בקורסים. אינו ניתן לשינוי מאוחר "
+"יותר."
 
 #. Translators: This example username is used as a placeholder in
 #. a field on the registration form meant to hold the user's username.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Jane_Q_Learner"
-msgstr ""
+msgstr "ג'יין_קיו_לרנר"
 
 #. Translators: This label appears above a dropdown menu on the registration
 #. form used to select the user's highest completed level of education.
@@ -10197,17 +10370,22 @@ msgstr "עליך להסכים ל{terms_of_service} של {platform_name}"
 msgid "Review the Terms of Service"
 msgstr "סקור את תנאי השימוש"
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr "מפתח הקורס עבור הקורס שברצוננו להפוך לקבוצת לימוד אוטומטית."
 
 #: openedx/core/djangoapps/waffle_utils/models.py
 msgid "Force On"
-msgstr ""
+msgstr "אלץ דלוק"
 
 #: openedx/core/djangoapps/waffle_utils/models.py
 msgid "Force Off"
-msgstr ""
+msgstr "אלץ כבוי"
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -10270,6 +10448,7 @@ msgid ""
 "Dashboard."
 msgstr ""
 
+#: cms/djangoapps/contentstore/course_group_config.py
 #: cms/templates/group_configurations.html
 msgid "Content Groups"
 msgstr "קבוצות תוכן"
@@ -10380,11 +10559,11 @@ msgstr ""
 #: cms/djangoapps/contentstore/tasks.py
 #, python-brace-format
 msgid "Unknown User ID: {0}"
-msgstr ""
+msgstr "מזהה משתמש לא ידוע: {0}"
 
 #: cms/djangoapps/contentstore/tasks.py
 msgid "Permission denied"
-msgstr ""
+msgstr "ההרשאה נדחתה"
 
 #: cms/djangoapps/contentstore/tasks.py
 #: cms/djangoapps/contentstore/views/import_export.py
@@ -10393,11 +10572,11 @@ msgstr "אנו תומכים בהעלאת קובץ .tar.gz בלבד."
 
 #: cms/djangoapps/contentstore/tasks.py
 msgid "Tar file not found"
-msgstr ""
+msgstr "קובץ Tar לא נמצא"
 
 #: cms/djangoapps/contentstore/tasks.py
 msgid "Unsafe tar file. Aborting import."
-msgstr ""
+msgstr "קובץ ה-Tar אינו בטוח. פעולת הייבוא מופסקת."
 
 #: cms/djangoapps/contentstore/tasks.py
 #, python-brace-format
@@ -10719,7 +10898,7 @@ msgstr "מוכן"
 #. Translators: This is the status for a video that is uploaded completely
 #: cms/djangoapps/contentstore/views/videos.py
 msgid "Uploaded"
-msgstr ""
+msgstr "הועלה"
 
 #. Translators: This is the status for a video that the servers have failed to
 #. process
@@ -10731,7 +10910,7 @@ msgstr "נכשל"
 #. by user
 #: cms/djangoapps/contentstore/views/videos.py
 msgid "Cancelled"
-msgstr ""
+msgstr "בוטל"
 
 #. Translators: This is the status for a video which has failed
 #. due to being flagged as a duplicate by an external or internal CMS
@@ -10743,7 +10922,7 @@ msgstr "ההעתקה נכשלה"
 #. youtube
 #: cms/djangoapps/contentstore/views/videos.py
 msgid "YouTube Duplicate"
-msgstr ""
+msgstr "כפילות ב-YouTube "
 
 #. Translators: This is the status for a video for which an invalid
 #. processing token was provided in the course settings
@@ -10940,7 +11119,7 @@ msgstr "תוכן"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "טוען"
 
@@ -10957,6 +11136,16 @@ msgstr "הגדרות"
 msgid "Course Number"
 msgstr "מספר הקורס"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -10984,7 +11173,6 @@ msgstr "מספר הקורס"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "קורסים"
 
@@ -11055,7 +11243,7 @@ msgstr "תאריך סיום הקורס"
 
 #: cms/templates/settings.html lms/templates/courseware/program_marketing.html
 msgid "Instructors"
-msgstr ""
+msgstr "מדריכים"
 
 #: cms/templates/settings.html lms/templates/courseware/course_about.html
 msgid "Requirements"
@@ -11075,11 +11263,14 @@ msgstr "הצג"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr "תצוגה מקדימה של הגדרות שפה"
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "אתחל"
 
@@ -11089,6 +11280,11 @@ msgstr "אתחל"
 msgid "Legal"
 msgstr "משפטי"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -11172,7 +11368,6 @@ msgid "Usermenu dropdown"
 msgstr "רשימה נפתחת של תפריט המשתמש"
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "התנתק"
 
@@ -11370,12 +11565,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "חזור ל {link_start}עמוד הבית{link_end}."
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "שינוי כתובת דואר אלקטרוני עבר בהצלחה!"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr ""
 "תוכל לראות את כתובת הדואר האלקטרוני החדשה שלך  ב{link_start}לוח "
@@ -11561,7 +11754,7 @@ msgstr ""
 
 #: lms/templates/help_modal.html
 msgid "- Select -"
-msgstr ""
+msgstr "-בחר-"
 
 #: lms/templates/help_modal.html
 msgid "problem"
@@ -11617,11 +11810,11 @@ msgstr "אנא נסה שוב מאוחר יותר"
 
 #: lms/templates/hidden_content.html
 msgid "The course has ended."
-msgstr ""
+msgstr "הקורס הסתיים"
 
 #: lms/templates/hidden_content.html
 msgid "The due date for this assignment has passed."
-msgstr ""
+msgstr "תאריך היעד למשימה זו עבר."
 
 #: lms/templates/hidden_content.html
 msgid ""
@@ -11629,6 +11822,8 @@ msgid ""
 "available.{line_break}If you have completed this assignment, your grade is "
 "available on the {link_start}progress page{link_end}."
 msgstr ""
+"היות והקורס הסתיים, משימה זו אינה זמינה עוד. {line_break} אם השלמת את המשימה"
+" הזו, הציון שלך יהיה זמין ב-{link_start}progress page{link_end}."
 
 #: lms/templates/hidden_content.html
 msgid ""
@@ -11636,6 +11831,8 @@ msgid ""
 "available.{line_break}If you have completed this assignment, your grade is "
 "available on the {link_start}progress page{link_end}."
 msgstr ""
+"היות ותאריך היעד עבר, משימה זו אינה זמינה עוד. {line_break} אם השלמת את "
+"המשימה הזו, הציון שלך יהיה זמין ב-{link_start}progress page{link_end}."
 
 #: lms/templates/imageannotation.html
 msgid "Note: only instructors may annotate."
@@ -11950,6 +12147,8 @@ msgid ""
 "Some problems have options such as save, reset, hints, or show answer. These"
 " options follow the Submit button."
 msgstr ""
+"כדי לפתור חלק מהבעיות אפשר להשתמש באפשרויות כמו שמירה, איפוס, רמזים או 'הצג "
+"תשובה'. אפשרויות אלו מופיעות לאחר לחיצה על כפתור 'הגש'."
 
 #: lms/templates/problem.html
 msgid "Hint"
@@ -12258,7 +12457,7 @@ msgstr "הקודם"
 
 #: lms/templates/seq_module.html
 msgid "Sequence"
-msgstr ""
+msgstr "רצף"
 
 #: lms/templates/seq_module.html
 msgid "Next"
@@ -12355,14 +12554,18 @@ msgid "Add comment"
 msgstr "הוסף הערה"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "צוות איתור באגים"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "פעולות"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr "אפס את ניסיונות הלומד"
@@ -12382,6 +12585,10 @@ msgstr "תן ציון מחדש להגשות הלומד"
 msgid "Rescore Only If Score Improves"
 msgstr "תן ציון מחדש רק אם הציון משתפר"
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "שדות מודולרים"
@@ -12598,7 +12805,7 @@ msgstr ""
 "{dashboard_link_start}לחזור ללוח הבקרה{link_end}. אם לא התכוונת לעשות זאת, "
 "{undo_link_start}באפשרותך לבטל את המנוי{link_end}."
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "לוח בקרה של:"
 
@@ -12608,7 +12815,7 @@ msgstr "פרופיל"
 
 #: lms/templates/user_dropdown.html
 msgid "More options"
-msgstr ""
+msgstr "אפשרויות נוספות"
 
 #: lms/templates/using.html
 msgid "Using the system"
@@ -13687,6 +13894,7 @@ msgid "Auto Enroll"
 msgstr "רישום אוטומטי"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
@@ -13695,6 +13903,7 @@ msgstr ""
 " יירשמו אוטומטית."
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -13714,6 +13923,7 @@ msgid "Notify users by email"
 msgstr "הודע למשתמשים באמצעות דואר אלקטרוני"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -14111,6 +14321,7 @@ msgstr "{span_start}פרק נוכחי{span_end}"
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "תאריך הגשה {date}"
 
@@ -14119,6 +14330,7 @@ msgid "{section_format} due {{date}}"
 msgstr "{section_format} ב- {{date}}"
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "תוכן זה מקבל דירוג"
 
@@ -14264,6 +14476,7 @@ msgstr "מקד את חיפושך"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "{course_number} לומדה"
 
@@ -14276,7 +14489,8 @@ msgstr "שירותי הקורס"
 msgid "Courseware"
 msgstr "לומדה"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "סימניות"
 
@@ -14294,6 +14508,8 @@ msgid ""
 "To access course materials, you must score {required_score}% or higher on "
 "this                     exam. Your current score is {current_score}%."
 msgstr ""
+"כדי לגשת לחומרי הקורס, עליך להשיג ציון של {required_score}% ומעלה במבחן. "
+"הציון הנוכחי שלך הוא {current_score}%."
 
 #: lms/templates/courseware/courseware.html
 msgid "Your score is {current_score}%. You have passed the entrance exam."
@@ -14338,6 +14554,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "ברוכים הבאים אל הקורס {course_name} של {org}!"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "המשך בקורס"
 
@@ -14354,13 +14572,10 @@ msgid "Handout Navigation"
 msgstr "ניווט דפי מידע"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "חדשות - MITx 6.002x"
@@ -14383,7 +14598,7 @@ msgstr ""
 
 #: lms/templates/courseware/program_marketing.html
 msgid "Play"
-msgstr ""
+msgstr "נגן"
 
 #: lms/templates/courseware/program_marketing.html
 msgid "Number of Courses"
@@ -14441,7 +14656,7 @@ msgstr ""
 
 #: lms/templates/courseware/program_marketing.html
 msgid "Overview"
-msgstr ""
+msgstr "סקירה"
 
 #: lms/templates/courseware/program_marketing.html
 msgid "Job Outlook"
@@ -14449,7 +14664,7 @@ msgstr ""
 
 #: lms/templates/courseware/program_marketing.html
 msgid "What You'll Learn"
-msgstr ""
+msgstr "מה תלמד"
 
 #: lms/templates/courseware/program_marketing.html
 msgid "{position} at {organization}"
@@ -15214,18 +15429,18 @@ msgstr "סנן:"
 #. Translators: This is a menu option for showing all forum threads unfiltered
 #: lms/templates/discussion/_thread_list_template.html
 msgid "Show all posts"
-msgstr ""
+msgstr "הראה את כל הפוסטים"
 
 #. Translators: This is a menu option for showing only unread forum threads
 #: lms/templates/discussion/_thread_list_template.html
 msgid "Unread posts"
-msgstr ""
+msgstr "פוסטים שלא נקראו"
 
 #. Translators: This is a menu option for showing only unanswered forum
 #. question threads
 #: lms/templates/discussion/_thread_list_template.html
 msgid "Unanswered posts"
-msgstr ""
+msgstr "פוסטים שלא נענו"
 
 #. Translators: This is a menu option for showing only forum threads flagged
 #. for abuse
@@ -17110,30 +17325,6 @@ msgstr "לכן, פרט כמה שיותר על פעולה זו."
 msgid "Reason"
 msgstr "סיבה"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"אם אפשרות זו <em>סומנה</em>, משתמשים שטרם נרשמו ל{platform_name} ירשמו באופן"
-" אוטומטי."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"אם אפשרות זו <em>לא סומנה</em>, משתמשים שטרם נרשמו ל{platform_name} לא ירשמו"
-" באופן אוטומטי, אבל תתאפשר כניסתם לאחר שיפתחו חשבון. "
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr ""
-"אם אפשרות זו <em>סומנה</em>, משתמשים יקבלו התראה בהודעת דואר אלקטרוני. "
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "רשום סטודנטים"
@@ -17171,11 +17362,9 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
 msgstr ""
-"אם אפשרות זו <em>סומנה</em>, משתמשים שלא נרשמו לקורס שלך, ירשמו באופן "
-"אוטומטי. "
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -17306,16 +17495,30 @@ msgid "Add Moderator"
 msgstr "הוסף מנחה"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "דיון עוזרי הוראה קהילתיים"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -17442,7 +17645,7 @@ msgstr "(לומדים שלא הוקצו במפורש למחזור לימודים
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Learners in the {track_name} Track"
-msgstr ""
+msgstr "לומדים הנמצאים במסלול {track_name} "
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Subject: "
@@ -17557,8 +17760,8 @@ msgid "View a specific learner's grades and progress"
 msgstr "הצג ציונים והתקדמות של לומד ספציפי"
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
-msgstr "כתובת דואר אלקטרוני או שם משתמש {platform_name} של הלומד"
+msgid "Learner's {platform_name} email address or username"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Learner email address or username"
@@ -17573,8 +17776,8 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr "התאם ציון של תלמיד לבעיה ספציפית"
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
-msgstr "מיקום של בעיה בקורס *"
+msgid "Location of problem in course"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Example"
@@ -17610,6 +17813,23 @@ msgstr ""
 "תן ציון מחדש לתשובות הלומד, עבור הבעיה שצוינה. האפשרות 'תן ציון מחדש רק אם "
 "הציון משתפר' מעדכנת את ציון הלומד רק אם היא משפרת את הציון לטובתו."
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr "הסטוריית בעיות"
@@ -17733,7 +17953,6 @@ msgstr "פרטי תכנית"
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr "תכניות"
 
@@ -17756,28 +17975,9 @@ msgid ""
 msgstr ""
 "אינך רואה את השפה המועדפת עליך? {link_start}התנדב להיות מתרגם!{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "אישור"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "מודל פתוח"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "בסדר"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "פתוח"
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "מנהל מערכת"
 
@@ -17785,27 +17985,23 @@ msgstr "מנהל מערכת"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "עגלת קניות"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr "{platform_name} עמוד הבית"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "כיצד זה עובד"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "בתי ספר"
 
@@ -17816,12 +18012,10 @@ msgstr "גלה קורסים"
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "כניסה"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "גלובלי"
 
@@ -18577,6 +18771,10 @@ msgid ""
 " sanctions.Unfortunately, because {platform_name} is required to comply with"
 " export controls,we cannot allow you to access this course at this time."
 msgstr ""
+"המערכת שלנו מראה על כך שאתה מנסה לגשת לקורס {platform_name} זה מאזור או "
+"ממדינה הכפופים כיום לסנקציות כלכליות ומסחריות מארה\"ב. למרבה הצער, מכיוון "
+"ש-{platform_name} חייב לציית לחוקים ולתקנות הנוגעים לפיקוח על יצוא, אנחנו לא"
+" יכולים לאפשר לך לגשת לקורס זה."
 
 #: lms/templates/static_templates/jobs.html
 #: themes/red-theme/lms/templates/footer.html
@@ -18618,7 +18816,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr "שרתי {platform_name} עמוסים מאוד  כרגע "
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "הגדרות חשבון"
 
@@ -18630,40 +18827,6 @@ msgstr "נא המתן"
 msgid "Sign in or Register"
 msgstr "היכנס או הירשם"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "פרופיל הלומד"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "חשבונות מקושרים"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "מקושר"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "לא מקושר"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "נתק קישור"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "הפעל קישור"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr "תמיכה בסטודנט"
@@ -18866,16 +19029,17 @@ msgstr "חזור ללוח הבקרה שלך"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
 msgid "Got it!"
-msgstr ""
+msgstr "הבנתי"
 
 #: lms/templates/widgets/cookie-consent.html
 msgid "Learn more"
-msgstr ""
+msgstr "למידע נוסף"
 
 #: lms/templates/wiki/includes/article_menu.html
 msgid "{span_start}(active){span_end}"
@@ -18891,12 +19055,140 @@ msgstr "{span_start}פעיל{span_end}"
 
 #: lms/templates/wiki/includes/breadcrumbs.html
 msgid "Course Wiki"
-msgstr ""
+msgstr "קורס Wiki"
 
 #: lms/templates/wiki/includes/breadcrumbs.html
 msgid "Add article"
 msgstr "הוסף מאמר"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -18943,7 +19235,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "חפש קורסים"
 
@@ -18977,18 +19268,6 @@ msgstr ""
 "{tos_link_start}תנאי שימוש {tos_link_end}{honor_link_start}קוד אתי "
 "{honor_link_end}"
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "אפשרויות נוספות תפריט נפתח"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr "הפרופיל שלי"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr "הירשם עכשיו"
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -19029,7 +19308,7 @@ msgstr ""
 
 #: themes/stanford-style/lms/templates/emails/activation_email.txt
 msgid "Thank you for signing up for {platform_name}."
-msgstr ""
+msgstr "תודה רבה על שנרשמת ל{platform_name}."
 
 #: themes/stanford-style/lms/templates/emails/activation_email.txt
 msgid ""
@@ -19037,6 +19316,8 @@ msgid ""
 " account. Click on the link below or copy and paste it into your browser's "
 "address bar."
 msgstr ""
+"שנה את חייך והתחל ללמוד היום באמצעות הפעלת חשבון {platform_name} שלך. לחץ על"
+" הקישור המצורף או העתק והדבק אותו לתוך שורת הכתובת של הדפדפן שלך."
 
 #: themes/stanford-style/lms/templates/emails/activation_email.txt
 #: themes/stanford-style/lms/templates/emails/email_change.txt
@@ -19045,6 +19326,9 @@ msgid ""
 " any more email from us. Please do not reply to this e-mail; if you require "
 "assistance, check the about section of the {platform_name} Courses web site."
 msgstr ""
+"אם לא ביקשת זאת, אין צורך לעשות דבר; לא תקבל עוד הודעות מאיתנו. בבקשה אל "
+"תגיבו להודעה זו; אם אתם זקוקים לעזרה, בדקו את עמוד העזרה באתר "
+"{platform_name}. "
 
 #: themes/stanford-style/lms/templates/emails/confirm_email_change.txt
 msgid ""
@@ -19052,6 +19336,9 @@ msgid ""
 "{platform_name} from {old_email} to {new_email}. If you did not make this "
 "request, please contact us at"
 msgstr ""
+"זוהי הודעה לאשר כי החלפת את כתובת הדואר האלקטרוני המקושרת לחשבון "
+"{platform_name} מ-{old_email} ל-{new_email}. אם לא ביקשת את השינוי הנ\"ל אנא"
+" צור עמנו קשר ב-"
 
 #: themes/stanford-style/lms/templates/emails/reject_name_change.txt
 msgid ""
@@ -19059,6 +19346,9 @@ msgid ""
 "name from {old_name} to {new_name}. If you need further assistance, please "
 "e-mail the tech support at {email}"
 msgstr ""
+"אנחנו מתנצלים, צוות הקורס שלנו לא אישר את בקשתך לשינוי שמך מ-{old_name} "
+"ל-{new_name}. אם אתה זקוק לעזרה נוספת, אנא שלח הודעת דואר אלקטרוני לסיוע  "
+"הטכני ב-{email}"
 
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Put your Terms of Service here!"
@@ -19171,19 +19461,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr "קבצים והעלאות"
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "פעולות עמוד"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "העלה קובץ חדש"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "הוספת קבצים עבור הקורס שלך"
@@ -19397,6 +19682,15 @@ msgstr "מחק רכיב זה"
 msgid "Drag to reorder"
 msgstr "גרור לסידור מחדש"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "פעולות עמוד"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr "פתח לומדה במערכת LMS"
@@ -19477,6 +19771,8 @@ msgid ""
 "To create a link to this unit from an HTML component in this course, enter "
 "\"/jump_to_id/<location ID>\" as the URL value."
 msgstr ""
+"על מנת ליצור קישור ליחידה זו מרכיב HTML בקורס זה, הכנס "
+"\"/jump_to_id/<location ID>\"  כערך URL."
 
 #: cms/templates/container.html
 msgid "Location in Course Outline"
@@ -19568,6 +19864,8 @@ msgid ""
 "(This number will be the same as the original course number and cannot be "
 "changed.)"
 msgstr ""
+"המספר הייחודי המזהה את הקורס החדש בתוך הארגון. (מספר זה יהיה זהה למספר הקורס"
+" המקורי ולא ישתנה)."
 
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/settings.html
@@ -19648,10 +19946,6 @@ msgstr ""
 "מסוימים בפורומים, להכריז על שינויים בלוח הזמנים ועל מנת להגיב לשאלות "
 "סטודנטים. ניתן להוסיף או לערוך עדכונים ב-HTML.  "
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "מתווה קורס"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -19668,10 +19962,6 @@ msgstr ""
 "כולל תאריך התחלת הקורס; הגדר  את צוות הקורס; בחן את עדכוני הקורס ונכסים "
 "אחרים עבור חומרים עם תאריכי שחרור; התחל את הדיונים ואת Wiki."
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "ביטול"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "אזהרה"
@@ -20998,10 +21288,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "הקורס בתהליך עיבוד"
@@ -21676,6 +21962,14 @@ msgstr "היום האחרון בו הקורס פעיל"
 msgid "Course End Time"
 msgstr "זמן סיום הקורס"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "תאריך תחילת ההרשמה"
@@ -22344,18 +22638,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -22397,8 +22708,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -22474,16 +22785,20 @@ msgid ""
 "Your {task_name} task has completed with the status '{task_status}'. Use "
 "this URL to view task details or download any files created: {detail_url}"
 msgstr ""
+"המשימה {task_name} הושלמה והיא בסטטוס  '{task_status}'. השתמש בכתובת URL זו "
+"כדי לראות את פרטי המשימה או להוריד קבצים שנוצרו: {detail_url}"
 
 #: cms/templates/emails/user_task_complete_email.txt
 msgid ""
 "Your {task_name} task has completed with the status '{task_status}'. Sign in"
 " to view the details of your task or download any files created."
 msgstr ""
+"המשימה {task_name} הושלמה והיא בסטטוס '{task_status}'. היכנס כדי לראות את "
+"פרטי המשימה או להוריד קבצים שנוצרו."
 
 #: cms/templates/emails/user_task_complete_email_subject.txt
 msgid "{platform_name} {studio_name}: Task Status Update"
-msgstr ""
+msgstr "{platform_name} {studio_name}: עדכון סטטוס המשימה"
 
 #: cms/templates/maintenance/_force_publish_course.html
 msgid "Required data to force publish course."
@@ -22503,23 +22818,23 @@ msgstr "לוח הבקרה של התחזוקה"
 
 #: cms/templates/registration/activation_complete.html
 msgid "Thanks for activating your account."
-msgstr ""
+msgstr "תודה שהפעלת את חשבונך"
 
 #: cms/templates/registration/activation_complete.html
 msgid "This account has already been activated."
-msgstr ""
+msgstr "חשבון זה כבר הופעל"
 
 #: cms/templates/registration/activation_complete.html
 msgid "Visit your {link_start}dashboard{link_end} to see your courses."
-msgstr ""
+msgstr "פתח את {link_start}לוח הבקרה{link_end} על מנת לראות את הקורסים שלך."
 
 #: cms/templates/registration/activation_complete.html
 msgid "You can now {link_start}sign in{link_end}."
-msgstr ""
+msgstr "אתה יכול עכשיו  {link_start}להתחבר{link_end}."
 
 #: cms/templates/registration/activation_invalid.html
 msgid "Activation Invalid"
-msgstr ""
+msgstr "הפעלה אינה תקפה"
 
 #: cms/templates/registration/activation_invalid.html
 msgid ""
@@ -22527,10 +22842,13 @@ msgid ""
 " make sure the URL you're using is formatted correctly. If you still have "
 "issues, send us an email message at {email_start}{email}{email_end}."
 msgstr ""
+"אירעה תקלה. לפעמים תכניות דואר אלקטרוני מפצלות כתובות URL לשתי שורות, לכן "
+"ודא שכתובת ה-URL שבה אתה משתמש מעוצבת כהלכה. אם אתה עדיין נתקל בבעיות, שלח "
+"לנו הודעת דואר אלקטרוני לכתובת {email_start}{email}{email_end}."
 
 #: cms/templates/registration/activation_invalid.html
 msgid "Return to the {link_start}home page{link_end}."
-msgstr ""
+msgstr "חזור ל {link_start}עמוד הבית{link_end}."
 
 #: cms/templates/registration/reg_complete.html
 msgid ""
@@ -22560,10 +22878,6 @@ msgstr "ניווט קורסים"
 msgid "Outline"
 msgstr "מתווה"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "עדכונים"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "ייבא"
diff --git a/conf/locale/he/LC_MESSAGES/djangojs.mo b/conf/locale/he/LC_MESSAGES/djangojs.mo
index b971223313..dc07648495 100644
Binary files a/conf/locale/he/LC_MESSAGES/djangojs.mo and b/conf/locale/he/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/he/LC_MESSAGES/djangojs.po b/conf/locale/he/LC_MESSAGES/djangojs.po
index a99efbfb86..1a99841e92 100644
--- a/conf/locale/he/LC_MESSAGES/djangojs.po
+++ b/conf/locale/he/LC_MESSAGES/djangojs.po
@@ -32,6 +32,7 @@
 # qualityalltext <quality@alltext.co.il>, 2016
 # Ron Rozen <Ronrozen@gmail.com>, 2016
 # yaaqov, 2014
+# Yoav Caspin <yoavc@pmo.gov.il>, 2017
 # #-#-#-#-#  underscore.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2017 edX
@@ -45,6 +46,7 @@
 # Nadav Stark <nadav@yeda.org.il>, 2015
 # qualityalltext <quality@alltext.co.il>, 2016-2017
 # Ron Rozen <Ronrozen@gmail.com>, 2016
+# Yoav Caspin <yoavc@pmo.gov.il>, 2017
 # yuval zana, 2015
 # #-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file
@@ -63,8 +65,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-06 15:25+0000\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Hebrew (http://www.transifex.com/open-edx/edx-platform/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -80,10 +82,12 @@ msgid ""
 "This may be happening because of an error with our server or your internet "
 "connection. Try refreshing the page or making sure you are online."
 msgstr ""
+"ייתכן ודבר זה מתרחש בשל טעות בשרת שלנו או בחיבור האינטרנט. נסה לרענן את "
+"העמוד או ודא שאתה מקוון."
 
 #: cms/static/cms/js/main.js common/static/bundles/Import.js
 msgid "Studio's having trouble saving your work"
-msgstr ""
+msgstr "סטודיו מתקשה לשמור את עבודתך"
 
 #: cms/static/cms/js/xblock/cms.runtime.v1.js
 #: cms/static/js/certificates/views/signatory_details.js
@@ -174,7 +178,7 @@ msgstr "מעלה"
 #: common/static/common/templates/discussion/alert-popup.underscore
 #: common/static/common/templates/discussion/forum-action-close.underscore
 #: common/static/common/templates/discussion/search-alert.underscore
-#: lms/templates/student_profile/share_modal.underscore
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "סגור"
 
@@ -1967,19 +1971,19 @@ msgstr "כבה תמלילים"
 
 #: common/static/bundles/Import.js
 msgid "There was an error during the upload process."
-msgstr ""
+msgstr "אירעה שגיאה במהלך תהליך העלאת הנתונים."
 
 #: common/static/bundles/Import.js
 msgid "There was an error while unpacking the file."
-msgstr ""
+msgstr "אירעה שגיאה בחילוץ הקובץ."
 
 #: common/static/bundles/Import.js
 msgid "There was an error while verifying the file you submitted."
-msgstr ""
+msgstr "אירעה שגיאה בזמן אימות הקובץ שהגשת."
 
 #: common/static/bundles/Import.js
 msgid "Choose new file"
-msgstr ""
+msgstr "בחר קובץ חדש"
 
 #: common/static/bundles/Import.js
 msgid ""
@@ -1988,27 +1992,27 @@ msgstr ""
 
 #: common/static/bundles/Import.js
 msgid "There was an error while importing the new library to our database."
-msgstr ""
+msgstr "אירעה שגיאה במהלך יבוא הספרייה החדשה לבסיס הנתונים שלנו."
 
 #: common/static/bundles/Import.js
 msgid "There was an error while importing the new course to our database."
-msgstr ""
+msgstr "אירעה שגיאה במהלך יבוא הקורס החדש לבסיס הנתונים שלנו."
 
 #: common/static/bundles/Import.js
 msgid "Your import has failed."
-msgstr ""
+msgstr "היבוא נכשל."
 
 #: common/static/bundles/Import.js
 msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
+msgstr "היבוא שלך נמצא בתהליך; ניווט החוצה יבטל זאת."
 
 #: common/static/bundles/Import.js
 msgid "Error importing course"
-msgstr ""
+msgstr "שגיאה בייבוא קורס."
 
 #: common/static/bundles/Import.js
 msgid "There was an error with the upload"
-msgstr ""
+msgstr "אירעה שגיאה בהעלאה"
 
 #: common/static/common/js/components/utils/view_utils.js
 msgid "Required field."
@@ -2049,7 +2053,7 @@ msgstr "טוען תוכן"
 
 #: common/static/common/js/discussion/utils.js
 msgid "Your request could not be processed. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לעבד את בקשתך. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/utils.js
 #: common/static/common/templates/discussion/pagination.underscore
@@ -2079,65 +2083,66 @@ msgstr[1] "{numVotes} קולות"
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid ""
 "You could not be subscribed to this post. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לרשום אותך לפוסט. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid ""
 "You could not be unsubscribed from this post. Refresh the page and try "
 "again."
-msgstr ""
+msgstr "לא ניתן לבטל את הרישום שלך לפוסט. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid ""
 "This response could not be marked as an answer. Refresh the page and try "
 "again."
-msgstr ""
+msgstr "לא ניתן לסמן את התגובה הזו בתור תשובה. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid ""
 "This response could not be unmarked as an answer. Refresh the page and try "
 "again."
-msgstr ""
+msgstr "לא ניתן לבטל את סימון התגובה הזו בתור תשובה. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid ""
 "This response could not be marked as endorsed. Refresh the page and try "
 "again."
-msgstr ""
+msgstr "לא ניתן לסמן את התגובה הזו בתור מומלצת. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid "This response could not be unendorsed. Refresh the page and try again."
 msgstr ""
+"לא ניתן לבטל את סימון התגובה הזו בתור מומלצת. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid "This vote could not be processed. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לעבד את הבקשה. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid "This post could not be pinned. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן להצמיד את הפוסט. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid "This post could not be unpinned. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לבטל את הצמדת הפוסט. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid ""
 "This post could not be flagged for abuse. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לדווח על הפוסט כבלתי הולם. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid ""
 "This post could not be unflagged for abuse. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לבטל את הדיווח על הפוסט כבלתי הולם. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid "This post could not be closed. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לסגור את הפוסט. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_content_view.js
 msgid "This post could not be reopened. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן לפתוח מחדש את הפוסט. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_inline_view.js
 msgid "Hide Discussion"
@@ -2145,7 +2150,7 @@ msgstr "הסתר דיון"
 
 #: common/static/common/js/discussion/views/discussion_inline_view.js
 msgid "This discussion could not be loaded. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן להעלות את הדיון. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_inline_view.js
 msgid "Show Discussion"
@@ -2157,7 +2162,7 @@ msgstr "טוען עוד שרשורים"
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "Additional posts could not be loaded. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן להעלות פוסטים נוספים. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "Current conversation"
@@ -2165,17 +2170,18 @@ msgstr "שיחה נוכחית"
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "Loading posts list"
-msgstr ""
+msgstr "טוען רשימת פוסטים"
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid ""
 "No results found for {original_query}. Showing results for "
 "{suggested_query}."
 msgstr ""
+"לא נמצאו תוצאות עבור {original_query}. מראה תוצאות עבור {suggested_query}."
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "No posts matched your query."
-msgstr ""
+msgstr "לא נמצאו פוסטים התואמים את השאילתא שלך."
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "Show posts by {username}."
@@ -2183,16 +2189,16 @@ msgstr "הראה פוסטים של {username}."
 
 #: common/static/common/js/discussion/views/discussion_thread_view.js
 msgid "The post you selected has been deleted."
-msgstr ""
+msgstr "הפוסט שבחרת נמחק."
 
 #: common/static/common/js/discussion/views/discussion_thread_view.js
 msgid "Responses could not be loaded. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן להעלות תגובות. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_thread_view.js
 msgid ""
 "Additional responses could not be loaded. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן להעלות תגובות נוספות. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/discussion_thread_view.js
 msgid "{numResponses} other response"
@@ -2244,7 +2250,7 @@ msgstr "האם אתה בטוח שאתה מעוניין למחוק תגובה ז
 
 #: common/static/common/js/discussion/views/response_comment_view.js
 msgid "This comment could not be deleted. Refresh the page and try again."
-msgstr ""
+msgstr "לא ניתן למחוק את ההערה. רענן את העמוד ונסה שנית."
 
 #: common/static/common/js/discussion/views/thread_response_view.js
 msgid "Are you sure you want to delete this response?"
@@ -2592,7 +2598,6 @@ msgid ""
 msgstr "השפה העיקרית שחברי הצוות משתמשים כדי לתקשר זה עם זה."
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "מדינה"
 
@@ -2767,6 +2772,8 @@ msgid ""
 " and try again. If the issue persists, click the Help tab to report the "
 "problem."
 msgstr ""
+"לא ניתן להשלים את בקשתך בגלל בעיה בשרת. טען מחדש את הדף ונסה שוב. אם הבעיה "
+"נמשכת, לחץ על הלשונית 'עזרה' כדי לדווח על הבעיה."
 
 #: lms/djangoapps/teams/static/teams/js/views/teams_tab.js
 msgid "Team Search"
@@ -2891,7 +2898,7 @@ msgstr "הכנס היפר קישור"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "e.g. 'http://google.com'"
-msgstr ""
+msgstr "למשל 'http://google.com'"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Link Description"
@@ -3047,6 +3054,8 @@ msgid ""
 "now. Click Cancel to stay on this page (you must log in again to save your "
 "work)."
 msgstr ""
+"יצאת מחשבון edX שלך. לחץ על 'אישור' כדי להיכנס שוב כעת. לחץ על 'ביטול' כדי "
+"להישאר בעמוד (עליך להיכנס שוב כדי לשמור את מה שעשית)."
 
 #: lms/static/js/api_admin/views/catalog_preview.js
 msgid "Preview this query"
@@ -3093,12 +3102,17 @@ msgid ""
 "Student username/email field is required and can not be empty. Kindly fill "
 "in username/email and then press \"Add to Exception List\" button."
 msgstr ""
+"שדה שם המשתמש/דואר אלקטרוני של הסטודנט הוא שדה חובה ולא ניתן להשאירו ריק. "
+"אנא מלא את שם המשתמש/הדואר האלקטרוני ולאחר מכן לחץ על הלחצן \"הוסף לרשימת "
+"חריגים\"."
 
 #: lms/static/js/certificates/models/certificate_invalidation.js
 msgid ""
 "Student username/email field is required and can not be empty. Kindly fill "
 "in username/email and then press \"Invalidate Certificate\" button."
 msgstr ""
+"שדה שם המשתמש/דואר אלקטרוני של הסטודנט הוא שדה חובה ולא ניתן להשאירו ריק. "
+"אנא מלא את שם המשתמש/דואר אלקטרוני ולאחר מכן לחץ על הלחצן \"פסילת תעודה\"."
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid "Uploaded file issues. Click on \"+\" to view."
@@ -3114,15 +3128,15 @@ msgstr " הלומד נוסף בהצלחה לרשימת החריגים"
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid " records are not in correct format and not added to the exception list"
-msgstr ""
+msgstr " הרשומות אינן בתבנית הנכונה ולא נוספו לרשימת החריגים"
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid " record is not in correct format and not added to the exception list"
-msgstr ""
+msgstr " הרשומה אינה בתבנית הנכונה ולא נוספה לרשימת החריגים"
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid " learners do not exist in LMS and not added to the exception list"
-msgstr ""
+msgstr " הלומדים לא קיימים ב-LMS ולא נוספו לרשימת החריגים"
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid " learner does not exist in LMS and not added to the exception list"
@@ -3130,20 +3144,20 @@ msgstr " הלומד אינו קיים ב-LMS ולא נוסף לרשימת החר
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid " learners are already white listed and not added to the exception list"
-msgstr ""
+msgstr " הלומדים כבר נוספו לרשימה הלבנה ולא נוספו לרשימת החריגים "
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid " learner is already white listed and not added to the exception list"
-msgstr ""
+msgstr " התלמיד כבר נוסף לרשימה הבטוחה ולא נוסף לרשימת החריגים "
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid ""
 " learners are not enrolled in course and not added to the exception list"
-msgstr ""
+msgstr " הלומדים אינם רשומים בקורס ולא נוספו לרשימת החריגים"
 
 #: lms/static/js/certificates/views/certificate_bulk_whitelist.js
 msgid " learner is not enrolled in course and not added to the exception list"
-msgstr ""
+msgstr " הלומד אינו רשום בקורס ולא נוסף לרשימת החריגים"
 
 #: lms/static/js/certificates/views/certificate_invalidation_view.js
 msgid ""
@@ -3247,7 +3261,7 @@ msgstr ""
 
 #: lms/static/js/discussions_management/views/discussions.js
 msgid "Enrollment Tracks"
-msgstr ""
+msgstr "מסלולי הרשמה"
 
 #: lms/static/js/discussions_management/views/discussions.js
 msgid ""
@@ -3259,7 +3273,7 @@ msgstr ""
 
 #: lms/static/js/discussions_management/views/discussions.js
 msgid "Cohorts"
-msgstr ""
+msgstr "קבוצות למידה"
 
 #: lms/static/js/discussions_management/views/discussions.js
 msgid ""
@@ -3627,7 +3641,6 @@ msgstr "סמן את קוד ההרשמה כ'אינו בשימוש'"
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 #: lms/templates/financial-assistance/financial_assessment_form.underscore
 msgid "Username"
 msgstr "שם משתמש"
@@ -3640,6 +3653,10 @@ msgstr "דואר אלקטרוני"
 msgid "Revoke access"
 msgstr "שלול גישה"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr "הכנס שם משתמש או כתובת דואר אלקטרוני"
@@ -3648,6 +3665,10 @@ msgstr "הכנס שם משתמש או כתובת דואר אלקטרוני"
 msgid "Please enter a username or email."
 msgstr "אנא הכנס שם משתמש או כתובת דואר אלקטרוני"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "שגיאה בשינוי אישורי משתמש"
@@ -3843,7 +3864,7 @@ msgstr "כל הלומדים בקבוצת הלימוד {cohort_name}"
 
 #: lms/static/js/instructor_dashboard/send_email.js
 msgid "All learners in the {track_name} track"
-msgstr ""
+msgstr "כל מי שלומד במסלול {track_name}"
 
 #: lms/static/js/instructor_dashboard/send_email.js
 msgid ""
@@ -4039,6 +4060,24 @@ msgstr ""
 "שגיאה בזמן הפעלת משימה לחישוב ציונים מחדש עבור בעיה  '<%- problem_id %>' של "
 "סטודנט '<%- student_id %>'. ודא שמזהה הבעיה והתלמיד הם מלאים ונכונים."
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4245,6 +4284,14 @@ msgstr "הושלם בהצלחה מתן ציון מחדש לבעיה עבור מ
 msgid "Failed to rescore problem to improve score for user."
 msgstr "נכשל מתן ציון מחדש לבעיה על מנת לשפר ציון משתמש."
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "המידע לא נשמר "
@@ -4275,7 +4322,7 @@ msgstr "בדוק את הדואר האלקטרוני שלך כדי לאשר את
 
 #: lms/static/js/student_account/tos_modal.js
 msgid "Terms of Service and Honor Code"
-msgstr ""
+msgstr "תנאי שימוש וקוד אתי"
 
 #: lms/static/js/student_account/views/FinishAuthView.js
 msgid "Saving your email preference"
@@ -4303,7 +4350,7 @@ msgstr "אירעה שגיאה."
 #. profile forms.
 #: lms/static/js/student_account/views/FormView.js
 msgid "(optional)"
-msgstr ""
+msgstr "(אופציונאלי)"
 
 #: lms/static/js/student_account/views/LoginView.js
 msgid "We couldn't sign you in."
@@ -4312,7 +4359,7 @@ msgstr "לא ניתן לחבר אותך."
 #: lms/static/js/student_account/views/LoginView.js
 #, javascript-format
 msgid "An error occurred when signing you in to %s."
-msgstr ""
+msgstr "אירעה שגיאה בזמן החיבור שלך ל-%s."
 
 #: lms/static/js/student_account/views/LoginView.js
 #: lms/templates/verify_student/intro_step.underscore
@@ -4329,6 +4376,12 @@ msgid ""
 "spam folder.{paragraphEnd}{paragraphStart}If you need further assistance, "
 "{anchorStart}contact technical support{anchorEnd}.{paragraphEnd}"
 msgstr ""
+"{paragraphStart}הזנת {boldStart}{email}{boldEnd}. אם כתובת הדוא\"ל הזו קשורה"
+" לחשבון {platform_name} שלך, נשלח הודעה עם הנחיות לאיפוס הסיסמה לכתובת "
+"הדוא\"ל הזו.{paragraphEnd}{paragraphStart}אם לא תקבל הודעה לאיפוס סיסמה, "
+"בדוק שהזנת את הכתובת הנכונה או בדוק בתיקיית דואר הזבל "
+"אצלך.{paragraphEnd}{paragraphStart}אם יש לך צורך בעזרה נוספת, "
+"{anchorStart}פנה לתמיכה הטכנית{anchorEnd}.{paragraphEnd}"
 
 #: lms/static/js/student_account/views/LoginView.js
 msgid ""
@@ -4342,6 +4395,9 @@ msgid ""
 "%(currentProvider)s account does not have a linked %(platformName)s account."
 " To link your accounts, sign in now using your %(platformName)s password."
 msgstr ""
+"נרשמת בהצלחה ל-%(currentProvider)s, אך לחשבון %(currentProvider)sאין חשבון "
+"%(platformName)s מקושר. כדי לקשר את חשבונותייך, היכנס כעת באמצעות סיסמת "
+"%(platformName)s."
 
 #: lms/static/js/student_account/views/RegisterView.js
 msgid "We couldn't create your account."
@@ -4456,7 +4512,7 @@ msgstr "כל אזורי הזמן"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
 msgid "Default (Local Time Zone)"
-msgstr ""
+msgstr "ברירת מחדל (אזורי זמן מקומיים)"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
 msgid "Additional Information"
@@ -4475,7 +4531,6 @@ msgid "Year of Birth"
 msgstr "שנת לידה"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "שפה מועדפת"
 
@@ -4588,82 +4643,6 @@ msgstr "פרטי חשבון"
 msgid "Order History"
 msgstr "היסטוריית הזמנות"
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "עימוד הישגים"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "{platform_name} יכולים לראות את:"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "פרופיל חלקי"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "פרופיל מלא"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "הוסף מדינה"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "הוסף שפה"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "על עצמי"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr ""
-"ספר מעט על עצמך לתלמידים האחרים: היכן אתה גר, מהם תחומי העניין שלך, מדוע "
-"נרשמת לקורסים או מה אתה מקווה ללמוד."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "עמוד הגדרות חשבון"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-"עליך לציין את שנת הלידה שלך לפני שתוכל לחלוק את הפרופיל המלא שלך. בכדי לציין"
-" את שנת הלידה שלך עבור ל{account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"עליך להיות מעל גיל 13 כדי לשתף את מידע הפרופיל המלא שלך. אם אתה מעל גיל 13, "
-"ודא שציינת את שנת הלידה שלך ב{account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "תמונת פרופיל"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "תמונת פרופיל עבור {username} "
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr "על עצמי"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "הישגים"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr "פרופיל"
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "שגיאה בהעלאת תמונה"
@@ -4789,6 +4768,7 @@ msgid "Validation Error"
 msgstr "שגיאת אימות"
 
 #: lms/static/js/views/fields.js
+#: lms/templates/learner_dashboard/program_card.underscore
 msgid "In Progress"
 msgstr "בביצוע"
 
@@ -5111,6 +5091,11 @@ msgstr "תאריך סיום הקורס חייב להיות מאוחר יותר 
 msgid "The course start date must be later than the enrollment start date."
 msgstr "תאריך תחילת הקורס חייב להיות מאוחר יותר מתאריך תחילת ההרשמה."
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -5183,6 +5168,10 @@ msgstr ""
 msgid "or"
 msgstr "או"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "לרכיב זה בעיות אימות."
@@ -5197,21 +5186,23 @@ msgstr "העלאות סרטוני הווידאו לא הושלמו."
 
 #: cms/static/js/views/active_video_upload_list.js
 msgid "Upload completed for video {fileName}"
-msgstr ""
+msgstr "ההעלאה של סרטון הוידאו {fileName} הושלמה"
 
 #: cms/static/js/views/active_video_upload_list.js
 msgid "Upload failed for video {fileName}"
-msgstr ""
+msgstr "ההעלאה של סרטון הוידאו {fileName} לא הצליחה"
 
 #: cms/static/js/views/active_video_upload_list.js
 msgid ""
 "{filename} is not in a supported file format. Supported file formats are "
 "{supportedFileFormats}."
 msgstr ""
+"הפורמט של {filename} אינו נתמך. סוגי הקבצים שנתמכים הם "
+"{supportedFileFormats}."
 
 #: cms/static/js/views/active_video_upload_list.js
 msgid "{filename} exceeds maximum size of {maxFileSizeInGB} GB."
-msgstr ""
+msgstr "הקובץ {filename} חורג מהגודל המרבי של {maxFileSizeInGB} GB."
 
 #: cms/static/js/views/active_video_upload_list.js
 msgid ": video upload complete."
@@ -5310,6 +5301,9 @@ msgid ""
 "attempting another export. Please check that all components on the page are "
 "valid and do not display any error messages."
 msgstr ""
+"יצוא של רכיב אחד לפחות ל-XML, נכשל. מומלץ לגשת לעמוד העריכה ולתקן את השגיאה "
+"לפני ביצוע יצוא נוסף. אנא בדוק את חוקיות כל הרכיבים בעמוד וכי הם אינם מציגים"
+" הודעות שגיאה.  "
 
 #: cms/static/js/views/export.js
 msgid "Correct failed component"
@@ -5325,6 +5319,8 @@ msgid ""
 "to identify the failed component. Inspect your library to identify any "
 "problematic components and try again."
 msgstr ""
+"לא ניתן לייצא את ספרייתך לקובץ XML. אין מידע  במידה מספקת לזיהוי הרכיב "
+"הכושל. בדוק את ספרייתך, זהה רכיבים בעיתיים ולאחר מכן נסה שוב. "
 
 #: cms/static/js/views/export.js
 msgid "Take me to the main library page"
@@ -5336,6 +5332,8 @@ msgid ""
 " identify the failed component. Inspect your course to identify any "
 "problematic components and try again."
 msgstr ""
+"לא ניתן לייצא את הקורס ל-XML. אין מידע במידה מספקת על מנת לזהות את הרכיב "
+"הכושל. בדוק את הקורס שלך על מנת לזהות רכיבים בעייתים ונסה שוב. "
 
 #: cms/static/js/views/export.js
 msgid "Take me to the main course page"
@@ -5364,12 +5362,14 @@ msgstr "לא בשימוש"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
-msgstr[0] "נעשה שימוש ביחידה {count}"
-msgstr[1] "נעשה שימוש ב-{count} יחידות"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
+msgstr[0] ""
+msgstr[1] ""
 
 #. Translators: this refers to a collection of groups.
 #: cms/static/js/views/group_configuration_item.js
@@ -5526,10 +5526,6 @@ msgstr "האם אתה בטוח שאתה רוצה להגביל את גישת {ema
 msgid "{display_name} Settings"
 msgstr "הגדרות {display_name}"
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr "שנה את ההגדרות עבור {display_name}"
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr "פרסם את {display_name}"
@@ -5544,19 +5540,28 @@ msgstr "האם לפרסם את כל השינויים שלא פורסמו עבו
 msgid "Publish"
 msgstr "פרסם"
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr "בסיס"
 
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Visibility"
-msgstr ""
+msgstr "תצוגה"
 
 #. Translators: "title" is the name of the current component being edited.
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Editing: %(title)s"
 msgstr "עורך: %(title)s"
 
+#: cms/static/js/views/modals/edit_xblock.js
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr "יחידה"
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "רכיב"
@@ -5587,7 +5592,7 @@ msgstr "שנה ידנית"
 
 #: cms/static/js/views/move_xblock_list.js
 msgid "Sections"
-msgstr ""
+msgstr "פרקים"
 
 #: cms/static/js/views/move_xblock_list.js
 msgid "Subsections"
@@ -5595,12 +5600,13 @@ msgstr ""
 
 #: cms/static/js/views/move_xblock_list.js
 msgid "Units"
-msgstr ""
+msgstr "יחידות"
 
 #: cms/static/js/views/move_xblock_list.js
 msgid "Components"
 msgstr ""
 
+#: cms/static/js/views/move_xblock_list.js
 #: cms/templates/js/group-configuration-editor.underscore
 msgid "Groups"
 msgstr "קבוצות"
@@ -5609,6 +5615,7 @@ msgstr "קבוצות"
 msgid "This {parentCategory} has no {childCategory}"
 msgstr ""
 
+#: cms/static/js/views/move_xblock_list.js
 #: cms/templates/js/group-configuration-details.underscore
 #: cms/templates/js/partition-group-details.underscore
 msgid "Course Outline"
@@ -5618,7 +5625,8 @@ msgstr "מתווה קורס"
 msgid "Date added"
 msgstr "הוסף תאריך"
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -5754,13 +5762,15 @@ msgstr " לא יצרת עדיין קבוצות תוכן כלשהן."
 
 #: cms/static/js/views/previous_video_upload.js
 msgid "Are you sure you want to remove this video from the list?"
-msgstr ""
+msgstr "האם אתה בטוח שברצונך להסיר את סרטון וידאו זה מהרשימה?"
 
 #: cms/static/js/views/previous_video_upload.js
 msgid ""
 "Removing a video from this list does not affect course content. Any content "
 "that uses a previously uploaded video ID continues to display in the course."
 msgstr ""
+"הסרת סרטון וידאו מרשימה זו אינה משפיעה על תוכן הקורס. כל תוכן המשתמש במספר "
+"מזהה של סרטון שהועלה בעבר ממשיך להציג בקורס זה."
 
 #: cms/static/js/views/settings/advanced.js
 msgid ""
@@ -5895,7 +5905,7 @@ msgstr ""
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Deleting this {xblock_type} is permanent and cannot be undone."
-msgstr ""
+msgstr "מחיקת {xblock_type} זה היא קבועה ואינה הפיכה."
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid ""
@@ -5905,15 +5915,15 @@ msgstr "גם בכל תוכן שרשם תוכן זה כדרישה מוקדמת י
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Delete this {xblock_type} (and prerequisite)?"
-msgstr ""
+msgstr "האם למחוק את  {xblock_type} (and prerequisite) זה? "
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Yes, delete this {xblock_type}"
-msgstr ""
+msgstr "כן, מחק את {xblock_type} זה"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Delete this {xblock_type}?"
-msgstr ""
+msgstr "האם למחוק את {xblock_type} זה?"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "section"
@@ -6048,7 +6058,7 @@ msgstr ""
 
 #: cms/static/js/views/video_thumbnail.js
 msgid "minutes"
-msgstr ""
+msgstr "דקות"
 
 #: cms/static/js/views/video_thumbnail.js
 msgid "minute"
@@ -6076,7 +6086,7 @@ msgstr ""
 #. `13 minutes and 45 seconds`
 #: cms/static/js/views/video_thumbnail.js
 msgid " and "
-msgstr ""
+msgstr "וגם"
 
 #: cms/static/js/views/video_thumbnail.js
 msgid "Video image upload started"
@@ -6121,7 +6131,7 @@ msgstr "הגדרות"
 
 #: cms/static/js/views/xblock_outline.js
 msgid "New {component_type}"
-msgstr ""
+msgstr "חדש {component_type} "
 
 #. Translators: This message will be added to the front of messages of type
 #. warning,
@@ -6280,11 +6290,11 @@ msgstr "כל הקבוצות"
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid ""
 "Add a clear and descriptive title to encourage participation. (Required)"
-msgstr ""
+msgstr "הוסף כותרת ברורה ותיאורית בכדי לעודד את ההשתתפות בדיון. (חובה)."
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Your question or idea (required)"
-msgstr ""
+msgstr "שאלתך או רעיונך (חובה)"
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -6307,11 +6317,11 @@ msgstr "שלח"
 
 #: common/static/common/templates/discussion/post-user-display.underscore
 msgid "(Community TA)"
-msgstr ""
+msgstr "(עוזר הוראה קהילתי)"
 
 #: common/static/common/templates/discussion/post-user-display.underscore
 msgid "(Staff)"
-msgstr ""
+msgstr "(צוות)"
 
 #: common/static/common/templates/discussion/profile-thread.underscore
 #: common/static/common/templates/discussion/thread.underscore
@@ -6472,6 +6482,8 @@ msgid ""
 "Questions raise issues that need answers. Discussions share ideas and start "
 "conversations. (Required)"
 msgstr ""
+"בעזרת לחצן 'שאלות' תוכל להעלות סוגיה מסוימת המצריכה תשובה. בעזרת לחצן "
+"'דיונים' תוכל לחלוק רעיונות ולהתחיל בשיחות על נושאי הקורס השונים. (חובה)"
 
 #: common/static/common/templates/discussion/thread-type.underscore
 msgid "Question"
@@ -6496,6 +6508,7 @@ msgstr "תחום הנושא"
 #: common/static/common/templates/discussion/topic.underscore
 msgid "Add your post to a relevant topic to help others find it. (Required)"
 msgstr ""
+"הוסף את הפוסט שלך לנושא הרלוונטי על מנת להקל על אחרים למצוא אותו. (חובה)"
 
 #: lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore
 msgid "Discussion Home"
@@ -6802,10 +6815,6 @@ msgstr "הרחב הכל"
 msgid "Collapse All"
 msgstr "כווץ הכל"
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr "יחידה"
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr "תאריך התחלה"
@@ -7020,7 +7029,7 @@ msgstr "לחץ לערוך"
 
 #: lms/templates/fields/field_order_history.underscore
 msgid "Order Number"
-msgstr ""
+msgstr "מספר הזמנה"
 
 #: lms/templates/fields/field_order_history.underscore
 msgid "Date Placed"
@@ -7474,7 +7483,7 @@ msgstr[1] ""
 
 #: lms/templates/learner_dashboard/program_card.underscore
 msgid "Completed"
-msgstr ""
+msgstr "הושלם"
 
 #: lms/templates/learner_dashboard/program_card.underscore
 msgid "Remaining"
@@ -7615,7 +7624,7 @@ msgstr ""
 
 #: lms/templates/student_account/login.underscore
 msgid "Sign In"
-msgstr ""
+msgstr "התחבר"
 
 #: lms/templates/student_account/login.underscore
 msgid ""
@@ -7692,76 +7701,6 @@ msgstr "או צור אחד חדש כאן"
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr "שתף את פרס \"%(display_name)s\""
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr "שתף"
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr "זכית ב-%(created)s."
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr "מהו ההישג הבא שלך?"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr "התחל לעבוד לקראת יעד הלמידה הבא."
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr "מצא קורס"
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr "אירעה שגיאה. נסה לטעון שוב את העמוד."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr "אתה משתף כרגע פרופיל חלקי."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr "לומד זה משתף כרגע פרופיל חלקי."
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr "שתף ב-Mozilla Backpack"
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-"כדי לשתף את תעודתך ב-Mozilla Backpack, עליך לפתוח חשבון Backpack תחילה. השלם"
-" את השלבים הבאים כדי להוסיף את תעודתך ל-Backpack."
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-"צור חשבון %(link_start)sMozilla Backpack%(link_end)s או היכנס לחשבונך הקיים"
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-"%(download_link_start)sהורד תמונה זו (לחץ לחיצה ימנית או לחיצת-אפשרות, שמור "
-"בשם)%(link_end)s ולאחר מכן %(upload_link_start)sהעלה%(link_end)s אותה "
-"ל-Backpack שלך.</li>"
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8332,6 +8271,76 @@ msgstr "מצטערים, לא נמצאו תוצאות. "
 msgid "Back to Dashboard"
 msgstr "בחזרה ללוח הבקרה"
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr "שתף את פרס \"%(display_name)s\""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr "שתף"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr "זכית ב-%(created)s."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr "מהו ההישג הבא שלך?"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr "התחל לעבוד לקראת יעד הלמידה הבא."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr "מצא קורס"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr "אירעה שגיאה. נסה לטעון שוב את העמוד."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr "אתה משתף כרגע פרופיל חלקי."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr "לומד זה משתף כרגע פרופיל חלקי."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr "שתף ב-Mozilla Backpack"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+"כדי לשתף את תעודתך ב-Mozilla Backpack, עליך לפתוח חשבון Backpack תחילה. השלם"
+" את השלבים הבאים כדי להוסיף את תעודתך ל-Backpack."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+"צור חשבון %(link_start)sMozilla Backpack%(link_end)s או היכנס לחשבונך הקיים"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+"%(download_link_start)sהורד תמונה זו (לחץ לחיצה ימנית או לחיצת-אפשרות, שמור "
+"בשם)%(link_end)s ולאחר מכן %(upload_link_start)sהעלה%(link_end)s אותה "
+"ל-Backpack שלך.</li>"
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr "גישה מוגבלת"
@@ -8580,6 +8589,20 @@ msgstr "הפעל"
 msgid "Deactivate"
 msgstr "בטל "
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -8746,6 +8769,10 @@ msgstr "יחידות שלא פורסמו לא יונגשו"
 msgid "Unpublished changes to content that will release in the future"
 msgstr "שינויים שלא פורסמו לתוכן שישוחרר בעתיד"
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -9285,12 +9312,6 @@ msgstr "עם %(section_or_subsection)s"
 msgid "Staff and Learners"
 msgstr "צוות ולומדים"
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9573,6 +9594,32 @@ msgstr ""
 "ציין כל כלל נוסף או חריגה מהכללים שיכול צוות הבחינה תחת פיקוח להחיל בעת "
 "בחינת סרטוני הווידאו. לדוגמה, ניתן לציין שמותר להיעזר במחשבונים."
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr "העלאת קובץ עברה בהצלחה"
@@ -9610,9 +9657,9 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
-msgstr "ערוך את השם"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
+msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
 #, python-format
diff --git a/conf/locale/hi/LC_MESSAGES/django.mo b/conf/locale/hi/LC_MESSAGES/django.mo
index c2ee2bd9f1..72f8f8b2e5 100644
Binary files a/conf/locale/hi/LC_MESSAGES/django.mo and b/conf/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/hi/LC_MESSAGES/django.po b/conf/locale/hi/LC_MESSAGES/django.po
index a2c382526f..0a9ab5c917 100644
--- a/conf/locale/hi/LC_MESSAGES/django.po
+++ b/conf/locale/hi/LC_MESSAGES/django.po
@@ -71,7 +71,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-03-16 12:39+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Hindi (http://www.transifex.com/open-edx/edx-platform/language/hi/)\n"
@@ -280,6 +280,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr ""
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr ""
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr ""
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -323,6 +345,11 @@ msgid "Moderator"
 msgstr ""
 
 #: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
+#: common/djangoapps/django_comment_common/models.py
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Community TA"
 msgstr ""
 
@@ -1718,9 +1745,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -1833,6 +1859,11 @@ msgstr ""
 msgid "Math Expression Input"
 msgstr ""
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2055,6 +2086,10 @@ msgstr ""
 msgid "Dictionary with the current student responses"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr ""
@@ -2124,6 +2159,8 @@ msgstr ""
 #: lms/templates/manage_user_standing.html lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "सबमिट"
@@ -2683,6 +2720,7 @@ msgid ""
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "पाठ्यक्रम हैंडआउट्स"
 
@@ -4970,6 +5008,7 @@ msgid "Percent of Students"
 msgstr ""
 
 #: lms/djangoapps/class_dashboard/dashboard_data.py
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Score"
 msgstr ""
 
@@ -5211,6 +5250,15 @@ msgid ""
 "specific student."
 msgstr ""
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "पाठ्यक्रम"
@@ -5227,26 +5275,27 @@ msgstr "प्रगति"
 msgid "Textbooks"
 msgstr ""
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
+msgid "To see course content, {sign_in_link} or {register_link}."
 msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
 msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
@@ -6571,6 +6620,14 @@ msgstr ""
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr ""
@@ -6581,6 +6638,12 @@ msgstr ""
 msgid "rescored"
 msgstr ""
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -6867,10 +6930,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr ""
@@ -8223,6 +8301,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr ""
@@ -8260,11 +8343,11 @@ msgid ""
 "'Cancel' button."
 msgstr ""
 
+#: lms/templates/oauth2_provider/authorize.html
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
-msgstr "रद्द करें"
+msgstr ""
 
 #: lms/templates/oauth2_provider/authorize.html
 msgid "Allow"
@@ -8279,7 +8362,7 @@ msgstr "त्रुटि"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
+" user account at %(platform_name)s."
 msgstr ""
 
 #: lms/templates/registration/password_reset_email.html
@@ -8401,7 +8484,6 @@ msgstr "पूर्वावलोकन"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "बंद करें"
@@ -8671,6 +8753,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -9059,6 +9143,22 @@ msgstr ""
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr ""
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -9178,6 +9278,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr ""
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -9401,6 +9520,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr ""
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr ""
@@ -10113,7 +10237,7 @@ msgstr ""
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "लोड हो रहा है"
 
@@ -10130,6 +10254,16 @@ msgstr "सेटिंग्स"
 msgid "Course Number"
 msgstr "पाठ्यक्रम संख्या"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -10157,7 +10291,6 @@ msgstr "पाठ्यक्रम संख्या:"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "पाठ्यक्रम"
 
@@ -10248,11 +10381,14 @@ msgstr "देखें"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr ""
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "रीसेट करें"
 
@@ -10262,6 +10398,11 @@ msgstr "रीसेट करें"
 msgid "Legal"
 msgstr ""
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -10345,7 +10486,6 @@ msgid "Usermenu dropdown"
 msgstr ""
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr ""
 
@@ -10543,12 +10683,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "वापिस {link_start}मुख्य पृष्ठ{link_end} पर जाएं।"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "ई-मेल परिवर्तन सफल!"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr ""
 "आपको अपनी नई ई-मेल अपने {link_start}डैशबोर्ड{link_end} पर दिखनी चाहिए।"
@@ -11502,14 +11640,18 @@ msgid "Add comment"
 msgstr "टिप्पणी दें"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "स्टाफ़ डीबग"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr ""
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr ""
@@ -11529,6 +11671,10 @@ msgstr ""
 msgid "Rescore Only If Score Improves"
 msgstr ""
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "मॉड्यूल फ़ील्ड्स"
@@ -11743,7 +11889,7 @@ msgid ""
 " not mean to do this, {undo_link_start}you can re-subscribe{link_end}."
 msgstr ""
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "इसके लिए डैशबोर्ड : "
 
@@ -12632,12 +12778,14 @@ msgid "Auto Enroll"
 msgstr "खुद-ब-खुद दाखिला "
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
 msgstr ""
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -12655,6 +12803,7 @@ msgid "Notify users by email"
 msgstr "उपयोगकर्ताओं को ई-मेल से इत्तला करें"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -13024,6 +13173,7 @@ msgstr ""
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "अंतिम तारीख़ {date}"
 
@@ -13032,6 +13182,7 @@ msgid "{section_format} due {{date}}"
 msgstr ""
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr ""
 
@@ -13173,6 +13324,7 @@ msgstr ""
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "{course_number} पाठ्यक्रम"
 
@@ -13185,7 +13337,8 @@ msgstr ""
 msgid "Courseware"
 msgstr "पाठ्यक्रम"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr ""
 
@@ -13247,6 +13400,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr ""
 
@@ -13263,13 +13418,10 @@ msgid "Handout Navigation"
 msgstr "है्न्डआउट नैविगेशन"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "समाचार - MITx 6.002x"
@@ -15849,32 +16001,6 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"अगर यह विकल्प <em>चुना गया</em>, तो जिन उपयोगकर्ताओं ने {platform_name} के "
-"लिए रजिस्टर नहीं किया है उनका नामांकन अपने-आप हो जाएगा। "
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"अगर यह विकल्प <em>चुना नहीं गया</em>, तो वे उपयोगकर्ता जिन्होंने अभी तक "
-"{platform_name} के लिए रजिस्टर नहीं किया है वे दाखिल नहीं किये जायेंगे, "
-"लेकिन खाता बनाने के बाद उन्हें नामांकन करने की अनुमति दी जायेगी।"
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr ""
-"अगर इस विकल्प <em> चुना गया है </em>, तो उपयोगकर्ताओं को ईमेल सूचना प्राप्त "
-"होगी!"
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr ""
@@ -15907,8 +16033,8 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -16026,16 +16152,30 @@ msgid "Add Moderator"
 msgstr "मॉडरेटर जोड़ें"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "चर्चा समुदाय TAs"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -16264,7 +16404,7 @@ msgid "View a specific learner's grades and progress"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -16280,7 +16420,7 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
+msgid "Location of problem in course"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -16315,6 +16455,23 @@ msgid ""
 "improves in the learner's favor."
 msgstr ""
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr ""
@@ -16429,7 +16586,6 @@ msgstr ""
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr ""
 
@@ -16453,28 +16609,9 @@ msgstr ""
 "अपनी पसंदीदा भाषा नहीं दिख रही? {link_start}स्वयंसेवी अनुवादक "
 "बनें!{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "पुष्टि करें"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "मोडल खुला है"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr ""
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr ""
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr ""
 
@@ -16482,27 +16619,23 @@ msgstr ""
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr ""
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr ""
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "यह कैसे काम करता है"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "विश्वविद्यालय"
 
@@ -16513,12 +16646,10 @@ msgstr ""
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr ""
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr ""
 
@@ -17293,7 +17424,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr ""
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr ""
 
@@ -17305,40 +17435,6 @@ msgstr ""
 msgid "Sign in or Register"
 msgstr ""
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr ""
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr ""
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr ""
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr ""
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr ""
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr ""
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr ""
@@ -17526,7 +17622,8 @@ msgstr "अपने डैशबोर्ड पर लौटें"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -17557,6 +17654,134 @@ msgstr ""
 msgid "Add article"
 msgstr "लेख जोड़ें"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -17601,7 +17826,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "पाठ्यक्रम ढूंढें"
 
@@ -17629,18 +17853,6 @@ msgid ""
 "Code{honor_link_end}"
 msgstr ""
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "और विकल्पों के लिए ड्रॉपडाउन करें"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr ""
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr ""
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -17811,19 +18023,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr ""
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "पृष्‍ठ के कार्यकलाप"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "नई फाइल अपलोड करें"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr ""
@@ -18011,6 +18218,15 @@ msgstr ""
 msgid "Drag to reorder"
 msgstr ""
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "पृष्‍ठ के कार्यकलाप"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr ""
@@ -18243,10 +18459,6 @@ msgid ""
 "respond to student questions. You add or edit updates in HTML."
 msgstr ""
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr ""
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -18260,10 +18472,6 @@ msgid ""
 "and seed the discussions and wiki."
 msgstr ""
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr ""
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr ""
@@ -19440,10 +19648,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr ""
@@ -20038,6 +20242,14 @@ msgstr ""
 msgid "Course End Time"
 msgstr ""
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr ""
@@ -20633,18 +20845,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -20686,8 +20915,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -20833,10 +21062,6 @@ msgstr ""
 msgid "Outline"
 msgstr ""
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr ""
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr ""
diff --git a/conf/locale/hi/LC_MESSAGES/djangojs.mo b/conf/locale/hi/LC_MESSAGES/djangojs.mo
index 6081b938d6..22a841f923 100644
Binary files a/conf/locale/hi/LC_MESSAGES/djangojs.mo and b/conf/locale/hi/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/hi/LC_MESSAGES/djangojs.po b/conf/locale/hi/LC_MESSAGES/djangojs.po
index 8864d81115..3ff436991f 100644
--- a/conf/locale/hi/LC_MESSAGES/djangojs.po
+++ b/conf/locale/hi/LC_MESSAGES/djangojs.po
@@ -48,8 +48,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-06 15:25+0000\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Hindi (http://www.transifex.com/open-edx/edx-platform/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -2506,7 +2506,6 @@ msgid ""
 msgstr ""
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr ""
 
@@ -3510,7 +3509,6 @@ msgstr ""
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Username"
 msgstr "उपयोगकर्ता नाम"
 
@@ -3522,6 +3520,10 @@ msgstr "ई-मेल"
 msgid "Revoke access"
 msgstr ""
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr ""
@@ -3530,6 +3532,10 @@ msgstr ""
 msgid "Please enter a username or email."
 msgstr "कृपया उपयोगकर्ता नाम या ई-मेल पता दर्ज करें।"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "उपयोगकर्ता की अनुमतियों को बदलने में त्रुटि।"
@@ -3890,6 +3896,24 @@ msgid ""
 "are complete and correct."
 msgstr ""
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4087,6 +4111,14 @@ msgstr ""
 msgid "Failed to rescore problem to improve score for user."
 msgstr ""
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr ""
@@ -4305,7 +4337,6 @@ msgid "Year of Birth"
 msgstr ""
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr ""
 
@@ -4412,76 +4443,6 @@ msgstr ""
 msgid "Order History"
 msgstr ""
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr ""
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr ""
@@ -4927,6 +4888,11 @@ msgstr ""
 msgid "The course start date must be later than the enrollment start date."
 msgstr ""
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -4999,6 +4965,10 @@ msgstr ""
 msgid "or"
 msgstr "या"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr ""
@@ -5175,10 +5145,12 @@ msgstr "उपयोग में नहीं"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5327,10 +5299,6 @@ msgstr ""
 msgid "{display_name} Settings"
 msgstr ""
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr ""
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr ""
@@ -5345,6 +5313,10 @@ msgstr ""
 msgid "Publish"
 msgstr ""
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr ""
@@ -5358,6 +5330,11 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr "संशोधन करना:  %(title)s"
 
+#: cms/static/js/views/modals/edit_xblock.js
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr ""
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "खंड"
@@ -5421,7 +5398,8 @@ msgstr ""
 msgid "Date added"
 msgstr ""
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -5708,6 +5686,7 @@ msgid "subsection"
 msgstr ""
 
 #: cms/static/js/views/utils/xblock_utils.js
+#: cms/templates/js/container-access.underscore
 msgid "unit"
 msgstr ""
 
@@ -6578,10 +6557,6 @@ msgstr ""
 msgid "Collapse All"
 msgstr ""
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr ""
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr ""
@@ -7438,70 +7413,6 @@ msgstr ""
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr ""
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr ""
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr ""
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8023,6 +7934,70 @@ msgstr ""
 msgid "Back to Dashboard"
 msgstr ""
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr ""
@@ -8264,6 +8239,20 @@ msgstr ""
 msgid "Deactivate"
 msgstr ""
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -8425,6 +8414,10 @@ msgstr ""
 msgid "Unpublished changes to content that will release in the future"
 msgstr ""
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -8951,12 +8944,6 @@ msgstr ""
 msgid "Staff and Learners"
 msgstr ""
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9220,6 +9207,32 @@ msgid ""
 "specify that calculators are allowed."
 msgstr ""
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr ""
@@ -9255,8 +9268,8 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
 msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.mo b/conf/locale/ko_KR/LC_MESSAGES/django.mo
index 43411cb411..c95f259d6d 100644
Binary files a/conf/locale/ko_KR/LC_MESSAGES/django.mo and b/conf/locale/ko_KR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.po b/conf/locale/ko_KR/LC_MESSAGES/django.po
index 0bb10df0f8..5eaaee7ab5 100644
--- a/conf/locale/ko_KR/LC_MESSAGES/django.po
+++ b/conf/locale/ko_KR/LC_MESSAGES/django.po
@@ -90,7 +90,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-03-16 12:39+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/open-edx/edx-platform/language/ko_KR/)\n"
@@ -278,6 +278,20 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr ""
 
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: lms/templates/shoppingcart/shopping_cart.html
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr ""
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -321,6 +335,11 @@ msgid "Moderator"
 msgstr ""
 
 #: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
+#: common/djangoapps/django_comment_common/models.py
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Community TA"
 msgstr ""
 
@@ -1708,9 +1727,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -1822,6 +1840,11 @@ msgstr ""
 msgid "Math Expression Input"
 msgstr ""
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2044,6 +2067,10 @@ msgstr ""
 msgid "Dictionary with the current student responses"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr ""
@@ -2113,6 +2140,8 @@ msgstr ""
 #: lms/templates/manage_user_standing.html lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "제출"
@@ -2666,6 +2695,7 @@ msgid ""
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "학습 자료"
 
@@ -4945,6 +4975,7 @@ msgid "Percent of Students"
 msgstr ""
 
 #: lms/djangoapps/class_dashboard/dashboard_data.py
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Score"
 msgstr ""
 
@@ -5186,6 +5217,15 @@ msgid ""
 "specific student."
 msgstr ""
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "강좌 계획"
@@ -5198,18 +5238,27 @@ msgstr "진도"
 msgid "Textbooks"
 msgstr "교재"
 
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
-#: lms/templates/shoppingcart/shopping_cart.html
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
-
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
+#, python-brace-format
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
 msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
@@ -6527,6 +6576,14 @@ msgstr ""
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr ""
@@ -6537,6 +6594,12 @@ msgstr ""
 msgid "rescored"
 msgstr ""
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -6821,10 +6884,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr ""
@@ -8166,6 +8244,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr ""
@@ -8203,11 +8286,11 @@ msgid ""
 "'Cancel' button."
 msgstr ""
 
+#: lms/templates/oauth2_provider/authorize.html
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
-msgstr "취소"
+msgstr ""
 
 #: lms/templates/oauth2_provider/authorize.html
 msgid "Allow"
@@ -8222,8 +8305,8 @@ msgstr "오류"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
-msgstr "%(site_name)s 이용자 계정의 비밀번호 재설정을 요청하였기 때문에, 이 이메일이 전송되었습니다."
+" user account at %(platform_name)s."
+msgstr ""
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -8338,7 +8421,6 @@ msgstr "미리보기"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "닫기"
@@ -8596,6 +8678,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -8982,6 +9066,22 @@ msgstr ""
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr ""
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -9101,6 +9201,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr ""
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -9324,6 +9443,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr ""
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr ""
@@ -10032,7 +10156,7 @@ msgstr ""
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "불러오는 중"
 
@@ -10049,6 +10173,16 @@ msgstr "설정"
 msgid "Course Number"
 msgstr "강좌 번호"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -10076,7 +10210,6 @@ msgstr "강좌 번호:"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "강좌"
 
@@ -10167,11 +10300,14 @@ msgstr "보기"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr ""
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "초기화"
 
@@ -10181,6 +10317,11 @@ msgstr "초기화"
 msgid "Legal"
 msgstr "법률적"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -10264,7 +10405,6 @@ msgid "Usermenu dropdown"
 msgstr ""
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "로그아웃"
 
@@ -10460,12 +10600,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr " {link_start} 홈페이지 {link_end}로 돌아가기"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "이메일 변경 성공"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr " {link_start}대시보드{link_end}에서 새로운 이메일을 볼 수 있습니다."
 
@@ -11408,14 +11546,18 @@ msgid "Add comment"
 msgstr "코멘트 추가"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "운영팀 디버그"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "행동들"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr ""
@@ -11435,6 +11577,10 @@ msgstr ""
 msgid "Rescore Only If Score Improves"
 msgstr ""
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "모듈 필드"
@@ -11647,7 +11793,7 @@ msgid ""
 " not mean to do this, {undo_link_start}you can re-subscribe{link_end}."
 msgstr ""
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "대시보드:"
 
@@ -12532,12 +12678,14 @@ msgid "Auto Enroll"
 msgstr "자동 등록"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
 msgstr ""
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -12555,6 +12703,7 @@ msgid "Notify users by email"
 msgstr "이메일로 등록에 대해 알려줍니다."
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -12927,6 +13076,7 @@ msgstr ""
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "마감일 {date}"
 
@@ -12935,6 +13085,7 @@ msgid "{section_format} due {{date}}"
 msgstr ""
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr ""
 
@@ -13077,6 +13228,7 @@ msgstr "검색 수정하기"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "{course_number} 강좌 내용"
 
@@ -13089,7 +13241,8 @@ msgstr "강좌 도구모음"
 msgid "Courseware"
 msgstr "강좌 내용"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr ""
 
@@ -13151,6 +13304,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr ""
 
@@ -13167,13 +13322,10 @@ msgid "Handout Navigation"
 msgstr "학습 자료 찾기"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "새소식 - MITx 6.002x"
@@ -15783,28 +15935,6 @@ msgstr "그러므로 충분한 이유가 제시되어야 합니다. "
 msgid "Reason"
 msgstr "이유"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"자동 등록이 <em>체크</em> 되어 있으면, {platform_name}에 등록되지 않은 학습자가 자동으로 등록될 것입니다."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"자동 등록이 <em>체크되어 있지 않으면</em> ,  {platform_name}에 등록되지 않은 학습자는 등록되지 않지만, 등록이 "
-"허용될 것입니다."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr "이옵션이 <em>체크</em> 되어 있으면, 사용자들은 이메일 통지를 받을것입니다."
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "등록된 학습자"
@@ -15839,9 +15969,9 @@ msgstr "주의: 베타테스터로 등록되기 전에 {platform_name} 계정이
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
-msgstr "이 옵션이 <em>체크</em> 되어 있으면, 당신 강좌에 등록되지 않은 사용자들은 자동으로 등록될 것입니다."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -15967,16 +16097,30 @@ msgid "Add Moderator"
 msgstr "진행자 추가"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "게시판 커뮤니티 조교"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -16203,7 +16347,7 @@ msgid "View a specific learner's grades and progress"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -16219,7 +16363,7 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
+msgid "Location of problem in course"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -16254,6 +16398,23 @@ msgid ""
 "improves in the learner's favor."
 msgstr ""
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr ""
@@ -16368,7 +16529,6 @@ msgstr ""
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr ""
 
@@ -16390,28 +16550,9 @@ msgid ""
 "translator!{link_end}"
 msgstr "원하는 언어로 보이지 않습니까?{link_start}  번역자로 뒤기 위한 자원봉사자!{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "확인"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "modal open"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "확인"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "열기 "
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "시스템관리자"
 
@@ -16419,27 +16560,23 @@ msgstr "시스템관리자"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "장바구니"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr ""
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "동작 원리"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "학교"
 
@@ -16450,12 +16587,10 @@ msgstr ""
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "로그인"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "글로벌"
 
@@ -17223,7 +17358,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr "현재 {platform_name}  서버가 과부하 상태 입니다."
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "계정 설정"
 
@@ -17235,40 +17369,6 @@ msgstr "잠시 기다려 주십시오."
 msgid "Sign in or Register"
 msgstr "로그인 또는 가입"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "학습자 정보"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "연동 계정"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "링크됨"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "링크 없음"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "링크 해제"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "링크"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr ""
@@ -17458,7 +17558,8 @@ msgstr "대시보드로 돌아 가기"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -17489,6 +17590,134 @@ msgstr ""
 msgid "Add article"
 msgstr "글 쓰기"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -17533,7 +17762,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "강좌 찾기"
 
@@ -17561,18 +17789,6 @@ msgid ""
 "Code{honor_link_end}"
 msgstr ""
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "더 많은 평가 기준 드롭 다운"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr ""
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr ""
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -17743,19 +17959,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr ""
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "페이지 액션"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "파일 업로드"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "강좌에 파일 추가하기"
@@ -17949,6 +18160,15 @@ msgstr " 콤포넌트 삭제"
 msgid "Drag to reorder"
 msgstr "재배열 위한 이동"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "페이지 액션"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr "LMS에서 강좌내용 열기 "
@@ -18182,10 +18402,6 @@ msgid ""
 "respond to student questions. You add or edit updates in HTML."
 msgstr "공지사항을 입력하세요. HTML로 추가 또는 편집할 수 있습니다."
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "강좌 개요"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -18199,10 +18415,6 @@ msgid ""
 "and seed the discussions and wiki."
 msgstr ""
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "닫기"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "주의"
@@ -19440,10 +19652,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "강좌가 처리중입니다."
@@ -20082,6 +20290,14 @@ msgstr "강좌가 활성화되어 있는 마지막 날"
 msgid "Course End Time"
 msgstr "강좌 종료 시간"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "등록 시작일"
@@ -20690,18 +20906,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -20743,8 +20976,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -20894,10 +21127,6 @@ msgstr ""
 msgid "Outline"
 msgstr "강좌 개요"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "공지사항"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "가져오기"
diff --git a/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo b/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo
index 809a71baf2..06da6a6017 100644
Binary files a/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo and b/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ko_KR/LC_MESSAGES/djangojs.po b/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
index b1cfe4aad5..b6133a7608 100644
--- a/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
@@ -62,8 +62,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-06 15:25+0000\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/open-edx/edx-platform/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -2469,7 +2469,6 @@ msgid ""
 msgstr ""
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "국가"
 
@@ -3461,7 +3460,6 @@ msgstr "사용되지 않은 수강 신청 코드를 표시하세요."
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Username"
 msgstr "아이디"
 
@@ -3473,6 +3471,10 @@ msgstr "이메일"
 msgid "Revoke access"
 msgstr "접근 권한 취소"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr "아이디 또는 이메일을 입력하세요"
@@ -3481,6 +3483,10 @@ msgstr "아이디 또는 이메일을 입력하세요"
 msgid "Please enter a username or email."
 msgstr "아이디 또는 이메일을 입력하세요"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "이용자의 권한 변경 에러"
@@ -3831,6 +3837,24 @@ msgid ""
 "are complete and correct."
 msgstr ""
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4028,6 +4052,14 @@ msgstr ""
 msgid "Failed to rescore problem to improve score for user."
 msgstr ""
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "자료가 저장되지 않았습니다."
@@ -4246,7 +4278,6 @@ msgid "Year of Birth"
 msgstr "출생연도"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "선호하는 언어"
 
@@ -4353,80 +4384,6 @@ msgstr ""
 msgid "Order History"
 msgstr ""
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "{platform_name} 학습자가 나에 대해 볼 수 있는 것은 :"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "제한적 프로필"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "전체 프로필"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "국가 추가"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "언어 추가"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "자기소개"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr "다른 학습자들에게 간단하게 나를 소개합니다. 관심사, 수강 이유 또는 학습 목표 같은 것을 쓰면 됩니다. "
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "계정 설정 페이지"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-"귀하의 전체 프로필을 공유하기 전에 출생연도를 입력해야 합니다. 출생연도를 지정하려면  "
-"{account_settings_page_link}로 가면 됩니다.  "
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"전체 프로필을 공유하려면 13세 이상이어야 합니다. 13세 이상이라면,  {account_settings_page_link}에서 "
-"출생연도를 입력하세요."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "프로필 이미지"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "{username}의 프로필 이미지"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr ""
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "이미지 업로드 오류"
@@ -4866,6 +4823,11 @@ msgstr ""
 msgid "The course start date must be later than the enrollment start date."
 msgstr ""
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -4935,6 +4897,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr ""
@@ -5109,10 +5075,12 @@ msgstr ""
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
 msgstr[0] ""
 
 #. Translators: this refers to a collection of groups.
@@ -5260,10 +5228,6 @@ msgstr ""
 msgid "{display_name} Settings"
 msgstr ""
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr ""
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr ""
@@ -5278,6 +5242,10 @@ msgstr ""
 msgid "Publish"
 msgstr ""
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr ""
@@ -5291,6 +5259,11 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr ""
 
+#: cms/static/js/views/modals/edit_xblock.js
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr ""
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr ""
@@ -5354,7 +5327,8 @@ msgstr ""
 msgid "Date added"
 msgstr ""
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -5637,6 +5611,7 @@ msgid "subsection"
 msgstr ""
 
 #: cms/static/js/views/utils/xblock_utils.js
+#: cms/templates/js/container-access.underscore
 msgid "unit"
 msgstr ""
 
@@ -6501,10 +6476,6 @@ msgstr ""
 msgid "Collapse All"
 msgstr ""
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr ""
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr ""
@@ -7359,70 +7330,6 @@ msgstr ""
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr ""
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr ""
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr ""
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -7943,6 +7850,70 @@ msgstr ""
 msgid "Back to Dashboard"
 msgstr ""
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr ""
@@ -8184,6 +8155,20 @@ msgstr ""
 msgid "Deactivate"
 msgstr ""
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -8345,6 +8330,10 @@ msgstr ""
 msgid "Unpublished changes to content that will release in the future"
 msgstr ""
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -8871,12 +8860,6 @@ msgstr ""
 msgid "Staff and Learners"
 msgstr ""
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9140,6 +9123,32 @@ msgid ""
 "specify that calculators are allowed."
 msgstr ""
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr ""
@@ -9175,8 +9184,8 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
 msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.mo b/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 2400a08aaa..b293b3dee4 100644
Binary files a/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.po b/conf/locale/pt_BR/LC_MESSAGES/django.po
index dfdc33e4b0..0548000efd 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@
 # Angela Amaro <angelasimei@gmail.com>, 2016
 # Antonio M. <toinho@gmail.com>, 2014
 # brk0_0, 2013
-# brunojm <brunojm@gmail.com>, 2014
+# brunojm <inactive+brunojm@transifex.com>, 2014
 # Cleomir Waiczyk <w.cleomir@gmail.com>, 2015
 # Daniela Dering de Lima Silva <daniela.eng11@gmail.com>, 2016
 # Douglas Reginatto <dreginatto@yahoo.com.br>, 2016
@@ -100,6 +100,7 @@
 # LucasPPires <lucaspylespires@hotmail.com>, 2014
 # Marcelo Soares Souza <marcelo@libertais.org>, 2014
 # Marco Túlio Pires <mtrpires@outlook.com>, 2014
+# Matheus Gomes Correia, 2017
 # Monica Farias <monifar.tp@gmail.com>, 2016
 # niels006 <niels006@gmail.com>, 2014
 # niels006 <niels006@gmail.com>, 2014
@@ -126,8 +127,8 @@
 # Angela Amaro <angelasimei@gmail.com>, 2016
 # anunciato <anunciato@gmail.com>, 2014
 # brk0_0, 2013
-# brunojm <brunojm@gmail.com>, 2013
-# brunojm <brunojm@gmail.com>, 2013-2014
+# brunojm <inactive+brunojm@transifex.com>, 2013
+# brunojm <inactive+brunojm@transifex.com>, 2013-2014
 # Cleomir Waiczyk <w.cleomir@gmail.com>, 2015
 # Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
 # Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
@@ -157,6 +158,7 @@
 # Marcelo Soares Souza <marcelo@libertais.org>, 2014
 # Marcos João Alves <noidmvp@gmail.com>, 2014
 # Marco Túlio Pires <mtrpires@outlook.com>, 2014
+# Matheus Gomes Correia, 2017
 # marianemurakami <mhmurakami@gmail.com>, 2014
 # Mike Job <mikejobrn@gmail.com>, 2015
 # Monica Farias <monifar.tp@gmail.com>, 2015-2016
@@ -200,7 +202,7 @@
 # André Geraldo <andreufpel@yahoo.com.br>, 2015
 # Angela Amaro <angelasimei@gmail.com>, 2016
 # brk0_0, 2013
-# brunojm <brunojm@gmail.com>, 2013
+# brunojm <inactive+brunojm@transifex.com>, 2013
 # Cleomir Waiczyk <w.cleomir@gmail.com>, 2015
 # Daniel Barossi Garcia <danidoo@gmail.com>, 2015
 # Daniele Maila Cebin <danielecebin@hotmail.com>, 2015
@@ -257,8 +259,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
-"PO-Revision-Date: 2017-03-16 12:39+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
+"PO-Revision-Date: 2017-07-22 16:30+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/open-edx/edx-platform/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -481,6 +483,28 @@ msgstr "Modos de educação profissional não podem ter definição de fim_data.
 msgid "Verified modes cannot be free."
 msgstr ""
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "Gratuito"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -524,6 +548,10 @@ msgstr "Administrador"
 msgid "Moderator"
 msgstr "Moderador"
 
+#: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
 #: common/djangoapps/django_comment_common/models.py
 msgid "Community TA"
 msgstr "Assistente de Ensino da Comunidade"
@@ -1980,9 +2008,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr "Não foi possível interpretar '{student_answer}' como um número."
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -2112,6 +2139,11 @@ msgstr "Avaliador externo"
 msgid "Math Expression Input"
 msgstr "Entrada de Expressão Matemática"
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2351,6 +2383,10 @@ msgstr "Dicionário para manutenção do status de tipos de entrada"
 msgid "Dictionary with the current student responses"
 msgstr "Dicionário com as respostas atuais do aluno"
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr ""
@@ -2432,6 +2468,8 @@ msgstr ""
 #: lms/templates/manage_user_standing.html lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "Enviar"
@@ -3049,6 +3087,7 @@ msgid ""
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "Apostilas do curso"
 
@@ -5931,6 +5970,15 @@ msgstr ""
 "Este tipo de componente não pode ser mostrado durante a exibição do curso "
 "para um aluno específico."
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "Programa de Estudos"
@@ -5948,27 +5996,28 @@ msgstr "Progresso"
 msgid "Textbooks"
 msgstr "Livros didáticos"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "Gratuito"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
+msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
@@ -7440,6 +7489,14 @@ msgstr "Prorrogação da data de entrega para {0} {1} ({2})"
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr "Nem todos os problemas no Exame de Admissão permitem a reavaliação."
@@ -7450,6 +7507,12 @@ msgstr "Nem todos os problemas no Exame de Admissão permitem a reavaliação."
 msgid "rescored"
 msgstr "reavaliada"
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -7754,10 +7817,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr "Caso queira exibir este módulo na tabela de conteúdos"
@@ -9356,6 +9434,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr ""
@@ -9393,11 +9476,11 @@ msgid ""
 "'Cancel' button."
 msgstr ""
 
+#: lms/templates/oauth2_provider/authorize.html
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 #: lms/templates/oauth2_provider/authorize.html
 msgid "Allow"
@@ -9412,10 +9495,8 @@ msgstr "Erro"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
+" user account at %(platform_name)s."
 msgstr ""
-"Você está recebendo este e-mail, porque você pediu uma redefinição de senha "
-"para sua conta de usuário no %(site_name)s."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -9538,7 +9619,6 @@ msgstr "Pré-visualizar"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "Fechar"
@@ -9804,6 +9884,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -10221,6 +10303,22 @@ msgstr ""
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr ""
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -10358,6 +10456,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr "Ativar Melhorias na Home Page do curso"
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -10600,6 +10717,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr ""
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr ""
@@ -11358,7 +11480,7 @@ msgstr ""
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "Carregando"
 
@@ -11375,6 +11497,16 @@ msgstr "Configurações"
 msgid "Course Number"
 msgstr "Número do curso"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -11402,7 +11534,6 @@ msgstr "Número do curso:"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "Cursos"
 
@@ -11493,11 +11624,14 @@ msgstr "Visualizar"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr ""
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "Redefinir"
 
@@ -11507,6 +11641,11 @@ msgstr "Redefinir"
 msgid "Legal"
 msgstr "Legal"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -11590,7 +11729,6 @@ msgid "Usermenu dropdown"
 msgstr ""
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "Sair"
 
@@ -11788,12 +11926,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "Voltar para a {link_start}página inicial{link_end}."
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "A alteração de e-mail foi bem sucedida! "
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr ""
 "Você deverá ver seu novo e-mail no {link_start}painel de controle{link_end}."
@@ -12775,14 +12911,18 @@ msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "Depuração para a equipe"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "Ações"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr ""
@@ -12802,6 +12942,10 @@ msgstr ""
 msgid "Rescore Only If Score Improves"
 msgstr ""
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "Campos do módulo"
@@ -13020,7 +13164,7 @@ msgstr ""
 "controle{link_end}. Se não era isso que você queria fazer, clique "
 "{undo_link_start}aqui{link_end} para se reinscrever."
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "Painel de controle para:"
 
@@ -13921,12 +14065,14 @@ msgid "Auto Enroll"
 msgstr "Inscrever-se automaticamente"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
 msgstr ""
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -13946,6 +14092,7 @@ msgid "Notify users by email"
 msgstr "Notificar usuários por e-mail"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -14369,6 +14516,7 @@ msgstr ""
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "data de entrega {date}"
 
@@ -14377,6 +14525,7 @@ msgid "{section_format} due {{date}}"
 msgstr ""
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "Este conteúdo é classificado"
 
@@ -14527,6 +14676,7 @@ msgstr "Pesquisa avançada"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "Material didático {course_number} "
 
@@ -14539,7 +14689,8 @@ msgstr "Ferramentas do Curso"
 msgid "Courseware"
 msgstr "Material didático"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "Favoritos"
 
@@ -14601,6 +14752,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr ""
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr ""
 
@@ -14617,13 +14770,10 @@ msgid "Handout Navigation"
 msgstr "Navegação das apostilas"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "Notícias - MITx 6.002x"
@@ -17478,32 +17628,6 @@ msgstr ""
 msgid "Reason"
 msgstr "Razão"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"Se esta opção estiver <em>marcada</em>, os usuários ainda não registrados no"
-" {platform_name} serão inscritos automaticamente."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"Se esta opção for deixada <em>desmarcada</em>, os usuários ainda não "
-"registrados no {platform_name} não serão inscritos, mas terão permissão para"
-" se inscrever assim que tiverem uma conta."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr ""
-"Se esta opção estiver <em>marcada</em>, os usuários receberão uma "
-"notificação por e-mail."
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "Inscrição de alunos"
@@ -17542,11 +17666,9 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
 msgstr ""
-"Caso esta opção esteja <em>marcada</em>, os usuários que não se inscreverem "
-"no seu curso serão inscritos automaticamente."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -17684,16 +17806,30 @@ msgid "Add Moderator"
 msgstr "Adicionar moderador"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "Assistentes de ensino da comunidade de discussão"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -17930,7 +18066,7 @@ msgid "View a specific learner's grades and progress"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -17946,7 +18082,7 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
+msgid "Location of problem in course"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -17981,6 +18117,23 @@ msgid ""
 "improves in the learner's favor."
 msgstr ""
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr ""
@@ -18095,7 +18248,6 @@ msgstr ""
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr ""
 
@@ -18119,28 +18271,9 @@ msgstr ""
 "Não encontrou o idioma da sua preferência?? {link_start} Seja um tradutor "
 "voluntário!{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "modal aberto"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "OK"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "abrir"
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "Administrador de sistema"
 
@@ -18148,27 +18281,23 @@ msgstr "Administrador de sistema"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "Carrinho de compras"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr "Página inicial do {platform_name} "
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "Como funciona"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "Escolas"
 
@@ -18179,12 +18308,10 @@ msgstr ""
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "Entrar"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "Global"
 
@@ -19005,7 +19132,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr "No momento, os servidores do {platform_name} estão sobrecarregados"
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "Configurações da conta"
 
@@ -19017,40 +19143,6 @@ msgstr "Por favor aguarde"
 msgid "Sign in or Register"
 msgstr "Entrar ou Registrar-se"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "Perfil de Estudante"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "Contas Vinculadas"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "Vinculadas"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "Não Vinculadas"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "Desvincular"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "Vincular"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr "Suporte ao Estudante"
@@ -19249,7 +19341,8 @@ msgstr "Retornar ao painel de controle"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -19280,6 +19373,134 @@ msgstr ""
 msgid "Add article"
 msgstr "Adicionar artigo"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -19326,7 +19547,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "Localizar cursos"
 
@@ -19361,18 +19581,6 @@ msgstr ""
 "{tos_link_start}Termos de Serviço{tos_link_end} e {honor_link_start}Código "
 "de Honra{honor_link_end}"
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "Mais opções no menu suspenso"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr "Meu perfil"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr "Registre-se agora"
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -19562,19 +19770,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr ""
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "Ações da página"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "Faça upload de um novo arquivo"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "Acrescentando arquivos para o Seu Curso."
@@ -19791,6 +19994,15 @@ msgstr "Excluir este componente"
 msgid "Drag to reorder"
 msgstr "Arraste para reordenar"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "Ações da página"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr "Abra o material do curso no LMS"
@@ -20055,10 +20267,6 @@ msgstr ""
 " horário e responder a perguntas dos alunos. Voce pode adicionar ou editar "
 "essas atualizações em HTML."
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "Descrição Geral do Curso"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -20074,10 +20282,6 @@ msgid ""
 "and seed the discussions and wiki."
 msgstr ""
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "Ignorar"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "Aviso"
@@ -21428,10 +21632,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "Cursos em Processo"
@@ -22136,6 +22336,14 @@ msgstr "Último dia em que o curso estará ativo"
 msgid "Course End Time"
 msgstr "Horário do término do curso"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "Data de início da matrícula"
@@ -22791,18 +22999,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -22844,8 +23069,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -23008,10 +23233,6 @@ msgstr "Navegação do curso"
 msgid "Outline"
 msgstr "Esboço"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "Atualizações"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "Importar"
diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo b/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo
index 5267c3aa7f..9c4d85928c 100644
Binary files a/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo and b/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
index 57af56e8ee..9fb984541f 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -12,8 +12,8 @@
 # Andrei Bosco Bezerra Torres <andreibosco@gmail.com>, 2013
 # Angela Amaro <angelasimei@gmail.com>, 2016
 # brk0_0, 2013
-# brunojm <brunojm@gmail.com>, 2014
-# brunojm <brunojm@gmail.com>, 2014
+# brunojm <inactive+brunojm@transifex.com>, 2014
+# brunojm <inactive+brunojm@transifex.com>, 2014
 # Bruno Sette <inactive+BrunoSette@transifex.com>, 2015
 # Cleomir Waiczyk <w.cleomir@gmail.com>, 2015
 # rqllira <contato@raquellira.com>, 2014
@@ -81,7 +81,7 @@
 # Antonio Henrique Dianin <antoniohdianin@hotmail.com>, 2015
 # brk0_0, 2013
 # Bruno Horphoz <horphoz@gmail.com>, 2014
-# brunojm <brunojm@gmail.com>, 2014
+# brunojm <inactive+brunojm@transifex.com>, 2014
 # Caio Kalil Gragnani <caio.gragnani@gmail.com>, 2015
 # Cleomir Waiczyk <w.cleomir@gmail.com>, 2015
 # Daniel Linhares <danielinhares@gmail.com>, 2014
@@ -184,6 +184,7 @@
 # Magaly Munik da Rocha, 2014
 # Marco Túlio Pires <mtrpires@outlook.com>, 2014
 # Mariana Jó de Souza <mariana.jsouza@gmail.com>, 2015
+# Matheus Gomes Correia, 2017
 # mmauryx <matheus_w_dias@hotmail.com>, 2014
 # Maurício Gonçalves Melara Camargo <mauriciogmc@gmail.com>, 2015
 # Mike Job <mikejobrn@gmail.com>, 2015
@@ -198,9 +199,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-12 03:14+0000\n"
-"Last-Translator: Ned Batchelder <ned@edx.org>\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-30 22:23+0000\n"
+"Last-Translator: Matheus Gomes Correia\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/open-edx/edx-platform/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -309,7 +310,7 @@ msgstr "Carregando"
 #: common/static/common/templates/discussion/alert-popup.underscore
 #: common/static/common/templates/discussion/forum-action-close.underscore
 #: common/static/common/templates/discussion/search-alert.underscore
-#: lms/templates/student_profile/share_modal.underscore
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "Fechar"
 
@@ -2716,7 +2717,6 @@ msgid ""
 msgstr "O idioma principal que os membros da equipe usam para se comunicar."
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "País"
 
@@ -3755,7 +3755,6 @@ msgstr "Marcar código de matrícula como não usado"
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 #: lms/templates/financial-assistance/financial_assessment_form.underscore
 msgid "Username"
 msgstr "Nome de usuário"
@@ -3768,6 +3767,10 @@ msgstr "E-mail"
 msgid "Revoke access"
 msgstr "Revogar acesso"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr "Digite um nome de usuário ou email"
@@ -3776,6 +3779,10 @@ msgstr "Digite um nome de usuário ou email"
 msgid "Please enter a username or email."
 msgstr "Digite um nome de usuário ou e-mail."
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "Erro ao alterar as permissões do usuário."
@@ -4158,6 +4165,24 @@ msgid ""
 "are complete and correct."
 msgstr ""
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4360,6 +4385,14 @@ msgstr ""
 msgid "Failed to rescore problem to improve score for user."
 msgstr ""
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "Não foi possível salvar os dados."
@@ -4592,7 +4625,6 @@ msgid "Year of Birth"
 msgstr "Ano de Nascimento"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "Idioma de preferência"
 
@@ -4700,85 +4732,6 @@ msgstr ""
 msgid "Order History"
 msgstr ""
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "Estudantes do {platform_name} podem visualizar meu:"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "Perfil limitado"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "Perfil completo"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "Adicionar país"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "Adicionar idioma"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "Sobre mim"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr ""
-"Conte um pouco sobre você para outros estudantes do edX: onde você mora, "
-"quais são seus interesses, porquê você está fazendo um curso no edX ou o que"
-" você espera aprender."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "Página de Configurações da conta."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-"Você deve especificar seu ano de nascimento antes de compartilhar seu perfil"
-" completo. Para especificar seu ano de aniversário, vá para "
-"{account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"Você deve ter mais de 13 anos para compartilhar seu perfil completo. Se você"
-" tem mais de 13 anos, tenha certeza que você especificou o ano do seu "
-"nascimento na {account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "Imagem do perfil"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "Imagem do perfil de {username}"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr ""
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr ""
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "Erro ao carregar a imagem"
@@ -5239,6 +5192,11 @@ msgid "The course start date must be later than the enrollment start date."
 msgstr ""
 "A data de início do curso deve ser posterior à data de início da matrícula. "
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -5315,6 +5273,10 @@ msgstr ""
 msgid "or"
 msgstr "ou"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "Este componente tem problemas de validação."
@@ -5497,10 +5459,12 @@ msgstr "Não utilizado"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5669,10 +5633,6 @@ msgstr ""
 msgid "{display_name} Settings"
 msgstr ""
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr ""
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr ""
@@ -5687,6 +5647,10 @@ msgstr ""
 msgid "Publish"
 msgstr "Publicar"
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr ""
@@ -5700,6 +5664,10 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr "Editando: %(title)s"
 
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr "Unidade"
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "Componente"
@@ -5762,7 +5730,8 @@ msgstr ""
 msgid "Date added"
 msgstr "Data adicionada."
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -6939,10 +6908,6 @@ msgstr "Expandir Tudo"
 msgid "Collapse All"
 msgstr "Retrair Tudo"
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr "Unidade"
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr "Data de Início"
@@ -7828,70 +7793,6 @@ msgstr "ou criar uma nova aqui"
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr ""
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr ""
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr ""
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr ""
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr "Você está compartilhando um perfil limitado no momento."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8482,6 +8383,70 @@ msgstr "Desculpe, não foram encontrados resultados."
 msgid "Back to Dashboard"
 msgstr "Voltar para o Painel"
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr "Você está compartilhando um perfil limitado no momento."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr ""
@@ -8728,6 +8693,20 @@ msgstr "Ativar"
 msgid "Deactivate"
 msgstr "Desativar"
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -8891,6 +8870,10 @@ msgstr "Unidades não publicadas não serão lançadas"
 msgid "Unpublished changes to content that will release in the future"
 msgstr "Alterações de conteúdo não publicadas que serão liberadas no futuro"
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -9428,12 +9411,6 @@ msgstr "com %(section_or_subsection)s"
 msgid "Staff and Learners"
 msgstr ""
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9720,6 +9697,32 @@ msgstr ""
 "de supervisores de revisão deva aplicar ao rever os vídeos. Por exemplo, "
 "você poderia especificar que as calculadoras estão permitidas. "
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr "Arquivo enviado com sucesso"
@@ -9760,9 +9763,9 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
-msgstr "Editar nome"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
+msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
 #, python-format
diff --git a/conf/locale/rtl/LC_MESSAGES/django.mo b/conf/locale/rtl/LC_MESSAGES/django.mo
index b5874b5e89..638ee39fc9 100644
Binary files a/conf/locale/rtl/LC_MESSAGES/django.mo and b/conf/locale/rtl/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/rtl/LC_MESSAGES/django.po b/conf/locale/rtl/LC_MESSAGES/django.po
index 4a3a0f7b24..0c8df266b5 100644
--- a/conf/locale/rtl/LC_MESSAGES/django.po
+++ b/conf/locale/rtl/LC_MESSAGES/django.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-20 11:48+0000\n"
-"PO-Revision-Date: 2017-07-20 11:48:32.252217\n"
+"POT-Creation-Date: 2017-08-01 21:22+0000\n"
+"PO-Revision-Date: 2017-08-01 21:22:49.685108\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -262,6 +262,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr "دثقهبهثي وخيثس ذشررخف زث بقثث."
 
+#. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (0.1a)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "بقثث"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -2258,6 +2280,8 @@ msgstr ""
 #: lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "سعزوهف"
@@ -2904,6 +2928,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "ذخعقسث اشريخعفس"
 
@@ -5814,6 +5839,16 @@ msgstr ""
 "فاهس فغحث خب ذخوحخرثرف ذشررخف زث ساخصر صاهمث دهثصهرل فاث ذخعقسث شس ش "
 "سحثذهبهذ سفعيثرف."
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+"رعوزثق خب يشغس ش مثشقرثق اشس فخ عحلقشيث شبفثق ذخرفثرف هس وشيث شدشهمشزمث"
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr "يهسشزمث فاث يغرشوهذ عحلقشيث يثشيمهرث بخق فاهس ذخعقسث قعر."
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "سغممشزعس"
@@ -5855,28 +5890,6 @@ msgstr ""
 msgid "Enroll now"
 msgstr "ثرقخمم رخص"
 
-#. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (0.1a)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
-#: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
-#, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
-
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
-#: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "بقثث"
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
 msgstr "غخعق ثرقخمموثرف: شعيهف فقشذن"
@@ -7681,10 +7694,22 @@ msgstr ""
 "فاهس ذخوحخرثرف'س شذذثسس سثففهرلس قثبثق فخ يثمثفثي خق هردشمهي لقخعح "
 "ذخربهلعقشفهخرس."
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+"فاهس عرهف'س شذذثسس سثففهرلس قثبثق فخ يثمثفثي خق هردشمهي لقخعح "
+"ذخربهلعقشفهخرس."
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr "فاهس ذخوحخرثرف'س شذذثسس سثففهرلس قثبثق فخ يثمثفثي خق هردشمهي لقخعحس."
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr "فاهس عرهف'س شذذثسس سثففهرلس قثبثق فخ يثمثفثي خق هردشمهي لقخعحس."
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid ""
 "This component's access settings contradict its parent's access settings."
@@ -9753,6 +9778,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -10329,6 +10356,25 @@ msgstr "حشفا عسثي فخ ذخرسفقعذف عقمس فخ حقخلقشوس
 msgid "Enable course home page improvements."
 msgstr "ثرشزمث ذخعقسث اخوث حشلث هوحقخدثوثرفس."
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr "سهفث فاثوث ذاشرلثي فخ {site_theme}"
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr "فاثوث {site_theme} يخثس رخف ثطهسف"
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr "سهفث فاثوث قثدثقفثي فخ فاث يثبشعمف"
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr "فاثوهرل شيوهرهسفقشفهخر"
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -10576,6 +10622,11 @@ msgstr "غخع وعسف شلقثث فخ فاث {platform_name} {terms_of_service
 msgid "Review the Terms of Service"
 msgstr "قثدهثص فاث فثقوس خب سثقدهذث"
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr "{header_open}{title}{header_close}{body}"
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr "فاث ذخعقسث نثغ بخق فاث ذخعقسث صث صخعمي مهنث فخ زث شعفخ-ذخاخقفثي."
@@ -11345,6 +11396,7 @@ msgstr "ذخرفثرف"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "مخشيهرل"
 
@@ -11361,6 +11413,16 @@ msgstr "سثففهرلس"
 msgid "Course Number"
 msgstr "ذخعقسث رعوزثق"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr "ذخعقسث خعفمهرث"
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr "يهسوهسس"
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -11478,11 +11540,14 @@ msgstr "دهثص"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr "حقثدهثص مشرلعشلث سثففهرل"
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "قثسثف"
 
@@ -11492,6 +11557,11 @@ msgstr "قثسثف"
 msgid "Legal"
 msgstr "مثلشم"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr "عحيشفثس"
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -14626,6 +14696,7 @@ msgstr "{span_start}ذعققثرف سثذفهخر{span_end}"
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "يعث {date}"
 
@@ -14634,6 +14705,7 @@ msgid "{section_format} due {{date}}"
 msgstr "{section_format} يعث {{date}}"
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "فاهس ذخرفثرف هس لقشيثي"
 
@@ -14781,6 +14853,7 @@ msgstr "قثبهرث غخعق سثشقذا"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "{course_number} ذخعقسثصشقث"
 
@@ -14794,6 +14867,7 @@ msgid "Courseware"
 msgstr "ذخعقسثصشقث"
 
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "زخخنوشقنس"
 
@@ -14859,6 +14933,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "صثمذخوث فخ {org}'س {course_name}!"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "قثسعوث ذخعقسث"
 
@@ -14875,6 +14951,7 @@ msgid "Handout Navigation"
 msgstr "اشريخعف رشدهلشفهخر"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr "ذخعقسث فخخمس"
 
@@ -19504,10 +19581,12 @@ msgstr "قثفعقر فخ غخعق يشسازخشقي"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 "فاهس صثزسهفث عسثس ذخخنهثس فخ ثرسعقث غخع لثف فاث زثسف ثطحثقهثرذث خر خعق "
-"صثزسهفث."
+"صثزسهفث. هب غخع ذخرفهرعث زقخصسهرل فاهس سهفث, صث عريثقسفشري فاشف غخع شذذثحف "
+"فاث عسث خب ذخخنهثس."
 
 #: lms/templates/widgets/cookie-consent.html
 msgid "Got it!"
@@ -19537,6 +19616,135 @@ msgstr "ذخعقسث صهنه"
 msgid "Add article"
 msgstr "شيي شقفهذمث"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr "مشرلعشلث ذخيث"
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr "بخق ثطشوحمث عسث ثر بخق ثرلمهسا"
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr "حمثشسث قثبقثسا فاث حشلث فخ سثث فاث ذاشرلثس شححمهثي."
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr "حقثدهثص فاثوث"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr "شمم قهلافس قثسثقدثي"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr "شففقهزعفهخر"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr "رخرذخووثقذهشم"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr "رخ يثقهدشفهدثس"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr "ساشقث شمهنث"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr "ذقثشفهدث ذخووخرس مهذثرسثي ذخرفثرف, صهفا فثقوس شس بخممخص:"
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr "سخوث قهلافس قثسثقدثي"
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr "هوحخقفشرف ذخعقسث يشفثس"
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr "فخيشغ هس {date}"
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr "سثشقذا فاث ذخعقسث"
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr "سفشقف ذخعقسث"
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr "{subsection_format} يعث {{date}}"
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr "فاهس هس غخعق مشسف دهسهفثي ذخعقسث سثذفهخر."
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr "فاهس ذخعقسث اشس رخف سفشقفثي غثف."
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr "صث'قث سفهمم صخقنهرل خر ذخعقسث ذخرفثرف."
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+"فاهس ذخعقسث اشس رخف سفشقفثي غثف, شري صهمم مشعرذا خر {launch_date_html}."
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr "قثدهثصس"
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr "فاهس ذخعقسث يخثس رخف اشدث شرغ عحيشفثس."
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr "سثشقذا قثسعمفس"
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr "ذخررثذفثي شذذخعرفس"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr "مهرنثي"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr "رخف مهرنثي"
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr "عرمهرن"
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr "مهرن"
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr "مثشقرثق حقخبهمث"
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -20315,10 +20523,6 @@ msgstr ""
 " حشقفهذعمشق يهسذعسسهخرس هر فاث بخقعوس, شررخعرذث سذاثيعمث ذاشرلثس, شري "
 "قثسحخري فخ سفعيثرف ضعثسفهخرس. غخع شيي خق ثيهف عحيشفثس هر افوم."
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "ذخعقسث خعفمهرث"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -20337,10 +20541,6 @@ msgstr ""
 "فاث ذخعقسث فثشو; قثدهثص ذخعقسث عحيشفثس شري خفاثق شسسثفس بخق يشفثي وشفثقهشم; "
 "شري سثثي فاث يهسذعسسهخرس شري صهنه."
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "يهسوهسس"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "صشقرهرل"
@@ -22431,6 +22631,14 @@ msgstr "مشسف يشغ غخعق ذخعقسث هس شذفهدث"
 msgid "Course End Time"
 msgstr "ذخعقسث ثري فهوث"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr "ذثقفهبهذشفثس شدشهمشزمث يشفث"
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr "زغ يثبشعمف, 48 اخعقس شبفثق ذخعقسث ثري يشفث"
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "ثرقخمموثرف سفشقف يشفث"
@@ -23120,6 +23328,14 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr "شذذثسس هس رخف قثسفقهذفثي"
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+"شذذثسس فخ فاهس عرهف هس رخف قثسفقهذفثي, زعف دهسهزهمهفغ وهلاف زث شببثذفثي زغ "
+"هراثقهفثي سثففهرلس."
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
@@ -23128,6 +23344,14 @@ msgstr ""
 "شذذثسس فخ فاهس ذخوحخرثرف هس رخف قثسفقهذفثي, زعف دهسهزهمهفغ وهلاف زث شببثذفثي"
 " زغ هراثقهفثي سثففهرلس."
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+"غخع ذشر قثسفقهذف شذذثسس فخ فاهس عرهف فخ مثشقرثقس هر سحثذهبهذ ثرقخمموثرف "
+"فقشذنس خق ذخرفثرف لقخعحس."
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
@@ -23136,6 +23360,12 @@ msgstr ""
 "غخع ذشر قثسفقهذف شذذثسس فخ فاهس ذخوحخرثرف فخ مثشقرثقس هر سحثذهبهذ ثرقخمموثرف"
 " فقشذنس خق ذخرفثرف لقخعحس."
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+"غخع ذشر قثسفقهذف شذذثسس فخ فاهس عرهف فخ مثشقرثقس هر سحثذهبهذ ذخرفثرف لقخعحس."
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -23182,11 +23412,11 @@ msgstr "سثمثذف خرث خق وخقث لقخعحس:"
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
-"فاهس لقخعح رخ مخرلثق ثطهسفس. ذاخخسث شرخفاثق لقخعح خق يخ رخف قثسفقهذف شذذثسس "
-"فخ فاهس ذخوحخرثرف."
+"فاهس لقخعح رخ مخرلثق ثطهسفس.  ذاخخسث شرخفاثق لقخعح خق قثوخدث فاث شذذثسس "
+"قثسفقهذفهخر."
 
 #: cms/templates/emails/activation_email.txt
 msgid ""
@@ -23356,10 +23586,6 @@ msgstr "ذخعقسث رشدهلشفهخر"
 msgid "Outline"
 msgstr "خعفمهرث"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "عحيشفثس"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "هوحخقف"
diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.mo b/conf/locale/rtl/LC_MESSAGES/djangojs.mo
index 0f87eb3fa8..baee19313f 100644
Binary files a/conf/locale/rtl/LC_MESSAGES/djangojs.mo and b/conf/locale/rtl/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.po b/conf/locale/rtl/LC_MESSAGES/djangojs.po
index 122a47fba7..13bf849288 100644
--- a/conf/locale/rtl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/rtl/LC_MESSAGES/djangojs.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-20 11:47+0000\n"
-"PO-Revision-Date: 2017-07-20 11:48:32.711353\n"
+"POT-Creation-Date: 2017-08-01 21:22+0000\n"
+"PO-Revision-Date: 2017-08-01 21:22:50.339993\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -5170,6 +5170,12 @@ msgstr "فاث ذخعقسث ثري يشفث وعسف زث مشفثق فاشر ف
 msgid "The course start date must be later than the enrollment start date."
 msgstr "فاث ذخعقسث سفشقف يشفث وعسف زث مشفثق فاشر فاث ثرقخمموثرف سفشقف يشفث."
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+"فاث ذثقفهبهذشفث شدشهمشزمث يشفث وعسف زث مشفثق فاشر فاث ثرقخمموثرف سفشقف يشفث."
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr "فاث ثرقخمموثرف سفشقف يشفث ذشررخف زث شبفثق فاث ثرقخمموثرف ثري يشفث."
@@ -5241,6 +5247,10 @@ msgstr ""
 msgid "or"
 msgstr "خق"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr "فاهس عرهف اشس دشمهيشفهخر هسسعثس."
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "فاهس ذخوحخرثرف اشس دشمهيشفهخر هسسعثس."
diff --git a/conf/locale/ru/LC_MESSAGES/django.mo b/conf/locale/ru/LC_MESSAGES/django.mo
index ad7d94be48..6b18f55990 100644
Binary files a/conf/locale/ru/LC_MESSAGES/django.mo and b/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ru/LC_MESSAGES/django.po b/conf/locale/ru/LC_MESSAGES/django.po
index 55c1b2f018..a76ca2582b 100644
--- a/conf/locale/ru/LC_MESSAGES/django.po
+++ b/conf/locale/ru/LC_MESSAGES/django.po
@@ -246,7 +246,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-05-25 12:05+0000\n"
 "Last-Translator: Liubov Fomicheva <liubov.nelapa@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/open-edx/edx-platform/language/ru/)\n"
@@ -476,6 +476,28 @@ msgstr ""
 msgid "Verified modes cannot be free."
 msgstr "Режимы с подтверждением личности не могут быть бесплатными."
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{price}{currency_symbol}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "Бесплатно"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -520,6 +542,10 @@ msgstr "Администратор"
 msgid "Moderator"
 msgstr "Модератор"
 
+#: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
 #: common/djangoapps/django_comment_common/models.py
 msgid "Community TA"
 msgstr "Староста сообщества"
@@ -2000,9 +2026,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr "Не удалось определить числовое значение «{student_answer}»."
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -2131,6 +2156,11 @@ msgstr "Внешнее оценивание"
 msgid "Math Expression Input"
 msgstr "Ввод математического выражения"
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2372,6 +2402,10 @@ msgstr "Словарь для сохранения состояний полей
 msgid "Dictionary with the current student responses"
 msgstr "Словарь, содержащий ответы слушателей"
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr ""
@@ -2453,6 +2487,8 @@ msgstr ""
 #: lms/templates/manage_user_standing.html lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "Отправить"
@@ -3092,6 +3128,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "Дополнительные материалы"
 
@@ -6041,6 +6078,15 @@ msgstr ""
 "Невозможно отобразить этот вид компонента при просмотре курса в качестве "
 "определённого обучающегося."
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "Программа обучения"
@@ -6058,27 +6104,28 @@ msgstr "Прогресс"
 msgid "Textbooks"
 msgstr "Учебники"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{price}{currency_symbol}"
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "Бесплатно"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
+msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
@@ -7580,6 +7627,14 @@ msgstr "Продление сроков сдачи {0} {1} ({2})"
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr "Не все задания во вступительном испытании поддерживают пересдачу."
@@ -7590,6 +7645,12 @@ msgstr "Не все задания во вступительном испыта
 msgid "rescored"
 msgstr "повторно оценено"
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -7885,10 +7946,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr "Показывать ли этот модуль в оглавлении"
@@ -9483,6 +9559,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr "Выход выполнен"
@@ -9523,11 +9604,11 @@ msgid ""
 "'Cancel' button."
 msgstr ""
 
+#: lms/templates/oauth2_provider/authorize.html
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
-msgstr "Отмена"
+msgstr ""
 
 #: lms/templates/oauth2_provider/authorize.html
 msgid "Allow"
@@ -9542,10 +9623,8 @@ msgstr "Ошибка"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
+" user account at %(platform_name)s."
 msgstr ""
-"Вы получили это сообщение, потому что запросили смену пароля своей учётной "
-"записи на %(site_name)s."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -9667,7 +9746,6 @@ msgstr "Предварительный просмотр"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "Закрыть"
@@ -9936,6 +10014,8 @@ msgstr ""
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -10358,6 +10438,22 @@ msgstr "Возврат к языковым настройкам по умолч
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr "Смена языка по предпочтению пользователя: {preview_language_code}"
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -10490,6 +10586,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr "Разрешить улучшенную страницу курса."
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -10734,6 +10849,11 @@ msgstr "Вы должны принять {terms_of_service} {platform_name}"
 msgid "Review the Terms of Service"
 msgstr ""
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr ""
@@ -11494,7 +11614,7 @@ msgstr "Содержание"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "Загрузка"
 
@@ -11511,6 +11631,16 @@ msgstr "Настройки"
 msgid "Course Number"
 msgstr "Номер курса"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -11538,7 +11668,6 @@ msgstr "Номер курса:"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "Курсы"
 
@@ -11629,11 +11758,14 @@ msgstr "Просмотр"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr "Предварительный просмотр выбранного языка"
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -11643,6 +11775,11 @@ msgstr "Сбросить"
 msgid "Legal"
 msgstr "Юридическая информация"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -11726,7 +11863,6 @@ msgid "Usermenu dropdown"
 msgstr "Выпадающий список меню пользователя"
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "Выйти"
 
@@ -11930,12 +12066,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "Вернуться на {link_start}главную страницу{link_end}."
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "Смена электронного адреса прошла успешно!"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr ""
 "Новый адрес электронной почты появится на {link_start}панели "
@@ -12947,14 +13081,18 @@ msgid "Add comment"
 msgstr "Добавить комментарий"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "Отладка для сотрудников"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "Действия"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr ""
@@ -12974,6 +13112,10 @@ msgstr ""
 msgid "Rescore Only If Score Improves"
 msgstr ""
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "Поля формы"
@@ -13192,7 +13334,7 @@ msgstr ""
 "отказались от подписки случайно, {undo_link_start}вы можете подписаться "
 "снова{link_end}."
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "Панель управления для:"
 
@@ -14240,6 +14382,7 @@ msgid "Auto Enroll"
 msgstr "Автоматически вносить в список"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
@@ -14248,6 +14391,7 @@ msgstr ""
 "зарегистрировались на {platform_name}, будут зачисляться автоматически."
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -14270,6 +14414,7 @@ msgid "Notify users by email"
 msgstr "Уведомить слушателей по электронной почте"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -14695,6 +14840,7 @@ msgstr "{span_start}текущий раздел{span_end}"
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "до {date}"
 
@@ -14703,6 +14849,7 @@ msgid "{section_format} due {{date}}"
 msgstr ""
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "Этот элемент курса проверен "
 
@@ -14851,6 +14998,7 @@ msgstr "Уточнить параметры поиска"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "{course_number} Содержание"
 
@@ -14863,7 +15011,8 @@ msgstr "Вспомогательные материалы курса"
 msgid "Courseware"
 msgstr "Содержание"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "Закладки"
 
@@ -14925,6 +15074,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "Добро пожаловать на {org} {course_name}!"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "Вернуться к курсу"
 
@@ -14941,13 +15092,10 @@ msgid "Handout Navigation"
 msgstr "Навигация по наглядным материалам"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "Новости: MITx 6.002x"
@@ -17829,32 +17977,6 @@ msgstr "Поэтому, пожалуйста, подробно опишите, 
 msgid "Reason"
 msgstr "Причина"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr ""
-"Если эта опция <em>отмечена</em>, пользователи, не зарегистрированные в "
-"{platform_name}, будут автоматически зачислены на курс."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr ""
-"Если эта опция <em>не отмечена</em>, пользователи, не зарегистрированные на "
-"платформе «{platform_name}», не будут записаны на курс. Однако они смогут "
-"записаться на него, создав учётную запись."
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr ""
-"Если эта опция <em>отмечена</em>, пользователи будут получать уведомления по"
-" электронной почте."
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "Зарегистрировать/зачислить слушателей"
@@ -17894,11 +18016,9 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
 msgstr ""
-"Если эта опция <em>отмечена</em>, то пользователи, которые не записаны на "
-"ваш курс, будут автоматически записаны."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -18035,16 +18155,30 @@ msgid "Add Moderator"
 msgstr "Добавить модератора"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "Старосты сообщества"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -18292,7 +18426,7 @@ msgid "View a specific learner's grades and progress"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -18308,7 +18442,7 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
+msgid "Location of problem in course"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -18343,6 +18477,23 @@ msgid ""
 "improves in the learner's favor."
 msgstr ""
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr ""
@@ -18457,7 +18608,6 @@ msgstr "Информация о программе"
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr "Программы"
 
@@ -18481,28 +18631,9 @@ msgstr ""
 "Не нашли язык, который предпочитаете? {link_start}Станьте переводчиком-"
 "волонтёром!{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "Подтвердить"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "открыто модальное окно"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "ОК"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "открыть"
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "Сисадмин"
 
@@ -18510,27 +18641,23 @@ msgstr "Сисадмин"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "Корзина"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr "{platform_name} Главная страница"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "Как это работает"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "Организации"
 
@@ -18541,12 +18668,10 @@ msgstr "Просмотреть курсы"
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "Вход"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "Глобально"
 
@@ -19385,7 +19510,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr "В настоящий момент сервера {platform_name} перегружены"
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "Настройки учётной записи"
 
@@ -19397,40 +19521,6 @@ msgstr "Пожалуйста, подождите"
 msgid "Sign in or Register"
 msgstr "Войти или зарегистрироваться"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "Профиль слушателя"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "Связанные учётные записи"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "Привязано"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "Нет привязки к внешним учётным записям"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "Снять привязку к учётной записи"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "Привязать к учётной записи"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr "Поддержка слушателей"
@@ -19634,7 +19724,8 @@ msgstr "Вернуться к панели управления"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -19665,6 +19756,134 @@ msgstr ""
 msgid "Add article"
 msgstr "Добавить статью"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -19711,7 +19930,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "Найти курсы"
 
@@ -19747,18 +19965,6 @@ msgstr ""
 "{tos_link_start}Условия предоставления услуг{tos_link_end} и "
 "{honor_link_start}Кодекс чести{honor_link_end}"
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "Меню с дополнительными опциями"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr "Мой профиль"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr "Зарегистрируйтесь прямо сейчас"
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -19948,19 +20154,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr "Файлы и загрузки"
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "Действия на странице"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "Загрузить новый файл"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "Добавление файлов к вашему курсу"
@@ -20176,6 +20377,15 @@ msgstr "Удалить этот компонент"
 msgid "Drag to reorder"
 msgstr "Перетащите для изменения порядка"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "Действия на странице"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr "Перейти к курсу в LMS"
@@ -20440,10 +20650,6 @@ msgstr ""
 "расписании, для ответов на вопросы.  Вы можете добавлять и редактировать "
 "новости в формате HTML."
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "Структура курса"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -20463,10 +20669,6 @@ msgstr ""
 "курса; создайте команду курса; проверьте раздел новостей и другие материалы "
 "на предмет дат; задайте базовые темы обсуждений и вики."
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr "Скрыть"
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr "Предупреждение"
@@ -21850,10 +22052,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "Курс обработан"
@@ -22561,6 +22759,14 @@ msgstr "Последний день вашего курса"
 msgid "Course End Time"
 msgstr "Время окончания курса"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "Дата начала регистрации"
@@ -23237,18 +23443,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -23290,8 +23513,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -23460,10 +23683,6 @@ msgstr "Навигация по курсу"
 msgid "Outline"
 msgstr "Структура"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "Обновления"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "Импорт"
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.mo b/conf/locale/ru/LC_MESSAGES/djangojs.mo
index c880d0db6e..8ace5e1584 100644
Binary files a/conf/locale/ru/LC_MESSAGES/djangojs.mo and b/conf/locale/ru/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.po b/conf/locale/ru/LC_MESSAGES/djangojs.po
index 2fd6ffe02d..f1d597f3d1 100644
--- a/conf/locale/ru/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ru/LC_MESSAGES/djangojs.po
@@ -153,8 +153,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-06 15:25+0000\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Russian (http://www.transifex.com/open-edx/edx-platform/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -264,7 +264,7 @@ msgstr "Загрузка"
 #: common/static/common/templates/discussion/alert-popup.underscore
 #: common/static/common/templates/discussion/forum-action-close.underscore
 #: common/static/common/templates/discussion/search-alert.underscore
-#: lms/templates/student_profile/share_modal.underscore
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "Закрыть"
 
@@ -2728,7 +2728,6 @@ msgid ""
 msgstr "Язык, на котором члены команды в основном общаются между собой."
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "Страна"
 
@@ -3821,7 +3820,6 @@ msgstr "Пометить код зачисления как неиспользу
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 #: lms/templates/financial-assistance/financial_assessment_form.underscore
 msgid "Username"
 msgstr "Имя пользователя"
@@ -3834,6 +3832,10 @@ msgstr "Электронная почта"
 msgid "Revoke access"
 msgstr "Отменить доступ"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr "Введите имя пользователя или электронный адрес"
@@ -3842,6 +3844,10 @@ msgstr "Введите имя пользователя или электронн
 msgid "Please enter a username or email."
 msgstr "Пожалуйста, введите имя пользователя или электронный адрес."
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "Ошибка изменения полномочий пользователя"
@@ -4233,6 +4239,24 @@ msgid ""
 "are complete and correct."
 msgstr ""
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4435,6 +4459,14 @@ msgstr ""
 msgid "Failed to rescore problem to improve score for user."
 msgstr ""
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "Не удалось сохранить ваши данные."
@@ -4670,7 +4702,6 @@ msgid "Year of Birth"
 msgstr "Год рождения"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "Предпочитаемый язык"
 
@@ -4790,83 +4821,6 @@ msgstr "Информация об учётной записи"
 msgid "Order History"
 msgstr "История заказов"
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "Постраничное отображение достижений"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "Слушатели {platform_name} видят мой:"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "Ограниченный профиль"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "Полный профиль"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "Добавить страну"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "Добавить язык"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "О себе"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr ""
-"Расскажите остальным слушателям немного о себе: где вы живёте, чем "
-"интересуетесь, для чего вы проходите курсы и чему собираетесь научиться."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "Настройки учётной записи."
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr ""
-"Для публикации полного профиля вам необходимо указать год вашего рождения на"
-" {account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"Для публикации полного профиля вам должно быть больше 13 лет. Если вы старше"
-" 13 лет, удостоверьтесь, что вы указали год рождения на "
-"{account_settings_page_link}"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "Фотография"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "Фото {username}"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr "Обо мне"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "Достижения"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr "Профиль"
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "Ошибка загрузки изображения"
@@ -5335,6 +5289,11 @@ msgstr "Дата окончания курса должна быть позже
 msgid "The course start date must be later than the enrollment start date."
 msgstr "Дата начала курса должна быть позже даты начала записи на курс."
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr ""
@@ -5411,6 +5370,10 @@ msgstr ""
 msgid "or"
 msgstr "или"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "При проверке этого компонента обнаружены проблемы."
@@ -5596,14 +5559,16 @@ msgstr "Не используется"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
-msgstr[0] "Используется в {count} блоке"
-msgstr[1] "Используется в {count} блоках"
-msgstr[2] "Используется в {count} блоках"
-msgstr[3] "Используется в {count} блоках"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #. Translators: this refers to a collection of groups.
 #: cms/static/js/views/group_configuration_item.js
@@ -5769,10 +5734,6 @@ msgstr "Вы уверены, что хотите ограничить для {em
 msgid "{display_name} Settings"
 msgstr "Настройки {display_name}"
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr "Изменить настройки для {display_name}"
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr "Опубликовать {display_name}"
@@ -5787,6 +5748,10 @@ msgstr "Опубликовать все неопубликованные изм
 msgid "Publish"
 msgstr "Опубликовать"
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr "Основное"
@@ -5800,6 +5765,10 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr "Редактирование: %(title)s"
 
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr "Блок"
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "Компонент"
@@ -5861,7 +5830,8 @@ msgstr "Структура курса"
 msgid "Date added"
 msgstr "Дата добавления"
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -7055,10 +7025,6 @@ msgstr "Развернуть всё"
 msgid "Collapse All"
 msgstr "Свернуть все"
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr "Блок"
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr "Дата начала"
@@ -7953,79 +7919,6 @@ msgstr "или создать новую в этом сервисе"
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr "Рассказать о значке «%(display_name)s»"
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr "Поделиться"
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr "Получено %(created)s."
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr "Каким будет ваше следующее достижение?"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr "Начните продвигаться к своей следующей цели."
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr "Найти курс"
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr "Произошла ошибка.  Попробуйте перезагрузить страницу."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr "Сейчас сокурсникам разрешён ограниченный доступ к вашему профилю."
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr "Доступ к профилю этого пользователя ограничен."
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr "Поделиться в Mozilla Backpack"
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-"Для того, чтобы поделиться своим достижением в Mozilla Backpack, вам "
-"необходима учётная запись Backpack. Следуйте указаниям ниже, чтобы добавить "
-"свой сертификат на Backpack."
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr ""
-"Создайте учётную запись %(link_start)sMozilla Backpack%(link_end)s или "
-"войдите со своими учётными данными"
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-"%(download_link_start)sСкачайте изображение (кликните правой кнопкой мыши "
-"или используйте клавишу выбора опции, выберите сохранить как)%(link_end)s, "
-"затем %(upload_link_start)sзагрузите%(link_end)s изображение в свой "
-"Backpack.</li>"
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8629,6 +8522,79 @@ msgstr "Ничего не найдено."
 msgid "Back to Dashboard"
 msgstr "Вернуться к панели управления"
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr "Рассказать о значке «%(display_name)s»"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr "Поделиться"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr "Получено %(created)s."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr "Каким будет ваше следующее достижение?"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr "Начните продвигаться к своей следующей цели."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr "Найти курс"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr "Произошла ошибка.  Попробуйте перезагрузить страницу."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr "Сейчас сокурсникам разрешён ограниченный доступ к вашему профилю."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr "Доступ к профилю этого пользователя ограничен."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr "Поделиться в Mozilla Backpack"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+"Для того, чтобы поделиться своим достижением в Mozilla Backpack, вам "
+"необходима учётная запись Backpack. Следуйте указаниям ниже, чтобы добавить "
+"свой сертификат на Backpack."
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr ""
+"Создайте учётную запись %(link_start)sMozilla Backpack%(link_end)s или "
+"войдите со своими учётными данными"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+"%(download_link_start)sСкачайте изображение (кликните правой кнопкой мыши "
+"или используйте клавишу выбора опции, выберите сохранить как)%(link_end)s, "
+"затем %(upload_link_start)sзагрузите%(link_end)s изображение в свой "
+"Backpack.</li>"
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr "Ограниченный доступ"
@@ -8882,6 +8848,20 @@ msgstr "Утвердить"
 msgid "Deactivate"
 msgstr "Отозвать"
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -9056,6 +9036,10 @@ msgid "Unpublished changes to content that will release in the future"
 msgstr ""
 "В материалы, запланированные к выпуску, внесены неопубликованные изменения"
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -9600,12 +9584,6 @@ msgstr "с %(section_or_subsection)s"
 msgid "Staff and Learners"
 msgstr "Сотрудникам и слушателям"
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9900,6 +9878,32 @@ msgstr ""
 "командой проверяющих при просмотре видеозаписей. Например, вы можете "
 "указать, что калькуляторы разрешены."
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr "Файл успешно загружен"
@@ -9939,9 +9943,9 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
-msgstr "Редактировать название"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
+msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
 #, python-format
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.mo b/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 69a7c7c6d0..e48f8dece1 100644
Binary files a/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.po b/conf/locale/zh_CN/LC_MESSAGES/django.po
index 6a3ea7fabd..c4532500b2 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -351,7 +351,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:21+0000\n"
+"POT-Creation-Date: 2017-08-01 18:56+0000\n"
 "PO-Revision-Date: 2017-03-16 12:39+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
@@ -565,6 +565,28 @@ msgstr "专业的教育模式不允许有过期的日期时间设置。"
 msgid "Verified modes cannot be free."
 msgstr "已验证的模式要收取费用。"
 
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This will look like '$50', where {currency_symbol} is a symbol
+#. such as '$' and {price} is a
+#. numerical amount in that currency. Adjust this display as needed for your
+#. language.
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
+#. Translators: currency_symbol is a symbol indicating type of currency, ex
+#. "$".
+#. This string would look like this when all variables are in:
+#. "$500.00"
+#: common/djangoapps/course_modes/models.py
+#: lms/templates/shoppingcart/shopping_cart.html
+#, python-brace-format
+msgid "{currency_symbol}{price}"
+msgstr "{currency_symbol}{price}"
+
+#. Translators: This refers to the cost of the course. In this case, the
+#. course costs nothing so it is free.
+#: common/djangoapps/course_modes/models.py
+msgid "Free"
+msgstr "免费"
+
 #: common/djangoapps/course_modes/models.py
 msgid ""
 "The time period before a course ends in which a course mode will expire"
@@ -607,6 +629,10 @@ msgstr "管理员"
 msgid "Moderator"
 msgstr "版主"
 
+#: common/djangoapps/django_comment_common/models.py
+msgid "Group Moderator"
+msgstr ""
+
 #: common/djangoapps/django_comment_common/models.py
 msgid "Community TA"
 msgstr "社区助教"
@@ -2002,9 +2028,8 @@ msgid "Could not interpret '{student_answer}' as a number."
 msgstr "无法将“{student_answer}”解释为一个数字。"
 
 #: common/lib/capa/capa/responsetypes.py
-msgid ""
-"Answers can include numerals, operation signs, and a few specific "
-"characters, such as the constants e and i."
+#, python-brace-format
+msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
 
 #: common/lib/capa/capa/responsetypes.py
@@ -2123,6 +2148,11 @@ msgstr "外部评分者"
 msgid "Math Expression Input"
 msgstr "数学表达式输入"
 
+#: common/lib/capa/capa/responsetypes.py
+#, python-brace-format
+msgid "Invalid input: {bad_input} not permitted in answer."
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 #, python-brace-format
 msgid ""
@@ -2347,6 +2377,10 @@ msgstr "维护状态的输入类型词典"
 msgid "Dictionary with the current student responses"
 msgstr "当前学生的回应词典"
 
+#: common/lib/xmodule/xmodule/capa_base.py
+msgid "Dictionary with the current student score"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether or not the answers have been saved since last submit"
 msgstr ""
@@ -2418,6 +2452,8 @@ msgstr ""
 #: lms/templates/manage_user_standing.html lms/templates/register-shib.html
 #: lms/templates/peer_grading/peer_grading_problem.html
 #: lms/templates/survey/survey.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Submit"
 msgstr "提交"
@@ -2980,6 +3016,7 @@ msgstr "输入您想要学生可以在课程首页看到此课程讲义的标题
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Handouts"
 msgstr "课程讲义"
 
@@ -5584,6 +5621,15 @@ msgid ""
 "specific student."
 msgstr "特定学生查看课程时，该类型组件无法显示。"
 
+#: lms/djangoapps/courseware/models.py
+msgid ""
+"Number of days a learner has to upgrade after content is made available"
+msgstr ""
+
+#: lms/djangoapps/courseware/models.py
+msgid "Disable the dynamic upgrade deadline for this course run."
+msgstr ""
+
 #: lms/djangoapps/courseware/tabs.py lms/templates/courseware/syllabus.html
 msgid "Syllabus"
 msgstr "教学大纲"
@@ -5601,27 +5647,28 @@ msgstr "进度"
 msgid "Textbooks"
 msgstr "教材"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This will look like '$50', where {currency_symbol} is a symbol
-#. such as '$' and {price} is a
-#. numerical amount in that currency. Adjust this display as needed for your
-#. language.
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: currency_symbol is a symbol indicating type of currency, ex
-#. "$".
-#. This string would look like this when all variables are in:
-#. "$500.00"
 #: lms/djangoapps/courseware/views/views.py
-#: lms/templates/shoppingcart/shopping_cart.html
 #, python-brace-format
-msgid "{currency_symbol}{price}"
-msgstr "{currency_symbol}{price}"
+msgid "To see course content, {sign_in_link} or {register_link}."
+msgstr ""
 
-#. Translators: This refers to the cost of the course. In this case, the
-#. course costs nothing so it is free.
 #: lms/djangoapps/courseware/views/views.py
-msgid "Free"
-msgstr "免费"
+msgid "sign in"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "register"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You must be enrolled in the course to see course content. {enroll_link}."
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+msgid "Enroll now"
+msgstr ""
 
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your enrollment: Audit track"
@@ -6985,6 +7032,14 @@ msgstr "到期扩展{0} {1} ({2})"
 msgid "This component cannot be rescored."
 msgstr ""
 
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "This component does not support score override."
+msgstr ""
+
+#: lms/djangoapps/instructor_task/api_helper.py
+msgid "Scores must be between 0 and the value of the problem."
+msgstr ""
+
 #: lms/djangoapps/instructor_task/api_helper.py
 msgid "Not all problems in entrance exam support re-scoring."
 msgstr "入学考试中不是所有的问题都支持重新打分。"
@@ -6995,6 +7050,12 @@ msgstr "入学考试中不是所有的问题都支持重新打分。"
 msgid "rescored"
 msgstr "重新评分"
 
+#. Translators: This is a past-tense verb that is inserted into task progress
+#. messages as {action}.
+#: lms/djangoapps/instructor_task/tasks.py
+msgid "overridden"
+msgstr ""
+
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
@@ -7286,10 +7347,25 @@ msgid ""
 "configurations."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This unit's access settings refer to deleted or invalid group "
+"configurations."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "This component's access settings refer to deleted or invalid groups."
 msgstr ""
 
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid "This unit's access settings refer to deleted or invalid groups."
+msgstr ""
+
+#: lms/djangoapps/lms_xblock/mixin.py
+msgid ""
+"This component's access settings contradict its parent's access settings."
+msgstr ""
+
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Whether to display this module in the table of contents"
 msgstr "是否在表格内容中展示该模块"
@@ -8767,6 +8843,11 @@ msgid ""
 "opportunities from the world's best universities."
 msgstr ""
 
+#: lms/templates/emails/password_reset_subject.txt
+#, python-format
+msgid "Password reset on %(platform_name)s"
+msgstr ""
+
 #: lms/templates/logout.html
 msgid "Signed Out"
 msgstr ""
@@ -8804,11 +8885,11 @@ msgid ""
 "'Cancel' button."
 msgstr ""
 
+#: lms/templates/oauth2_provider/authorize.html
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/modal/accessible_confirm.html
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 #: lms/templates/oauth2_provider/authorize.html
 msgid "Allow"
@@ -8823,8 +8904,8 @@ msgstr "错误"
 #, python-format
 msgid ""
 "You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s."
-msgstr "您收到本邮件是由于您曾经要求重置您在 %(site_name)s 账号的密码。"
+" user account at %(platform_name)s."
+msgstr ""
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
@@ -8938,7 +9019,6 @@ msgstr "预览"
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
 #: lms/templates/modal/_modal-settings-language.html
-#: lms/templates/modal/accessible_confirm.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Close"
 msgstr "关闭"
@@ -9193,6 +9273,8 @@ msgstr "您可以从其他文章中重用一些文件。但是该文件的更新
 #: lms/templates/courseware/courses.html
 #: lms/templates/courseware/courseware.html
 #: lms/templates/edxnotes/edxnotes.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
 #: themes/edx.org/lms/templates/dashboard.html
 #: themes/stanford-style/lms/templates/index.html
 msgid "Search"
@@ -9580,6 +9662,22 @@ msgstr ""
 msgid "Language reset to user's preference: {preview_language_code}"
 msgstr ""
 
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a success message"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test warning"
+msgstr ""
+
+#: openedx/core/djangoapps/debug/views.py
+msgid "This is a test error"
+msgstr ""
+
 #: openedx/core/djangoapps/embargo/forms.py
 #: openedx/core/djangoapps/verified_track_content/forms.py
 msgid "COURSE NOT FOUND.  Please check that the course ID is valid."
@@ -9699,6 +9797,25 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr "启用改进版课程主页"
 
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Site theme changed to {site_theme}"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#, python-brace-format
+msgid "Theme {site_theme} does not exist"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+msgid "Site theme reverted to the default"
+msgstr ""
+
+#: openedx/core/djangoapps/theming/views.py
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Theming Administration"
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 #, python-brace-format
 msgid "The '{field_name}' field cannot be edited."
@@ -9933,6 +10050,11 @@ msgstr ""
 msgid "Review the Terms of Service"
 msgstr ""
 
+#: openedx/core/djangoapps/util/user_messages.py
+#, python-brace-format
+msgid "{header_open}{title}{header_close}{body}"
+msgstr ""
+
 #: openedx/core/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
 msgstr "我们想要自动分配队列的课程要领。"
@@ -10654,7 +10776,7 @@ msgstr "内容"
 #: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
-#: lms/templates/student_profile/learner_profile.html
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
 msgid "Loading"
 msgstr "正在加载"
 
@@ -10671,6 +10793,16 @@ msgstr "设置"
 msgid "Course Number"
 msgstr "课程代码"
 
+#: cms/templates/course_outline.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Course Outline"
+msgstr ""
+
+#: cms/templates/course_outline.html cms/templates/index.html
+#: openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+msgid "Dismiss"
+msgstr ""
+
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Start Date:"
@@ -10698,7 +10830,6 @@ msgstr "课程代码："
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Courses"
 msgstr "课程"
 
@@ -10789,11 +10920,14 @@ msgstr "阅览"
 
 #: cms/templates/darklang/preview_lang.html
 #: lms/templates/darklang/preview_lang.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
 msgid "Preview Language Setting"
 msgstr ""
 
 #: cms/templates/maintenance/_force_publish_course.html
 #: lms/templates/problem.html lms/templates/shoppingcart/shopping_cart.html
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
 msgid "Reset"
 msgstr "重置"
 
@@ -10803,6 +10937,11 @@ msgstr "重置"
 msgid "Legal"
 msgstr "合法"
 
+#: cms/templates/widgets/header.html
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "Updates"
+msgstr ""
+
 #: cms/templates/widgets/header.html lms/templates/navigation/navigation.html
 #: lms/templates/widgets/footer-language-selector.html
 msgid "Choose Language"
@@ -10886,7 +11025,6 @@ msgid "Usermenu dropdown"
 msgstr "用户菜单下拉列表"
 
 #: cms/templates/widgets/user_dropdown.html lms/templates/user_dropdown.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign Out"
 msgstr "退出"
 
@@ -11082,12 +11220,10 @@ msgid "Go back to the {link_start}home page{link_end}."
 msgstr "返回{link_start}主页{link_end}"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "E-mail change successful!"
 msgstr "邮箱更改成功！"
 
 #: lms/templates/email_change_successful.html
-#: lms/templates/emails_change_successful.html
 msgid "You should see your new email in your {link_start}dashboard{link_end}."
 msgstr "您可以在{link_start}课程面板{link_end}看到您的新邮箱地址"
 
@@ -12027,14 +12163,18 @@ msgid "Add comment"
 msgstr "添加评论"
 
 #: lms/templates/staff_problem_info.html
-msgid "Staff Debug"
-msgstr "工作人员调试"
+msgid "Staff Debug:"
+msgstr ""
 
 #: lms/templates/staff_problem_info.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Actions"
 msgstr "动作"
 
+#: lms/templates/staff_problem_info.html
+msgid "Score (for override only)"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Reset Learner's Attempts to Zero"
 msgstr ""
@@ -12054,6 +12194,10 @@ msgstr ""
 msgid "Rescore Only If Score Improves"
 msgstr ""
 
+#: lms/templates/staff_problem_info.html
+msgid "Override Score"
+msgstr ""
+
 #: lms/templates/staff_problem_info.html
 msgid "Module Fields"
 msgstr "模块域"
@@ -12267,7 +12411,7 @@ msgid ""
 msgstr ""
 "您不将再接收到{platform_name}论坛邮件提醒，请单击{dashboard_link_start}此处{link_end}返回您的课程面板。如果您不是有意取消，请单击{undo_link_start}此处{link_end}重新订阅消息。"
 
-#: lms/templates/user_dropdown.html themes/red-theme/lms/templates/header.html
+#: lms/templates/user_dropdown.html
 msgid "Dashboard for:"
 msgstr "课程面板："
 
@@ -13246,12 +13390,14 @@ msgid "Auto Enroll"
 msgstr "自动选修"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users who have not yet "
 "registered for {platform_name} will be automatically enrolled."
 msgstr "如果此选项{em_start}已选{em_end}，尚未注册 {platform_name} 的用户将自动入选此课。"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is left {em_start}unchecked{em_end}, users who have not yet "
 "registered for {platform_name} will not be enrolled, but will be allowed to "
@@ -13270,6 +13416,7 @@ msgid "Notify users by email"
 msgstr "通过邮件通知用户"
 
 #: lms/templates/ccx/enrollment.html
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
 "If this option is {em_start}checked{em_end}, users will receive an email "
 "notification."
@@ -13642,6 +13789,7 @@ msgstr "{span_start}当前部分{span_end}"
 
 #: lms/templates/courseware/accordion.html
 #: lms/templates/courseware/progress.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "due {date}"
 msgstr "截止日期{date}"
 
@@ -13650,6 +13798,7 @@ msgid "{section_format} due {{date}}"
 msgstr ""
 
 #: lms/templates/courseware/accordion.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "This content is graded"
 msgstr "该内容计入总分。"
 
@@ -13792,6 +13941,7 @@ msgstr "使您的搜索更精确"
 
 #: lms/templates/courseware/courseware-chromeless.html
 #: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "{course_number} Courseware"
 msgstr "{course_number} 课程页面"
 
@@ -13804,7 +13954,8 @@ msgstr "课程工具"
 msgid "Courseware"
 msgstr "课程页面"
 
-#: lms/templates/courseware/courseware.html lms/templates/courseware/info.html
+#: lms/templates/courseware/courseware.html
+#: openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
 msgid "Bookmarks"
 msgstr "书签"
 
@@ -13866,6 +14017,8 @@ msgid "Welcome to {org}'s {course_name}!"
 msgstr "欢迎来到 {org} 的 {course_name}！"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
 msgid "Resume Course"
 msgstr "继续课程"
 
@@ -13882,13 +14035,10 @@ msgid "Handout Navigation"
 msgstr "讲义导航"
 
 #: lms/templates/courseware/info.html
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
 msgid "Course Tools"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "Reviews"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "新闻 - MITx 6.002x"
@@ -16480,25 +16630,6 @@ msgstr "因此，请提供足够的信息来解释这个操作。"
 msgid "Reason"
 msgstr "原因"
 
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users who have not yet registered for "
-"{platform_name} will be automatically enrolled."
-msgstr "如果 <em>勾选了</em>该选项，即使未在{platform_name}平台注册的用户也会自动选修本课程。"
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is left <em>unchecked</em>, users who have not yet registered"
-" for {platform_name} will not be enrolled, but will be allowed to enroll "
-"once they make an account."
-msgstr "如果<em>没有勾选</em>该选项，未在{platform_name}平台注册的用户不能选课。当然，一旦用户注册后，就随时可以选课。"
-
-#: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid ""
-"If this option is <em>checked</em>, users will receive an email "
-"notification."
-msgstr "如果 <em>勾选</em>该选项，用户将受到一封通知邮件。"
-
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
 msgstr "注册／录取学生"
@@ -16533,9 +16664,9 @@ msgstr "注：用户必须首先拥有已激活的{platform_name}账户方可成
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"If this option is <em>checked</em>, users who have not enrolled in your "
-"course will be automatically enrolled."
-msgstr "如果<em>勾选了</em>该选项，还未选修您课程的用户将会被自动加入该课程。"
+"If this option is {em_start}checked{em_end}, users who have not enrolled in "
+"your course will be automatically enrolled."
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Checking this box has no effect if 'Remove beta testers' is selected."
@@ -16655,16 +16786,30 @@ msgid "Add Moderator"
 msgstr "添加版主"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
-msgid "Discussion Community TAs"
-msgstr "论坛社区助教"
+msgid "Group Community TA"
+msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
-"Community TAs are members of the community whom you deem particularly "
-"helpful on the discussion boards. They can edit or delete any post, clear "
-"misuse flags, close and re-open threads, endorse responses, and see posts "
-"from all groups. Their posts are marked as 'Community TA'. Only enrolled "
-"users can be added as Community TAs."
+"Group Community TAs are members of the community who help course teams "
+"moderate discussions. Group Community TAs see only posts by learners in "
+"their assigned group. They can edit or delete posts, clear flags, close and "
+"re-open threads, and endorse responses, but only for posts by learners in "
+"their group. Their posts are marked as 'Community TA'. Only enrolled "
+"learners can be added as Group Community TAs."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid "Add Group Community TA"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/membership.html
+msgid ""
+"Community TAs are members of the community who help course teams moderate "
+"discussions. They can see posts by all learners, and can edit or delete "
+"posts, clear flags, close or re-open threads, and endorse responses. Their "
+"posts are marked as 'Community TA'. Only enrolled learners can be added as "
+"Community TAs."
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -16891,7 +17036,7 @@ msgid "View a specific learner's grades and progress"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Learner's {platform_name} email address or username *"
+msgid "Learner's {platform_name} email address or username"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -16907,7 +17052,7 @@ msgid "Adjust a learner's grade for a specific problem"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
-msgid "Location of problem in course *"
+msgid "Location of problem in course"
 msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -16942,6 +17087,23 @@ msgid ""
 "improves in the learner's favor."
 msgstr ""
 
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Score Override"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "For the specified problem, override the learner's score."
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid ""
+"New score for problem, out of the total points available for the problem"
+msgstr ""
+
+#: lms/templates/instructor/instructor_dashboard_2/student_admin.html
+msgid "Override Learner's Score"
+msgstr ""
+
 #: lms/templates/instructor/instructor_dashboard_2/student_admin.html
 msgid "Problem History"
 msgstr ""
@@ -17056,7 +17218,6 @@ msgstr "项目详情"
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Programs"
 msgstr "程式"
 
@@ -17078,28 +17239,9 @@ msgid ""
 "translator!{link_end}"
 msgstr "没找到您的常用语言？{link_start}欢迎成为一个翻译志愿者！{link_end}"
 
-#: lms/templates/modal/accessible_confirm.html
-msgid "Confirm"
-msgstr "确认"
-
-#. Translators: this text gives status on if the modal interface (a menu or
-#. piece of UI that takes the full focus of the screen) is open or not
-#: lms/templates/modal/accessible_confirm.html
-msgid "modal open"
-msgstr "模式开启"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "OK"
-msgstr "是的"
-
-#: lms/templates/modal/accessible_confirm.html
-msgid "open"
-msgstr "打开"
-
 #. Translators: This is short for "System administration".
 #: lms/templates/navigation/navbar-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sysadmin"
 msgstr "系统管理员"
 
@@ -17107,27 +17249,23 @@ msgstr "系统管理员"
 #: lms/templates/navigation/bootstrap/navbar-authenticated.html
 #: lms/templates/shoppingcart/shopping_cart.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Shopping Cart"
 msgstr "购物车"
 
 #: lms/templates/navigation/navbar-logo-header.html
 #: lms/templates/navigation/bootstrap/navbar-logo-header.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "{platform_name} Home Page"
 msgstr "{platform_name} 主页"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "How it Works"
 msgstr "运行机制"
 
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Schools"
 msgstr "学校"
 
@@ -17138,12 +17276,10 @@ msgstr "探索课程"
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: lms/templates/navigation/bootstrap/navbar-not-authenticated.html
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Sign in"
 msgstr "登录"
 
 #: lms/templates/navigation/navigation.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Global"
 msgstr "全球"
 
@@ -17903,7 +18039,6 @@ msgid "Currently the {platform_name} servers are overloaded"
 msgstr " 目前{platform_name}平台的服务器已经超负荷"
 
 #: lms/templates/student_account/account_settings.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Account Settings"
 msgstr "账户设置"
 
@@ -17915,40 +18050,6 @@ msgstr "请稍候"
 msgid "Sign in or Register"
 msgstr "登录或注册"
 
-#: lms/templates/student_profile/learner_profile.html
-msgid "Learner Profile"
-msgstr "学生用户资料"
-
-#. Translators: this section lists all the third-party authentication
-#. providers
-#. (for example, Google and LinkedIn) the user can link with or unlink from
-#. their edX account.
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Connected Accounts"
-msgstr "已关联的帐号"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Linked"
-msgstr "已关联"
-
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Not Linked"
-msgstr "未关联"
-
-#. Translators: clicking on this removes the link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Unlink"
-msgstr "取消关联"
-
-#. Translators: clicking on this creates a link between a user's edX account
-#. and their account with an external authentication provider (like Google or
-#. LinkedIn).
-#: lms/templates/student_profile/third_party_auth.html
-msgid "Link"
-msgstr "关联"
-
 #: lms/templates/support/certificates.html lms/templates/support/index.html
 msgid "Student Support"
 msgstr "学生支持"
@@ -18136,7 +18237,8 @@ msgstr "返回您的课程面板"
 #: lms/templates/widgets/cookie-consent.html
 msgid ""
 "This website uses cookies to ensure you get the best experience on our "
-"website."
+"website. If you continue browsing this site, we understand that you accept "
+"the use of cookies."
 msgstr ""
 
 #: lms/templates/widgets/cookie-consent.html
@@ -18167,6 +18269,134 @@ msgstr ""
 msgid "Add article"
 msgstr "添加文章"
 
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Language Code"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "For example use en for English"
+msgstr ""
+
+#: openedx/core/djangoapps/dark_lang/templates/dark_lang/preview_lang_include.html
+msgid "Please refresh the page to see the changes applied."
+msgstr ""
+
+#: openedx/core/djangoapps/theming/templates/theming/theming-admin-fragment.html
+msgid "Preview Theme"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "All Rights Reserved"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Attribution"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Noncommercial"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "No Derivatives"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Share Alike"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Creative Commons licensed content, with terms as follow:"
+msgstr ""
+
+#: openedx/core/lib/license/templates/license.html
+msgid "Some Rights Reserved"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Important Course Dates"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+msgid "Today is {date}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search the course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+msgid "Start Course"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "{subsection_format} due {{date}}"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This is your last visited course section."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "This course has not started yet."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid "We're still working on course content."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+msgid ""
+"This course has not started yet, and will launch on {launch_date_html}."
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-reviews-fragment.html
+msgid "Reviews"
+msgstr ""
+
+#: openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+msgid "This course does not have any updates."
+msgstr ""
+
+#: openedx/features/course_search/templates/course_search/course-search-fragment.html
+msgid "Search Results"
+msgstr ""
+
+#. Translators: this section lists all the third-party authentication
+#. providers
+#. (for example, Google and LinkedIn) the user can link with or unlink from
+#. their edX account.
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Connected Accounts"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Linked"
+msgstr ""
+
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Not Linked"
+msgstr ""
+
+#. Translators: clicking on this removes the link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Unlink"
+msgstr ""
+
+#. Translators: clicking on this creates a link between a user's edX account
+#. and their account with an external authentication provider (like Google or
+#. LinkedIn).
+#: openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+msgid "Link"
+msgstr ""
+
+#: openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+msgid "Learner Profile"
+msgstr ""
+
 #: themes/edx.org/cms/templates/widgets/sock.html
 msgid ""
 "Access Course Staff Support on the Partner Portal to submit or review "
@@ -18211,7 +18441,6 @@ msgid "Main"
 msgstr ""
 
 #: themes/edx.org/lms/templates/header.html
-#: themes/red-theme/lms/templates/header.html
 msgid "Find Courses"
 msgstr "查找课程"
 
@@ -18241,18 +18470,6 @@ msgid ""
 msgstr ""
 "{tos_link_start}服务条款{tos_link_end}以及{honor_link_start}诚信准则{honor_link_end}"
 
-#: themes/red-theme/lms/templates/header.html
-msgid "More options dropdown"
-msgstr "更多选择下拉列表"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "My Profile"
-msgstr "我的用户资料"
-
-#: themes/red-theme/lms/templates/header.html
-msgid "Register Now"
-msgstr "现在注册"
-
 #: themes/stanford-style/lms/templates/footer.html
 #: themes/stanford-style/lms/templates/static_templates/tos.html
 msgid "Copyright"
@@ -18419,19 +18636,14 @@ msgstr ""
 msgid "Files & Uploads"
 msgstr ""
 
-#: cms/templates/asset_index.html cms/templates/container.html
-#: cms/templates/course-create-rerun.html cms/templates/course_info.html
-#: cms/templates/course_outline.html cms/templates/edit-tabs.html
-#: cms/templates/index.html cms/templates/library.html
-#: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: cms/templates/textbooks.html cms/templates/videos_index.html
-msgid "Page Actions"
-msgstr "页面操作"
-
 #: cms/templates/asset_index.html cms/templates/videos_index.html
 msgid "Upload New File"
 msgstr "上传新文件"
 
+#: cms/templates/asset_index.html
+msgid "Help adding Files and Uploads"
+msgstr ""
+
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
 msgstr "为您的课程添加文件"
@@ -18623,6 +18835,15 @@ msgstr "删除此组件"
 msgid "Drag to reorder"
 msgstr "拖动以重排序"
 
+#: cms/templates/container.html cms/templates/course-create-rerun.html
+#: cms/templates/course_info.html cms/templates/course_outline.html
+#: cms/templates/edit-tabs.html cms/templates/index.html
+#: cms/templates/library.html cms/templates/manage_users.html
+#: cms/templates/manage_users_lib.html cms/templates/textbooks.html
+#: cms/templates/videos_index.html
+msgid "Page Actions"
+msgstr "页面操作"
+
 #: cms/templates/container.html
 msgid "Open the courseware in the LMS"
 msgstr ""
@@ -18855,10 +19076,6 @@ msgid ""
 "respond to student questions. You add or edit updates in HTML."
 msgstr "使用课程更新来通知学生重要的日期或者考试，高亮显示论坛中的特别讨论，发布进度变更，以及回复学生问题。您可以用HTML来编辑更新。"
 
-#: cms/templates/course_outline.html
-msgid "Course Outline"
-msgstr "课程大纲"
-
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
@@ -18872,10 +19089,6 @@ msgid ""
 "and seed the discussions and wiki."
 msgstr ""
 
-#: cms/templates/course_outline.html cms/templates/index.html
-msgid "Dismiss"
-msgstr ""
-
 #: cms/templates/course_outline.html
 msgid "Warning"
 msgstr ""
@@ -20080,10 +20293,6 @@ msgstr ""
 msgid "For example, MITx"
 msgstr ""
 
-#: cms/templates/index.html
-msgid "Show content libraries"
-msgstr ""
-
 #: cms/templates/index.html
 msgid "Courses Being Processed"
 msgstr "正在处理的课程"
@@ -20693,6 +20902,14 @@ msgstr "课程活跃的最后一天"
 msgid "Course End Time"
 msgstr "课程结束时间"
 
+#: cms/templates/settings.html
+msgid "Certificates Available Date"
+msgstr ""
+
+#: cms/templates/settings.html
+msgid "By default, 48 hours after course end date"
+msgstr ""
+
 #: cms/templates/settings.html
 msgid "Enrollment Start Date"
 msgstr "选课开始日期"
@@ -21289,18 +21506,35 @@ msgstr ""
 msgid "Access is not restricted"
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"Access to this unit is not restricted, but visibility might be affected by "
+"inherited settings."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "Access to this component is not restricted, but visibility might be affected"
 " by inherited settings."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific enrollment "
+"tracks or content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific enrollment"
 " tracks or content groups."
 msgstr ""
 
+#: cms/templates/visibility_editor.html
+msgid ""
+"You can restrict access to this unit to learners in specific content groups."
+msgstr ""
+
 #: cms/templates/visibility_editor.html
 msgid ""
 "You can restrict access to this component to learners in specific content "
@@ -21342,8 +21576,8 @@ msgstr ""
 
 #: cms/templates/visibility_editor.html
 msgid ""
-"This group no longer exists. Choose another group or do not restrict access "
-"to this component."
+"This group no longer exists.  Choose another group or remove the access "
+"restriction."
 msgstr ""
 
 #: cms/templates/emails/activation_email.txt
@@ -21495,10 +21729,6 @@ msgstr ""
 msgid "Outline"
 msgstr "大纲"
 
-#: cms/templates/widgets/header.html
-msgid "Updates"
-msgstr "更新"
-
 #: cms/templates/widgets/header.html
 msgid "Import"
 msgstr "导入"
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
index 1def3bdb6d..ebe83b20af 100644
Binary files a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
index 008d55ccb5..f5560986ab 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -187,8 +187,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2017-07-06 15:20+0000\n"
-"PO-Revision-Date: 2017-07-06 15:25+0000\n"
+"POT-Creation-Date: 2017-08-01 18:55+0000\n"
+"PO-Revision-Date: 2017-07-20 11:59+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -298,7 +298,7 @@ msgstr "上传中"
 #: common/static/common/templates/discussion/alert-popup.underscore
 #: common/static/common/templates/discussion/forum-action-close.underscore
 #: common/static/common/templates/discussion/search-alert.underscore
-#: lms/templates/student_profile/share_modal.underscore
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "关闭"
 
@@ -2643,7 +2643,6 @@ msgid ""
 msgstr "团队成员主要使用的交流语言。"
 
 #: lms/djangoapps/teams/static/teams/js/views/edit_team.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Country"
 msgstr "国家／地区"
 
@@ -3642,7 +3641,6 @@ msgstr "标记选课码为尚未使用的"
 
 #: lms/static/js/instructor_dashboard/membership.js
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 #: lms/templates/financial-assistance/financial_assessment_form.underscore
 msgid "Username"
 msgstr "用户名"
@@ -3655,6 +3653,10 @@ msgstr "电子邮件"
 msgid "Revoke access"
 msgstr "取消授权"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "Group"
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Enter username or email"
 msgstr "输入用户名或者电子邮件地址"
@@ -3663,6 +3665,10 @@ msgstr "输入用户名或者电子邮件地址"
 msgid "Please enter a username or email."
 msgstr "请输入一个用户名或者电子邮件。"
 
+#: lms/static/js/instructor_dashboard/membership.js
+msgid "This role requires a divided discussions scheme."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
 msgstr "更改用户权限出错。"
@@ -4011,6 +4017,24 @@ msgid ""
 "are complete and correct."
 msgstr ""
 
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid "Please enter a score."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Started task to override the score for problem '<%- problem_id %>' and "
+"student '<%- student_id %>'. Click the 'Show Task Status' button to see the "
+"status of the task."
+msgstr ""
+
+#: lms/static/js/instructor_dashboard/student_admin.js
+msgid ""
+"Error starting a task to override score for problem '<%- problem_id %>' for "
+"student '<%- student_id %>'. Make sure that the the score and the problem "
+"and student identifiers are complete and correct."
+msgstr ""
+
 #: lms/static/js/instructor_dashboard/student_admin.js
 msgid ""
 "Started entrance exam rescore task for student '{student_id}'. Click the "
@@ -4206,6 +4230,14 @@ msgstr ""
 msgid "Failed to rescore problem to improve score for user."
 msgstr ""
 
+#: lms/static/js/staff_debug_actions.js
+msgid "Successfully overrode problem score for {user}"
+msgstr ""
+
+#: lms/static/js/staff_debug_actions.js
+msgid "Could not override problem score for {user}."
+msgstr ""
+
 #: lms/static/js/student_account/account.js
 msgid "The data could not be saved."
 msgstr "该数据无法保存。"
@@ -4423,7 +4455,6 @@ msgid "Year of Birth"
 msgstr "出生年份"
 
 #: lms/static/js/student_account/views/account_settings_factory.js
-#: lms/static/js/student_profile/views/learner_profile_factory.js
 msgid "Preferred Language"
 msgstr "首选语言"
 
@@ -4530,77 +4561,6 @@ msgstr "帐户信息"
 msgid "Order History"
 msgstr "订单记录"
 
-#: lms/static/js/student_profile/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "成绩分页"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "{platform_name} learners can see my:"
-msgstr "对{platform_name}用户可见："
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Limited Profile"
-msgstr "部分资料"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Full Profile"
-msgstr "全部资料"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add Country"
-msgstr "添加国家"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "Add language"
-msgstr "添加语言"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid "About me"
-msgstr "个人简介"
-
-#: lms/static/js/student_profile/views/learner_profile_factory.js
-msgid ""
-"Tell other learners a little about yourself: where you live, what your "
-"interests are, why you're taking courses, or what you hope to learn."
-msgstr "向其他用户简单介绍下你自己：如居住地、兴趣爱好、为什么选择这些课程，及你希望学习哪方面的知识"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Account Settings page."
-msgstr "账户设置页面。"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must specify your birth year before you can share your full profile. To "
-"specify your birth year, go to the {account_settings_page_link}"
-msgstr "您必须填写出生年份才能分享完整资料。点击 {account_settings_page_link} 填写"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid ""
-"You must be over 13 to share a full profile. If you are over 13, make sure "
-"that you have specified a birth year on the {account_settings_page_link}"
-msgstr ""
-"13岁以上的用户才能分享完整资料。如果您在13岁以上，请确认已在 {account_settings_page_link} 页面中填写了出生年份。"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile Image"
-msgstr "资料照片"
-
-#: lms/static/js/student_profile/views/learner_profile_fields.js
-msgid "Profile image for {username}"
-msgstr "{username} 的头像"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "About Me"
-msgstr "个人资料"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "成绩"
-
-#: lms/static/js/student_profile/views/learner_profile_view.js
-msgid "Profile"
-msgstr "用户资料"
-
 #: lms/static/js/verify_student/views/image_input_view.js
 msgid "Image Upload Error"
 msgstr "图片上传错误"
@@ -5041,6 +5001,11 @@ msgstr ""
 msgid "The course start date must be later than the enrollment start date."
 msgstr ""
 
+#: cms/static/js/models/settings/course_details.js
+msgid ""
+"The certificate available date must be later than the enrollment start date."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The enrollment start date cannot be after the enrollment end date."
 msgstr "选课开始日期应该早于选课截止日期。"
@@ -5110,6 +5075,10 @@ msgstr "只有 <%= fileTypes %> 格式的文件可以上传。请选择一个以
 msgid "or"
 msgstr "或者"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This unit has validation issues."
+msgstr ""
+
 #: cms/static/js/models/xblock_validation.js
 msgid "This component has validation issues."
 msgstr "该组件存在验证问题。"
@@ -5287,10 +5256,12 @@ msgstr "未使用"
 
 #. Translators: 'count' is number of units that the group
 #. configuration is used in.
+#. Translators: 'count' is number of locations that the group
+#. configuration is used in.
 #: cms/static/js/views/group_configuration_details.js
 #: cms/static/js/views/partition_group_details.js
-msgid "Used in {count} unit"
-msgid_plural "Used in {count} units"
+msgid "Used in {count} location"
+msgid_plural "Used in {count} locations"
 msgstr[0] ""
 
 #. Translators: this refers to a collection of groups.
@@ -5438,10 +5409,6 @@ msgstr "您确定要限制{email}对“{container}”的访问？"
 msgid "{display_name} Settings"
 msgstr ""
 
-#: cms/static/js/views/modals/course_outline_modals.js
-msgid "Change the settings for {display_name}"
-msgstr ""
-
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Publish {display_name}"
 msgstr ""
@@ -5454,6 +5421,10 @@ msgstr ""
 msgid "Publish"
 msgstr "发布"
 
+#: cms/static/js/views/modals/course_outline_modals.js
+msgid "All Learners and Staff"
+msgstr ""
+
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
 msgstr ""
@@ -5467,6 +5438,10 @@ msgstr ""
 msgid "Editing: %(title)s"
 msgstr "编辑：%(title)s"
 
+#: lms/templates/ccx/schedule.underscore
+msgid "Unit"
+msgstr "单元"
+
 #: cms/static/js/views/modals/edit_xblock.js
 msgid "Component"
 msgstr "组件"
@@ -5530,7 +5505,8 @@ msgstr ""
 msgid "Date added"
 msgstr "添加日期"
 
-#. Translators: "title" is the name of the current component being edited.
+#. Translators: "title" is the name of the current component or unit being
+#. edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing access for: %(title)s"
 msgstr ""
@@ -6677,10 +6653,6 @@ msgstr "展开全部"
 msgid "Collapse All"
 msgstr "折叠全部"
 
-#: lms/templates/ccx/schedule.underscore
-msgid "Unit"
-msgstr "单元"
-
 #: lms/templates/ccx/schedule.underscore
 msgid "Start Date"
 msgstr "开始日期"
@@ -7537,73 +7509,6 @@ msgstr "或在此创建一个新账户"
 msgid "Create account"
 msgstr ""
 
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr "分享您的 \"%(display_name)s\" 奖励"
-
-#: lms/templates/student_profile/badge.underscore
-msgid "Share"
-msgstr "分享"
-
-#: lms/templates/student_profile/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr "已获得 %(created)s。"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr "您的下一个目标是什么？"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr "开始向您的下一个学习目标迈进。"
-
-#: lms/templates/student_profile/badge_placeholder.underscore
-msgid "Find a course"
-msgstr "找到一个课程"
-
-#: lms/templates/student_profile/learner_profile.underscore
-msgid "An error occurred. Try loading the page again."
-msgstr "出现一个错误。尝试重试加载页面。"
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "You are currently sharing a limited profile."
-msgstr "您当前公开部分个人信息。"
-
-#: lms/templates/student_profile/section_two.underscore
-msgid "This learner is currently sharing a limited profile."
-msgstr "该学生当前公开部分个人信息。"
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr "分享到 Mozilla Backpack 上"
-
-#: lms/templates/student_profile/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-"要在 Mozilla Backpack 上分享您的证书，您必须首先拥有一个 Backpack 帐户。通过完成以下步骤将您的证书添加至 Backpack。"
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
-"your existing account"
-msgstr "创建一个 %(link_start)sMozilla Backpack%(link_end)s 帐户，或登录您已有的帐户"
-
-#: lms/templates/student_profile/share_modal.underscore
-#, python-format
-msgid ""
-"%(download_link_start)sDownload this image (right-click or option-click, "
-"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
-"your backpack.</li>"
-msgstr ""
-"%(download_link_start)s下载此图像（右击或单击选项，另存为）%(link_end)s，随后%(upload_link_start)s上传%(link_end)s至你的"
-" backpack 中。</li>"
-
 #: lms/templates/verify_student/enrollment_confirmation_step.underscore
 #, python-format
 msgid "Congratulations! You are now verified on %(platformName)s!"
@@ -8129,6 +8034,73 @@ msgstr "对不起，未找到搜索结果。"
 msgid "Back to Dashboard"
 msgstr "回到控制面板"
 
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Share your \"%(display_name)s\" award"
+msgstr "分享您的 \"%(display_name)s\" 奖励"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+msgid "Share"
+msgstr "分享"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+#, python-format
+msgid "Earned %(created)s."
+msgstr "已获得 %(created)s。"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "What's Your Next Accomplishment?"
+msgstr "您的下一个目标是什么？"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Start working toward your next learning goal."
+msgstr "开始向您的下一个学习目标迈进。"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+msgid "Find a course"
+msgstr "找到一个课程"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+msgid "An error occurred. Try loading the page again."
+msgstr "出现一个错误。尝试重试加载页面。"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "You are currently sharing a limited profile."
+msgstr "您当前公开部分个人信息。"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+msgid "This learner is currently sharing a limited profile."
+msgstr "该学生当前公开部分个人信息。"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid "Share on Mozilla Backpack"
+msgstr "分享到 Mozilla Backpack 上"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+msgid ""
+"To share your certificate on Mozilla Backpack, you must first have a "
+"Backpack account. Complete the following steps to add your certificate to "
+"Backpack."
+msgstr ""
+"要在 Mozilla Backpack 上分享您的证书，您必须首先拥有一个 Backpack 帐户。通过完成以下步骤将您的证书添加至 Backpack。"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to "
+"your existing account"
+msgstr "创建一个 %(link_start)sMozilla Backpack%(link_end)s 帐户，或登录您已有的帐户"
+
+#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+#, python-format
+msgid ""
+"%(download_link_start)sDownload this image (right-click or option-click, "
+"save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to "
+"your backpack.</li>"
+msgstr ""
+"%(download_link_start)s下载此图像（右击或单击选项，另存为）%(link_end)s，随后%(upload_link_start)s上传%(link_end)s至你的"
+" backpack 中。</li>"
+
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr ""
@@ -8370,6 +8342,20 @@ msgstr ""
 msgid "Deactivate"
 msgstr ""
 
+#: cms/templates/js/container-access.underscore
+msgid "component"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid "Access to this {blockType} is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
+#: cms/templates/js/container-access.underscore
+msgid ""
+"Access to some content in this {blockType} is restricted to specific groups "
+"of learners."
+msgstr ""
+
 #: cms/templates/js/container-message.underscore
 msgid ""
 "Caution: The last published version of this unit is live. By publishing "
@@ -8531,6 +8517,10 @@ msgstr ""
 msgid "Unpublished changes to content that will release in the future"
 msgstr ""
 
+#: cms/templates/js/course-outline.underscore
+msgid "Access to this unit is restricted to: {selectedGroupsLabel}"
+msgstr ""
+
 #: cms/templates/js/course-outline.underscore
 msgid ""
 "Access to some content in this unit is restricted to specific groups of "
@@ -9057,12 +9047,6 @@ msgstr ""
 msgid "Staff and Learners"
 msgstr ""
 
-#: cms/templates/js/publish-xblock.underscore
-msgid ""
-"Access to some content in this unit is restricted to specific groups of "
-"learners."
-msgstr ""
-
 #: cms/templates/js/publish-xblock.underscore
 #: cms/templates/js/staff-lock-editor.underscore
 msgid "Hide from learners"
@@ -9326,6 +9310,32 @@ msgid ""
 "specify that calculators are allowed."
 msgstr ""
 
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Unit Access"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Restrict access to:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select a group type"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Select one or more groups:"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid "Deleted Group"
+msgstr ""
+
+#: cms/templates/js/unit-access-editor.underscore
+msgid ""
+"This group no longer exists. Choose another group or do not restrict access "
+"to this unit."
+msgstr ""
+
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
 msgstr ""
@@ -9361,8 +9371,8 @@ msgid ""
 "should be {maxFileSize} and format must be one of {supportedImageFormats}."
 msgstr ""
 
-#: cms/templates/js/xblock-string-field-editor.underscore
-msgid "Edit the name"
+#: cms/templates/js/xblock-access-editor.underscore
+msgid "Set Access"
 msgstr ""
 
 #: cms/templates/js/xblock-string-field-editor.underscore
diff --git a/lms/djangoapps/bulk_email/tests/test_err_handling.py b/lms/djangoapps/bulk_email/tests/test_err_handling.py
index bad8c185d7..c82d05c2b4 100644
--- a/lms/djangoapps/bulk_email/tests/test_err_handling.py
+++ b/lms/djangoapps/bulk_email/tests/test_err_handling.py
@@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse
 from django.db import DatabaseError
 from mock import Mock, patch
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from bulk_email.models import SEND_TO_MYSELF, BulkEmailFlag, CourseEmail
 from bulk_email.tasks import perform_delegate_email_batches, send_course_email
@@ -193,7 +193,7 @@ class TestEmailErrors(ModuleStoreTestCase):
         """
         Tests exception when the course in the email doesn't exist
         """
-        course_id = SlashSeparatedCourseKey("I", "DONT", "EXIST")
+        course_id = CourseLocator("I", "DONT", "EXIST")
         email = CourseEmail(course_id=course_id)
         email.save()
         entry = InstructorTask.create(course_id, "task_type", "task_key", "task_input", self.instructor)
@@ -250,7 +250,7 @@ class TestEmailErrors(ModuleStoreTestCase):
         Tests exception when the course_id in CourseEmail is not the same as one explicitly passed in.
         """
         email = CourseEmail.create(
-            SlashSeparatedCourseKey("bogus", "course", "id"),
+            CourseLocator("bogus", "course", "id"),
             self.instructor,
             [SEND_TO_MYSELF],
             "re: subject",
diff --git a/lms/djangoapps/bulk_email/tests/test_forms.py b/lms/djangoapps/bulk_email/tests/test_forms.py
index d36b93dacf..2915b49602 100644
--- a/lms/djangoapps/bulk_email/tests/test_forms.py
+++ b/lms/djangoapps/bulk_email/tests/test_forms.py
@@ -4,7 +4,7 @@ Unit tests for bulk-email-related forms.
 """
 
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from bulk_email.forms import CourseAuthorizationAdminForm, CourseEmailTemplateForm
 from bulk_email.models import BulkEmailFlag, CourseEmailTemplate
@@ -70,7 +70,7 @@ class CourseAuthorizationFormTest(ModuleStoreTestCase):
 
     def test_form_typo(self):
         # Munge course id
-        bad_id = SlashSeparatedCourseKey(u'Broken{}'.format(self.course.id.org), 'hello', self.course.id.run + '_typo')
+        bad_id = CourseLocator(u'Broken{}'.format(self.course.id.org), 'hello', self.course.id.run + '_typo')
 
         form_data = {'course_id': bad_id.to_deprecated_string(), 'email_enabled': True}
         form = CourseAuthorizationAdminForm(data=form_data)
diff --git a/lms/djangoapps/bulk_email/tests/test_tasks.py b/lms/djangoapps/bulk_email/tests/test_tasks.py
index b50796bd42..7d11dd6caa 100644
--- a/lms/djangoapps/bulk_email/tests/test_tasks.py
+++ b/lms/djangoapps/bulk_email/tests/test_tasks.py
@@ -28,7 +28,7 @@ from django.conf import settings
 from django.core.management import call_command
 from mock import Mock, patch
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from bulk_email.models import SEND_TO_LEARNERS, SEND_TO_MYSELF, SEND_TO_STAFF, CourseEmail, Optout
 from bulk_email.tasks import _get_course_email_context
@@ -120,7 +120,7 @@ class TestBulkEmailInstructorTask(InstructorTaskCourseTestCase):
 
     def test_email_undefined_course(self):
         # Check that we fail when passing in a course that doesn't exist.
-        task_entry = self._create_input_entry(course_id=SlashSeparatedCourseKey("bogus", "course", "id"))
+        task_entry = self._create_input_entry(course_id=CourseLocator("bogus", "course", "id"))
         with self.assertRaises(ValueError):
             self._run_task_with_mock_celery(send_bulk_course_email, task_entry.id, task_entry.task_id)
 
diff --git a/lms/djangoapps/ccx/tests/test_field_override_performance.py b/lms/djangoapps/ccx/tests/test_field_override_performance.py
index 450e57941c..2e68180ab0 100644
--- a/lms/djangoapps/ccx/tests/test_field_override_performance.py
+++ b/lms/djangoapps/ccx/tests/test_field_override_performance.py
@@ -237,18 +237,18 @@ class TestFieldOverrideMongoPerformance(FieldOverridePerformanceTestCase):
         #     # of sql queries to default,
         #     # of mongo queries,
         # )
-        ('no_overrides', 1, True, False): (23, 1),
-        ('no_overrides', 2, True, False): (23, 1),
-        ('no_overrides', 3, True, False): (23, 1),
-        ('ccx', 1, True, False): (23, 1),
-        ('ccx', 2, True, False): (23, 1),
-        ('ccx', 3, True, False): (23, 1),
-        ('no_overrides', 1, False, False): (23, 1),
-        ('no_overrides', 2, False, False): (23, 1),
-        ('no_overrides', 3, False, False): (23, 1),
-        ('ccx', 1, False, False): (23, 1),
-        ('ccx', 2, False, False): (23, 1),
-        ('ccx', 3, False, False): (23, 1),
+        ('no_overrides', 1, True, False): (25, 1),
+        ('no_overrides', 2, True, False): (25, 1),
+        ('no_overrides', 3, True, False): (25, 1),
+        ('ccx', 1, True, False): (25, 1),
+        ('ccx', 2, True, False): (25, 1),
+        ('ccx', 3, True, False): (25, 1),
+        ('no_overrides', 1, False, False): (25, 1),
+        ('no_overrides', 2, False, False): (25, 1),
+        ('no_overrides', 3, False, False): (25, 1),
+        ('ccx', 1, False, False): (25, 1),
+        ('ccx', 2, False, False): (25, 1),
+        ('ccx', 3, False, False): (25, 1),
     }
 
 
@@ -260,19 +260,19 @@ class TestFieldOverrideSplitPerformance(FieldOverridePerformanceTestCase):
     __test__ = True
 
     TEST_DATA = {
-        ('no_overrides', 1, True, False): (23, 3),
-        ('no_overrides', 2, True, False): (23, 3),
-        ('no_overrides', 3, True, False): (23, 3),
-        ('ccx', 1, True, False): (23, 3),
-        ('ccx', 2, True, False): (23, 3),
-        ('ccx', 3, True, False): (23, 3),
-        ('ccx', 1, True, True): (24, 3),
-        ('ccx', 2, True, True): (24, 3),
-        ('ccx', 3, True, True): (24, 3),
-        ('no_overrides', 1, False, False): (23, 3),
-        ('no_overrides', 2, False, False): (23, 3),
-        ('no_overrides', 3, False, False): (23, 3),
-        ('ccx', 1, False, False): (23, 3),
-        ('ccx', 2, False, False): (23, 3),
-        ('ccx', 3, False, False): (23, 3),
+        ('no_overrides', 1, True, False): (25, 3),
+        ('no_overrides', 2, True, False): (25, 3),
+        ('no_overrides', 3, True, False): (25, 3),
+        ('ccx', 1, True, False): (25, 3),
+        ('ccx', 2, True, False): (25, 3),
+        ('ccx', 3, True, False): (25, 3),
+        ('ccx', 1, True, True): (26, 3),
+        ('ccx', 2, True, True): (26, 3),
+        ('ccx', 3, True, True): (26, 3),
+        ('no_overrides', 1, False, False): (25, 3),
+        ('no_overrides', 2, False, False): (25, 3),
+        ('no_overrides', 3, False, False): (25, 3),
+        ('ccx', 1, False, False): (25, 3),
+        ('ccx', 2, False, False): (25, 3),
+        ('ccx', 3, False, False): (25, 3),
     }
diff --git a/lms/djangoapps/certificates/signals.py b/lms/djangoapps/certificates/signals.py
index b41f156c3e..e8ccff4844 100644
--- a/lms/djangoapps/certificates/signals.py
+++ b/lms/djangoapps/certificates/signals.py
@@ -6,7 +6,6 @@ import logging
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from .config import waffle
 from certificates.models import \
     CertificateGenerationCourseSetting, \
     CertificateWhitelist, \
@@ -14,6 +13,7 @@ from certificates.models import \
 from certificates.tasks import generate_certificate
 from courseware import courses
 from lms.djangoapps.grades.new.course_grade_factory import CourseGradeFactory
+from openedx.core.djangoapps.certificates.config import waffle
 from openedx.core.djangoapps.signals.signals import COURSE_GRADE_NOW_PASSED, LEARNER_NOW_VERIFIED
 from student.models import CourseEnrollment
 
@@ -41,10 +41,7 @@ def _listen_for_certificate_whitelist_append(sender, instance, **kwargs):  # pyl
         if courses.get_course_by_id(instance.course_id, depth=0).self_paced:
             return
 
-    generate_certificate.apply_async(
-        student=instance.user,
-        course_key=instance.course_id,
-    )
+    fire_ungenerated_certificate_task(instance.user, instance.course_id)
     log.info(u'Certificate generation task initiated for {user} : {course} via whitelist'.format(
         user=instance.user.id,
         course=instance.course_id
@@ -73,10 +70,7 @@ def _listen_for_passing_grade(sender, user, course_id, **kwargs):  # pylint: dis
     if waffle.waffle().is_enabled(waffle.INSTRUCTOR_PACED_ONLY):
         if courses.get_course_by_id(course_id, depth=0).self_paced:
             return
-    if fire_ungenerated_certificate_task(
-        user=user,
-        course_id=course_id
-    ):
+    if fire_ungenerated_certificate_task(user, course_id):
         log.info(u'Certificate generation task initiated for {user} : {course} via passing grade'.format(
             user=user.id,
             course=course_id
@@ -98,23 +92,22 @@ def _listen_for_track_change(sender, user, **kwargs):  # pylint: disable=unused-
     grade_factory = CourseGradeFactory()
     for enrollment in user_enrollments:
         if grade_factory.read(user=user, course=enrollment.course).passed:
-            if fire_ungenerated_certificate_task(
-                user=user,
-                course_id=enrollment.course.id
-            ):
+            if fire_ungenerated_certificate_task(user, enrollment.course.id):
                 log.info(u'Certificate generation task initiated for {user} : {course} via track change'.format(
                     user=user.id,
                     course=enrollment.course.id
                 ))
 
 
-def fire_ungenerated_certificate_task(user, course_id):
+def fire_ungenerated_certificate_task(user, course_key):
     """
     Helper function to fire un-generated certificate tasks
+    :param user: A User object.
+    :param course_id: A CourseKey object.
     """
-    if GeneratedCertificate.certificate_for_student(user, course_id) is None:
-        generate_certificate.apply_async(
-            student=user,
-            course_key=course_id
-        )
+    if GeneratedCertificate.certificate_for_student(user, course_key) is None:
+        generate_certificate.apply_async(kwargs={
+            'student': unicode(user.id),
+            'course_key': unicode(course_key),
+        })
         return True
diff --git a/lms/djangoapps/certificates/tasks.py b/lms/djangoapps/certificates/tasks.py
index 9ccd36bb3e..c297d2f516 100644
--- a/lms/djangoapps/certificates/tasks.py
+++ b/lms/djangoapps/certificates/tasks.py
@@ -3,6 +3,8 @@ from logging import getLogger
 
 from celery_utils.logged_task import LoggedTask
 from celery_utils.persist_on_failure import PersistOnFailureTask
+from django.contrib.auth.models import User
+from opaque_keys.edx.keys import CourseKey
 
 from .api import generate_user_certificates
 
@@ -21,6 +23,6 @@ def generate_certificate(**kwargs):
     """
     Generates a certificate for a single user.
     """
-    student = kwargs.pop('student')
-    course_key = kwargs.pop('course_key')
+    student = User.objects.get(id=kwargs.pop('student'))
+    course_key = CourseKey.from_string(kwargs.pop('course_key'))
     generate_user_certificates(student=student, course_key=course_key, **kwargs)
diff --git a/lms/djangoapps/certificates/tests/test_signals.py b/lms/djangoapps/certificates/tests/test_signals.py
index 31dd1ec0a0..b006e8c349 100644
--- a/lms/djangoapps/certificates/tests/test_signals.py
+++ b/lms/djangoapps/certificates/tests/test_signals.py
@@ -5,7 +5,6 @@ and disabling for instructor-paced courses.
 import mock
 
 from certificates import api as certs_api
-from certificates.config import waffle
 from certificates.models import \
     CertificateGenerationConfiguration, \
     CertificateWhitelist, \
@@ -15,6 +14,7 @@ from openedx.core.djangoapps.signals.handlers import _listen_for_course_pacing_c
 from lms.djangoapps.grades.new.course_grade_factory import CourseGradeFactory
 from lms.djangoapps.grades.tests.utils import mock_passing_grade
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
+from openedx.core.djangoapps.certificates.config import waffle
 from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -83,10 +83,10 @@ class WhitelistGeneratedCertificatesTest(ModuleStoreTestCase):
                     user=self.user,
                     course_id=self.course.id
                 )
-                mock_generate_certificate_apply_async.assert_called_with(
-                    student=self.user,
-                    course_key=self.course.id,
-                )
+                mock_generate_certificate_apply_async.assert_called_with(kwargs={
+                    'student': unicode(self.user.id),
+                    'course_key': unicode(self.course.id),
+                })
 
     def test_cert_generation_on_whitelist_append_instructor_paced(self):
         """
@@ -108,10 +108,10 @@ class WhitelistGeneratedCertificatesTest(ModuleStoreTestCase):
                     user=self.user,
                     course_id=self.ip_course.id
                 )
-                mock_generate_certificate_apply_async.assert_called_with(
-                    student=self.user,
-                    course_key=self.ip_course.id
-                )
+                mock_generate_certificate_apply_async.assert_called_with(kwargs={
+                    'student': unicode(self.user.id),
+                    'course_key': unicode(self.ip_course.id),
+                })
 
 
 class PassingGradeCertsTest(ModuleStoreTestCase):
@@ -151,10 +151,10 @@ class PassingGradeCertsTest(ModuleStoreTestCase):
                 # Certs fired after passing
                 with mock_passing_grade():
                     grade_factory.update(self.user, self.course)
-                    mock_generate_certificate_apply_async.assert_called_with(
-                        student=self.user,
-                        course_key=self.course.id
-                    )
+                    mock_generate_certificate_apply_async.assert_called_with(kwargs={
+                        'student': unicode(self.user.id),
+                        'course_key': unicode(self.course.id),
+                    })
 
     def test_cert_generation_on_passing_instructor_paced(self):
         with mock.patch(
@@ -169,10 +169,10 @@ class PassingGradeCertsTest(ModuleStoreTestCase):
                 # Certs fired after passing
                 with mock_passing_grade():
                     grade_factory.update(self.user, self.ip_course)
-                    mock_generate_certificate_apply_async.assert_called_with(
-                        student=self.user,
-                        course_key=self.ip_course.id
-                    )
+                    mock_generate_certificate_apply_async.assert_called_with(kwargs={
+                        'student': unicode(self.user.id),
+                        'course_key': unicode(self.ip_course.id),
+                    })
 
     def test_cert_already_generated(self):
         with mock.patch(
@@ -231,10 +231,10 @@ class LearnerTrackChangeCertsTest(ModuleStoreTestCase):
                     status='submitted'
                 )
                 attempt.approve()
-                mock_generate_certificate_apply_async.assert_called_with(
-                    student=self.user_one,
-                    course_key=self.course_one.id
-                )
+                mock_generate_certificate_apply_async.assert_called_with(kwargs={
+                    'student': unicode(self.user_one.id),
+                    'course_key': unicode(self.course_one.id),
+                })
 
     def test_cert_generation_on_photo_verification_instructor_paced(self):
         with mock.patch(
@@ -252,7 +252,7 @@ class LearnerTrackChangeCertsTest(ModuleStoreTestCase):
                     status='submitted'
                 )
                 attempt.approve()
-                mock_generate_certificate_apply_async.assert_called_with(
-                    student=self.user_two,
-                    course_key=self.course_two.id
-                )
+                mock_generate_certificate_apply_async.assert_called_with(kwargs={
+                    'student': unicode(self.user_two.id),
+                    'course_key': unicode(self.course_two.id),
+                })
diff --git a/lms/djangoapps/certificates/tests/test_tasks.py b/lms/djangoapps/certificates/tests/test_tasks.py
index 9572e279a2..2f391b682e 100644
--- a/lms/djangoapps/certificates/tests/test_tasks.py
+++ b/lms/djangoapps/certificates/tests/test_tasks.py
@@ -2,6 +2,7 @@ from unittest import TestCase
 
 import ddt
 from mock import patch
+from opaque_keys.edx.keys import CourseKey
 
 from lms.djangoapps.certificates.tasks import generate_certificate
 
@@ -9,13 +10,26 @@ from lms.djangoapps.certificates.tasks import generate_certificate
 @ddt.ddt
 class GenerateUserCertificateTest(TestCase):
     @patch('lms.djangoapps.certificates.tasks.generate_user_certificates')
-    def test_cert_task(self, generate_user_certs_mock):
-        generate_certificate(student='a', course_key='b', otherarg='c', otherotherarg='d')
-        generate_user_certs_mock.assert_called_with(student='a', course_key='b', otherarg='c', otherotherarg='d')
+    @patch('lms.djangoapps.certificates.tasks.User.objects.get')
+    def test_cert_task(self, user_get_mock, generate_user_certs_mock):
+        course_key = 'course-v1:edX+CS101+2017_T2'
+
+        generate_certificate(student='student-id', course_key=course_key, otherarg='c', otherotherarg='d')
+
+        expected_student = user_get_mock.return_value
+        generate_user_certs_mock.assert_called_with(
+            student=expected_student,
+            course_key=CourseKey.from_string(course_key),
+            otherarg='c',
+            otherotherarg='d'
+        )
+        user_get_mock.assert_called_once_with(id='student-id')
 
     @ddt.data('student', 'course_key')
     def test_cert_task_missing_args(self, missing_arg):
         kwargs = {'student': 'a', 'course_key': 'b', 'otherarg': 'c'}
         del kwargs[missing_arg]
-        with self.assertRaisesRegexp(KeyError, missing_arg):
-            generate_certificate(**kwargs)
+
+        with patch('lms.djangoapps.certificates.tasks.User.objects.get'):
+            with self.assertRaisesRegexp(KeyError, missing_arg):
+                generate_certificate(**kwargs)
diff --git a/lms/djangoapps/commerce/signals.py b/lms/djangoapps/commerce/signals.py
index b288553b09..a9c8feb62e 100644
--- a/lms/djangoapps/commerce/signals.py
+++ b/lms/djangoapps/commerce/signals.py
@@ -19,21 +19,19 @@ from openedx.core.djangoapps.commerce.utils import ecommerce_api_client, is_comm
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.theming import helpers as theming_helpers
 from request_cache.middleware import RequestCache
-from student.models import UNENROLL_DONE
+from student.models import REFUND_ORDER
 
 log = logging.getLogger(__name__)
 
 
 # pylint: disable=unused-argument
-@receiver(UNENROLL_DONE)
-def handle_unenroll_done(sender, course_enrollment=None, skip_refund=False, **kwargs):
+@receiver(REFUND_ORDER)
+def handle_refund_order(sender, course_enrollment=None, **kwargs):
     """
     Signal receiver for unenrollments, used to automatically initiate refunds
     when applicable.
-
-    N.B. this signal is also consumed by lms.djangoapps.shoppingcart.
     """
-    if not is_commerce_service_configured() or skip_refund:
+    if not is_commerce_service_configured():
         return
 
     if course_enrollment and course_enrollment.refundable():
diff --git a/lms/djangoapps/commerce/tests/test_signals.py b/lms/djangoapps/commerce/tests/test_signals.py
index e90d45512d..2954f22d2b 100644
--- a/lms/djangoapps/commerce/tests/test_signals.py
+++ b/lms/djangoapps/commerce/tests/test_signals.py
@@ -23,7 +23,7 @@ from commerce.signals import create_zendesk_ticket, generate_refund_notification
 from commerce.tests import JSON
 from commerce.tests.mocks import mock_create_refund, mock_process_refund
 from course_modes.models import CourseMode
-from student.models import UNENROLL_DONE
+from student.models import REFUND_ORDER
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
 
 ZENDESK_URL = 'http://zendesk.example.com/'
@@ -35,7 +35,7 @@ ZENDESK_API_KEY = 'abc123'
 @override_settings(ZENDESK_URL=ZENDESK_URL, ZENDESK_USER=ZENDESK_USER, ZENDESK_API_KEY=ZENDESK_API_KEY)
 class TestRefundSignal(TestCase):
     """
-    Exercises logic triggered by the UNENROLL_DONE signal.
+    Exercises logic triggered by the REFUND_ORDER signal.
     """
 
     def setUp(self):
@@ -60,12 +60,12 @@ class TestRefundSignal(TestCase):
         self.config.enable_automatic_refund_approval = True
         self.config.save()
 
-    def send_signal(self, skip_refund=False):
+    def send_signal(self):
         """
-        DRY helper: emit the UNENROLL_DONE signal, as is done in
+        DRY helper: emit the REFUND_ORDER signal, as is done in
         common.djangoapps.student.models after a successful unenrollment.
         """
-        UNENROLL_DONE.send(sender=None, course_enrollment=self.course_enrollment, skip_refund=skip_refund)
+        REFUND_ORDER.send(sender=None, course_enrollment=self.course_enrollment)
 
     @override_settings(
         ECOMMERCE_PUBLIC_URL_ROOT=None,
@@ -83,7 +83,7 @@ class TestRefundSignal(TestCase):
     @mock.patch('commerce.signals.refund_seat')
     def test_receiver(self, mock_refund_seat):
         """
-        Ensure that the UNENROLL_DONE signal triggers correct calls to
+        Ensure that the REFUND_ORDER signal triggers correct calls to
         refund_seat(), when it is appropriate to do so.
 
         TODO (jsa): ideally we would assert that the signal receiver got wired
@@ -94,11 +94,6 @@ class TestRefundSignal(TestCase):
         self.assertTrue(mock_refund_seat.called)
         self.assertEqual(mock_refund_seat.call_args[0], (self.course_enrollment,))
 
-        # if skip_refund is set to True in the signal, we should not try to initiate a refund.
-        mock_refund_seat.reset_mock()
-        self.send_signal(skip_refund=True)
-        self.assertFalse(mock_refund_seat.called)
-
         # if the course_enrollment is not refundable, we should not try to initiate a refund.
         mock_refund_seat.reset_mock()
         self.course_enrollment.refundable = mock.Mock(return_value=False)
diff --git a/lms/djangoapps/courseware/admin.py b/lms/djangoapps/courseware/admin.py
index 17106b5149..5219448274 100644
--- a/lms/djangoapps/courseware/admin.py
+++ b/lms/djangoapps/courseware/admin.py
@@ -1,5 +1,6 @@
+from django.contrib import admin
+
 from config_models.admin import ConfigurationModelAdmin, KeyedConfigurationModelAdmin
-from ratelimitbackend import admin
 
 from courseware import models
 
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index 18d5e66968..2c7cd36de5 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -22,6 +22,7 @@ from courseware.module_render import get_module
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import Http404, QueryDict
+from enrollment.api import get_course_enrollment_details
 from edxmako.shortcuts import render_to_string
 from fs.errors import ResourceNotFoundError
 from lms.djangoapps.courseware.courseware_access_exception import CoursewareAccessException
@@ -173,6 +174,30 @@ def can_self_enroll_in_course(course_key):
     return True
 
 
+def course_open_for_self_enrollment(course_key):
+    """
+    For a given course_key, determine if the course is available for enrollment
+    """
+    # Check to see if learners can enroll themselves.
+    if not can_self_enroll_in_course(course_key):
+        return False
+
+    # Check the enrollment start and end dates.
+    course_details = get_course_enrollment_details(unicode(course_key))
+    now = datetime.now().replace(tzinfo=pytz.UTC)
+    start = course_details['enrollment_start']
+    end = course_details['enrollment_end']
+
+    start = start if start is not None else now
+    end = end if end is not None else now
+
+    # If we are not within the start and end date for enrollment.
+    if now < start or end < now:
+        return False
+
+    return True
+
+
 def find_file(filesystem, dirs, filename):
     """
     Looks for a filename in a list of dirs on a filesystem, in the specified order.
diff --git a/lms/djangoapps/courseware/date_summary.py b/lms/djangoapps/courseware/date_summary.py
index a8f80fb430..4b381093d6 100644
--- a/lms/djangoapps/courseware/date_summary.py
+++ b/lms/djangoapps/courseware/date_summary.py
@@ -14,10 +14,8 @@ from lazy import lazy
 from pytz import timezone, utc
 
 from course_modes.models import CourseMode
-from courseware.models import CourseDynamicUpgradeDeadlineConfiguration, DynamicUpgradeDeadlineConfiguration
 from lms.djangoapps.commerce.utils import EcommerceService
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationDeadline
-from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from student.models import CourseEnrollment
 
 
@@ -224,10 +222,6 @@ class VerifiedUpgradeDeadlineDate(DateSummary):
     def enrollment(self):
         return CourseEnrollment.get_enrollment(self.user, self.course_id)
 
-    @cached_property
-    def course_overview(self):
-        return CourseOverview.get_from_id(self.course_id)
-
     @property
     def is_enabled(self):
         """
@@ -258,36 +252,8 @@ class VerifiedUpgradeDeadlineDate(DateSummary):
     def date(self):
         deadline = None
 
-        try:
-            verified_mode = CourseMode.objects.get(course_id=self.course_id, mode_slug=CourseMode.VERIFIED)
-            deadline = verified_mode.expiration_datetime
-        except CourseMode.DoesNotExist:
-            pass
-
-        if self.course and self.course_overview.self_paced and self.enrollment:
-            global_config = DynamicUpgradeDeadlineConfiguration.current()
-            if global_config.enabled:
-                delta = global_config.deadline_days
-
-                # Check if the given course has opted out of the feature
-                course_config = CourseDynamicUpgradeDeadlineConfiguration.current(self.course.id)
-                if course_config.enabled:
-                    if course_config.opt_out:
-                        return deadline
-
-                    delta = course_config.deadline_days
-
-                # This represents the first date at which the learner can access the content. This will be the
-                # latter of either the enrollment date or the course's start date.
-                content_availability_date = max(self.enrollment.created, self.course_overview.start)
-                user_deadline = content_availability_date + datetime.timedelta(days=delta)
-
-                # If the deadline from above is None, make sure we have a value for comparison
-                deadline = deadline or datetime.date.max
-
-                # The user-specific deadline should never occur after the verified mode's expiration date,
-                # if one is set.
-                deadline = min(deadline, user_deadline)
+        if self.enrollment:
+            deadline = self.enrollment.upgrade_deadline
 
         return deadline
 
diff --git a/lms/djangoapps/courseware/tests/factories.py b/lms/djangoapps/courseware/tests/factories.py
index 3a0974e924..2ca83d493f 100644
--- a/lms/djangoapps/courseware/tests/factories.py
+++ b/lms/djangoapps/courseware/tests/factories.py
@@ -5,7 +5,8 @@ from functools import partial
 
 import factory
 from factory.django import DjangoModelFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from courseware.models import (
     StudentModule,
@@ -27,7 +28,7 @@ from student.tests.factories import UserFactory  # Imported to re-export
 
 # TODO fix this (course_id and location are invalid names as constants, and course_id should really be COURSE_KEY)
 # pylint: disable=invalid-name
-course_id = SlashSeparatedCourseKey(u'edX', u'test_course', u'test')
+course_id = CourseKey.from_string('edX/test_course/test')
 location = partial(course_id.make_usage_key, u'problem')
 
 
@@ -128,7 +129,7 @@ class StudentModuleFactory(DjangoModelFactory):
 
     module_type = "problem"
     student = factory.SubFactory(UserFactory)
-    course_id = SlashSeparatedCourseKey("MITx", "999", "Robot_Super_Course")
+    course_id = CourseLocator("MITx", "999", "Robot_Super_Course")
     state = None
     grade = None
     max_grade = None
diff --git a/lms/djangoapps/courseware/tests/test_access.py b/lms/djangoapps/courseware/tests/test_access.py
index 8afa9f2c2d..d7a4732d46 100644
--- a/lms/djangoapps/courseware/tests/test_access.py
+++ b/lms/djangoapps/courseware/tests/test_access.py
@@ -15,7 +15,7 @@ from django.test.client import RequestFactory
 from milestones.tests.utils import MilestonesTestCaseMixin
 from mock import Mock, patch
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 import courseware.access as access
 import courseware.access_response as access_response
@@ -500,7 +500,7 @@ class AccessTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase, MilestonesTes
         user = UserFactory.create()
         course = Mock(
             enrollment_start=tomorrow, enrollment_end=tomorrow,
-            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'), enrollment_domain=''
+            id=CourseLocator('edX', 'test', '2012_Fall'), enrollment_domain=''
         )
         CourseEnrollmentAllowedFactory(email=user.email, course_id=course.id)
         self.assertTrue(access._has_access_course(user, 'enroll', course))
@@ -513,7 +513,7 @@ class AccessTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase, MilestonesTes
         # and not specifically allowed
         course = Mock(
             enrollment_start=yesterday, enrollment_end=tomorrow,
-            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'), enrollment_domain='',
+            id=CourseLocator('edX', 'test', '2012_Fall'), enrollment_domain='',
             invitation_only=True
         )
         user = UserFactory.create()
@@ -522,7 +522,7 @@ class AccessTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase, MilestonesTes
         # Non-staff can enroll if it is between the start and end dates and not invitation only
         course = Mock(
             enrollment_start=yesterday, enrollment_end=tomorrow,
-            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'), enrollment_domain='',
+            id=CourseLocator('edX', 'test', '2012_Fall'), enrollment_domain='',
             invitation_only=False
         )
         self.assertTrue(access._has_access_course(user, 'enroll', course))
@@ -530,7 +530,7 @@ class AccessTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase, MilestonesTes
         # Non-staff cannot enroll outside the open enrollment period if not specifically allowed
         course = Mock(
             enrollment_start=tomorrow, enrollment_end=tomorrow,
-            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'), enrollment_domain='',
+            id=CourseLocator('edX', 'test', '2012_Fall'), enrollment_domain='',
             invitation_only=False
         )
         self.assertFalse(access._has_access_course(user, 'enroll', course))
@@ -544,7 +544,7 @@ class AccessTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase, MilestonesTes
         Tests the catalog visibility tri-states
         """
         user = UserFactory.create()
-        course_id = SlashSeparatedCourseKey('edX', 'test', '2012_Fall')
+        course_id = CourseLocator('edX', 'test', '2012_Fall')
         staff = StaffFactory.create(course_key=course_id)
 
         course = Mock(
@@ -558,7 +558,7 @@ class AccessTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase, MilestonesTes
 
         # Now set visibility to just about page
         course = Mock(
-            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'),
+            id=CourseLocator('edX', 'test', '2012_Fall'),
             catalog_visibility=CATALOG_VISIBILITY_ABOUT
         )
         self.assertFalse(access._has_access_course(user, 'see_in_catalog', course))
@@ -568,7 +568,7 @@ class AccessTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase, MilestonesTes
 
         # Now set visibility to none, which means neither in catalog nor about pages
         course = Mock(
-            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'),
+            id=CourseLocator('edX', 'test', '2012_Fall'),
             catalog_visibility=CATALOG_VISIBILITY_NONE
         )
         self.assertFalse(access._has_access_course(user, 'see_in_catalog', course))
@@ -675,7 +675,7 @@ class UserRoleTestCase(TestCase):
 
     def setUp(self):
         super(UserRoleTestCase, self).setUp()
-        self.course_key = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        self.course_key = CourseLocator('edX', 'toy', '2012_Fall')
         self.anonymous_user = AnonymousUserFactory()
         self.student = UserFactory()
         self.global_staff = UserFactory(is_staff=True)
diff --git a/lms/djangoapps/courseware/tests/test_course_info.py b/lms/djangoapps/courseware/tests/test_course_info.py
index 00b4881808..e9459f382c 100644
--- a/lms/djangoapps/courseware/tests/test_course_info.py
+++ b/lms/djangoapps/courseware/tests/test_course_info.py
@@ -388,7 +388,7 @@ class SelfPacedCourseInfoTestCase(LoginEnrollmentTestCase, SharedModuleStoreTest
         self.assertEqual(resp.status_code, 200)
 
     def test_num_queries_instructor_paced(self):
-        self.fetch_course_info_with_queries(self.instructor_paced_course, 25, 3)
+        self.fetch_course_info_with_queries(self.instructor_paced_course, 26, 3)
 
     def test_num_queries_self_paced(self):
-        self.fetch_course_info_with_queries(self.self_paced_course, 25, 3)
+        self.fetch_course_info_with_queries(self.self_paced_course, 26, 3)
diff --git a/lms/djangoapps/courseware/tests/test_courses.py b/lms/djangoapps/courseware/tests/test_courses.py
index a8ccccc8c4..f9229dbda5 100644
--- a/lms/djangoapps/courseware/tests/test_courses.py
+++ b/lms/djangoapps/courseware/tests/test_courses.py
@@ -4,8 +4,10 @@ Tests for course access
 """
 import itertools
 
+import datetime
 import ddt
 import mock
+import pytz
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.test.client import RequestFactory
@@ -13,6 +15,7 @@ from django.test.utils import override_settings
 from nose.plugins.attrib import attr
 
 from courseware.courses import (
+    course_open_for_self_enrollment,
     get_cms_block_link,
     get_cms_course_link,
     get_course_about_section,
@@ -322,6 +325,52 @@ class CoursesRenderTest(ModuleStoreTestCase):
             self.assertIn("this module is temporarily unavailable", course_about)
 
 
+class CourseEnrollmentOpenTests(ModuleStoreTestCase):
+    def setUp(self):
+        super(CourseEnrollmentOpenTests, self).setUp()
+        self.now = datetime.datetime.now().replace(tzinfo=pytz.UTC)
+
+    def test_course_enrollment_open(self):
+        start = self.now - datetime.timedelta(days=1)
+        end = self.now + datetime.timedelta(days=1)
+        course = CourseFactory(enrollment_start=start, enrollment_end=end)
+        self.assertTrue(course_open_for_self_enrollment(course.id))
+
+    def test_course_enrollment_closed_future(self):
+        start = self.now + datetime.timedelta(days=1)
+        end = self.now + datetime.timedelta(days=2)
+        course = CourseFactory(enrollment_start=start, enrollment_end=end)
+        self.assertFalse(course_open_for_self_enrollment(course.id))
+
+    def test_course_enrollment_closed_past(self):
+        start = self.now - datetime.timedelta(days=2)
+        end = self.now - datetime.timedelta(days=1)
+        course = CourseFactory(enrollment_start=start, enrollment_end=end)
+        self.assertFalse(course_open_for_self_enrollment(course.id))
+
+    def test_course_enrollment_dates_missing(self):
+        course = CourseFactory()
+        self.assertTrue(course_open_for_self_enrollment(course.id))
+
+    def test_course_enrollment_dates_missing_start(self):
+        end = self.now + datetime.timedelta(days=1)
+        course = CourseFactory(enrollment_end=end)
+        self.assertTrue(course_open_for_self_enrollment(course.id))
+
+        end = self.now - datetime.timedelta(days=1)
+        course = CourseFactory(enrollment_end=end)
+        self.assertFalse(course_open_for_self_enrollment(course.id))
+
+    def test_course_enrollment_dates_missing_end(self):
+        start = self.now - datetime.timedelta(days=1)
+        course = CourseFactory(enrollment_start=start)
+        self.assertTrue(course_open_for_self_enrollment(course.id))
+
+        start = self.now + datetime.timedelta(days=1)
+        course = CourseFactory(enrollment_start=start)
+        self.assertFalse(course_open_for_self_enrollment(course.id))
+
+
 @attr(shard=1)
 @ddt.ddt
 class CourseInstantiationTests(ModuleStoreTestCase):
diff --git a/lms/djangoapps/courseware/tests/test_date_summary.py b/lms/djangoapps/courseware/tests/test_date_summary.py
index 240da2360c..ef59e085fc 100644
--- a/lms/djangoapps/courseware/tests/test_date_summary.py
+++ b/lms/djangoapps/courseware/tests/test_date_summary.py
@@ -3,6 +3,7 @@
 from datetime import datetime, timedelta
 
 import ddt
+import waffle
 from django.core.urlresolvers import reverse
 from freezegun import freeze_time
 from nose.plugins.attrib import attr
@@ -34,150 +35,163 @@ from xmodule.modulestore.tests.factories import CourseFactory
 
 @attr(shard=1)
 @ddt.ddt
+@waffle.testutils.override_switch('schedules.enable-create-schedule-receiver', True)
 class CourseDateSummaryTest(SharedModuleStoreTestCase):
     """Tests for course date summary blocks."""
 
     def setUp(self):
-        SelfPacedConfiguration(enable_course_home_improvements=True).save()
         super(CourseDateSummaryTest, self).setUp()
+        SelfPacedConfiguration.objects.create(enable_course_home_improvements=True)
 
-    def setup_course_and_user(
-            self,
-            days_till_start=1,
-            days_till_end=14,
-            days_till_upgrade_deadline=4,
-            enroll_user=True,
-            enrollment_mode=CourseMode.VERIFIED,
-            user_enrollment_mode=None,
-            course_min_price=100,
-            days_till_verification_deadline=14,
-            verification_status=None,
-            sku=None,
-            create_user=True
-    ):
-        """Set up the course and user for this test."""
+    def create_course_run(self, days_till_start=1, days_till_end=14, days_till_upgrade_deadline=4,
+                          days_till_verification_deadline=14):
+        """ Create a new course run and course modes.
+
+        All date-related arguments are relative to the current date-time (now) unless otherwise specified.
+
+        Both audit and verified `CourseMode` objects will be created for the course run.
+
+        Arguments:
+            days_till_end (int): Number of days until the course ends.
+            days_till_start (int): Number of days until the course starts.
+            days_till_upgrade_deadline (int): Number of days until the course run's upgrade deadline.
+            days_till_verification_deadline (int): Number of days until the course run's verification deadline. If this
+                value is set to `None` no deadline will be verification deadline will be created.
+        """
         now = datetime.now(utc)
+        course = CourseFactory.create(start=now + timedelta(days=days_till_start))
 
-        # pylint: disable=attribute-defined-outside-init
-        if create_user:
-            self.user = UserFactory()
-
-        self.course = CourseFactory.create(start=now + timedelta(days=days_till_start))
-
+        course.end = None
         if days_till_end is not None:
-            self.course.end = now + timedelta(days=days_till_end)
-        else:
-            self.course.end = None
+            course.end = now + timedelta(days=days_till_end)
 
-        if enrollment_mode is not None and days_till_upgrade_deadline is not None:
-            CourseModeFactory.create(
-                course_id=self.course.id,
-                mode_slug=enrollment_mode,
-                expiration_datetime=now + timedelta(days=days_till_upgrade_deadline),
-                min_price=course_min_price,
-                sku=sku
-            )
-
-        if enroll_user:
-            if user_enrollment_mode:
-                CourseEnrollmentFactory.create(course_id=self.course.id, user=self.user, mode=user_enrollment_mode)
-            else:
-                enrollment_mode = enrollment_mode or CourseMode.DEFAULT_MODE_SLUG
-                CourseEnrollmentFactory.create(course_id=self.course.id, user=self.user, mode=enrollment_mode)
+        CourseModeFactory(course_id=course.id, mode_slug=CourseMode.AUDIT)
+        CourseModeFactory(
+            course_id=course.id,
+            mode_slug=CourseMode.VERIFIED,
+            expiration_datetime=now + timedelta(days=days_till_upgrade_deadline)
+        )
 
         if days_till_verification_deadline is not None:
             VerificationDeadline.objects.create(
-                course_key=self.course.id,
+                course_key=course.id,
                 deadline=now + timedelta(days=days_till_verification_deadline)
             )
 
+        return course
+
+    def create_user(self, verification_status=None):
+        """ Create a new User instance.
+
+        Arguments:
+            verification_status (str): User's verification status. If this value is set an instance of
+                SoftwareSecurePhotoVerification will be created for the user with the specified status.
+        """
+        user = UserFactory()
+
         if verification_status is not None:
-            SoftwareSecurePhotoVerificationFactory.create(user=self.user, status=verification_status)
+            SoftwareSecurePhotoVerificationFactory.create(user=user, status=verification_status)
+
+        return user
 
     def test_course_info_feature_flag(self):
         SelfPacedConfiguration(enable_course_home_improvements=False).save()
-        self.setup_course_and_user()
-        self.client.login(username=self.user.username, password=TEST_PASSWORD)
-        url = reverse('info', args=(self.course.id,))
+        course = self.create_course_run()
+        user = self.create_user()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+
+        self.client.login(username=user.username, password=TEST_PASSWORD)
+        url = reverse('info', args=(course.id,))
         response = self.client.get(url)
         self.assertNotIn('date-summary', response.content)
 
     def test_course_info_logged_out(self):
-        self.setup_course_and_user()
-        url = reverse('info', args=(self.course.id,))
+        course = self.create_course_run()
+        url = reverse('info', args=(course.id,))
         response = self.client.get(url)
         self.assertEqual(200, response.status_code)
 
     # Tests for which blocks are enabled
-    def assert_block_types(self, expected_blocks):
+    def assert_block_types(self, course, user, expected_blocks):
         """Assert that the enabled block types for this course are as expected."""
-        blocks = get_course_date_blocks(self.course, self.user)
+        blocks = get_course_date_blocks(course, user)
         self.assertEqual(len(blocks), len(expected_blocks))
         self.assertEqual(set(type(b) for b in blocks), set(expected_blocks))
 
     @ddt.data(
         # Verified enrollment with no photo-verification before course start
-        ({}, (CourseEndDate, CourseStartDate, TodaysDate, VerificationDeadlineDate)),
+        ({}, {}, (CourseEndDate, CourseStartDate, TodaysDate, VerificationDeadlineDate)),
         # Verified enrollment with `approved` photo-verification after course end
         ({'days_till_start': -10,
           'days_till_end': -5,
           'days_till_upgrade_deadline': -6,
           'days_till_verification_deadline': -5,
-          'verification_status': 'approved'},
+          },
+         {'verification_status': 'approved'},
          (TodaysDate, CourseEndDate)),
         # Verified enrollment with `expired` photo-verification during course run
-        ({'days_till_start': -10,
-          'verification_status': 'expired'},
+        ({'days_till_start': -10},
+         {'verification_status': 'expired'},
          (TodaysDate, CourseEndDate, VerificationDeadlineDate)),
         # Verified enrollment with `approved` photo-verification during course run
-        ({'days_till_start': -10,
-          'verification_status': 'approved'},
-         (TodaysDate, CourseEndDate)),
-        # Audit enrollment and non-upsell course.
-        ({'days_till_start': -10,
-          'days_till_upgrade_deadline': None,
-          'days_till_verification_deadline': None,
-          'course_min_price': 0,
-          'enrollment_mode': CourseMode.AUDIT},
+        ({'days_till_start': -10, },
+         {'verification_status': 'approved'},
          (TodaysDate, CourseEndDate)),
         # Verified enrollment with *NO* course end date
         ({'days_till_end': None},
+         {},
          (CourseStartDate, TodaysDate, VerificationDeadlineDate)),
         # Verified enrollment with no photo-verification during course run
         ({'days_till_start': -1},
+         {},
          (TodaysDate, CourseEndDate, VerificationDeadlineDate)),
         # Verification approved
         ({'days_till_start': -10,
           'days_till_upgrade_deadline': -1,
           'days_till_verification_deadline': 1,
-          'verification_status': 'approved'},
+          },
+         {'verification_status': 'approved'},
          (TodaysDate, CourseEndDate)),
         # After upgrade deadline
         ({'days_till_start': -10,
           'days_till_upgrade_deadline': -1},
+         {},
          (TodaysDate, CourseEndDate, VerificationDeadlineDate)),
         # After verification deadline
         ({'days_till_start': -10,
           'days_till_upgrade_deadline': -2,
           'days_till_verification_deadline': -1},
+         {},
          (TodaysDate, CourseEndDate, VerificationDeadlineDate)),
-        # Un-enrolled user before course start
-        ({'enroll_user': False},
-         (CourseStartDate, TodaysDate, CourseEndDate, VerifiedUpgradeDeadlineDate)),
-        # Un-enrolled user during course run
-        ({'days_till_start': -1,
-          'enroll_user': False},
-         (TodaysDate, CourseEndDate, VerifiedUpgradeDeadlineDate)),
-        # Un-enrolled user after course end.
-        ({'enroll_user': False,
-          'days_till_start': -10,
-          'days_till_end': -5},
-         (TodaysDate, CourseEndDate, VerifiedUpgradeDeadlineDate)),
     )
     @ddt.unpack
-    def test_enabled_block_types(self, course_options, expected_blocks):
-        self.setup_course_and_user(**course_options)
-        self.assert_block_types(expected_blocks)
+    def test_enabled_block_types(self, course_kwargs, user_kwargs, expected_blocks):
+        course = self.create_course_run(**course_kwargs)
+        user = self.create_user(**user_kwargs)
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+        self.assert_block_types(course, user, expected_blocks)
+
+    @ddt.data(
+        # Course not started
+        ({}, (CourseStartDate, TodaysDate, CourseEndDate)),
+        # Course active
+        ({'days_till_start': -1}, (TodaysDate, CourseEndDate)),
+        # Course ended
+        ({'days_till_start': -10, 'days_till_end': -5},
+         (TodaysDate, CourseEndDate)),
+    )
+    @ddt.unpack
+    def test_enabled_block_types_without_enrollment(self, course_kwargs, expected_blocks):
+        course = self.create_course_run(**course_kwargs)
+        user = self.create_user()
+        self.assert_block_types(course, user, expected_blocks)
+
+    def test_enabled_block_types_with_non_upgradeable_course_run(self):
+        course = self.create_course_run(days_till_start=-10, days_till_verification_deadline=None)
+        user = self.create_user()
+        CourseMode.objects.get(course_id=course.id, mode_slug=CourseMode.VERIFIED).delete()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.AUDIT)
+        self.assert_block_types(course, user, (TodaysDate, CourseEndDate))
 
     def test_todays_date_block(self):
         """
@@ -185,8 +199,9 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
         and displays the correct time, accounting for daylight savings
         """
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user()
-            block = TodaysDate(self.course, self.user)
+            course = self.create_course_run()
+            user = self.create_user()
+            block = TodaysDate(course, user)
             self.assertTrue(block.is_enabled)
             self.assertEqual(block.date, datetime.now(utc))
             self.assertEqual(block.title, 'current_datetime')
@@ -198,8 +213,9 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
     @override_waffle_flag(UNIFIED_COURSE_TAB_FLAG, active=True)
     def test_todays_date_no_timezone(self, url_name):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user()
-            self.client.login(username=self.user.username, password=TEST_PASSWORD)
+            course = self.create_course_run()
+            user = self.create_user()
+            self.client.login(username=user.username, password=TEST_PASSWORD)
 
             html_elements = [
                 '<h3 class="hd hd-6 handouts-header">Important Course Dates</h3>',
@@ -210,7 +226,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
                 'data-string="Today is {date}"',
                 'data-timezone="None"'
             ]
-            url = reverse(url_name, args=(self.course.id,))
+            url = reverse(url_name, args=(course.id,))
             response = self.client.get(url, follow=True)
             for html in html_elements:
                 self.assertContains(response, html)
@@ -222,10 +238,11 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
     @override_waffle_flag(UNIFIED_COURSE_TAB_FLAG, active=True)
     def test_todays_date_timezone(self, url_name):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user()
-            self.client.login(username=self.user.username, password=TEST_PASSWORD)
-            set_user_preference(self.user, "time_zone", "America/Los_Angeles")
-            url = reverse(url_name, args=(self.course.id,))
+            course = self.create_course_run()
+            user = self.create_user()
+            self.client.login(username=user.username, password=TEST_PASSWORD)
+            set_user_preference(user, 'time_zone', 'America/Los_Angeles')
+            url = reverse(url_name, args=(course.id,))
             response = self.client.get(url, follow=True)
 
             html_elements = [
@@ -242,9 +259,10 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
 
     ## Tests Course Start Date
     def test_course_start_date(self):
-        self.setup_course_and_user()
-        block = CourseStartDate(self.course, self.user)
-        self.assertEqual(block.date, self.course.start)
+        course = self.create_course_run()
+        user = self.create_user()
+        block = CourseStartDate(course, user)
+        self.assertEqual(block.date, course.start)
 
     @ddt.data(
         'info',
@@ -253,9 +271,10 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
     @override_waffle_flag(UNIFIED_COURSE_TAB_FLAG, active=True)
     def test_start_date_render(self, url_name):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user()
-            self.client.login(username=self.user.username, password=TEST_PASSWORD)
-            url = reverse(url_name, args=(self.course.id,))
+            course = self.create_course_run()
+            user = self.create_user()
+            self.client.login(username=user.username, password=TEST_PASSWORD)
+            url = reverse(url_name, args=(course.id,))
             response = self.client.get(url, follow=True)
             html_elements = [
                 'data-string="in 1 day - {date}"',
@@ -271,10 +290,11 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
     @override_waffle_flag(UNIFIED_COURSE_TAB_FLAG, active=True)
     def test_start_date_render_time_zone(self, url_name):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user()
-            self.client.login(username=self.user.username, password=TEST_PASSWORD)
-            set_user_preference(self.user, "time_zone", "America/Los_Angeles")
-            url = reverse(url_name, args=(self.course.id,))
+            course = self.create_course_run()
+            user = self.create_user()
+            self.client.login(username=user.username, password=TEST_PASSWORD)
+            set_user_preference(user, 'time_zone', 'America/Los_Angeles')
+            url = reverse(url_name, args=(course.id,))
             response = self.client.get(url, follow=True)
             html_elements = [
                 'data-string="in 1 day - {date}"',
@@ -286,16 +306,20 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
 
     ## Tests Course End Date Block
     def test_course_end_date_for_certificate_eligible_mode(self):
-        self.setup_course_and_user(days_till_start=-1)
-        block = CourseEndDate(self.course, self.user)
+        course = self.create_course_run(days_till_start=-1)
+        user = self.create_user()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+        block = CourseEndDate(course, user)
         self.assertEqual(
             block.description,
             'To earn a certificate, you must complete all requirements before this date.'
         )
 
     def test_course_end_date_for_non_certificate_eligible_mode(self):
-        self.setup_course_and_user(days_till_start=-1, enrollment_mode=CourseMode.AUDIT)
-        block = CourseEndDate(self.course, self.user)
+        course = self.create_course_run(days_till_start=-1)
+        user = self.create_user()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.AUDIT)
+        block = CourseEndDate(course, user)
         self.assertEqual(
             block.description,
             'After this date, course content will be archived.'
@@ -303,8 +327,10 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
         self.assertEqual(block.title, 'Course End')
 
     def test_course_end_date_after_course(self):
-        self.setup_course_and_user(days_till_start=-2, days_till_end=-1)
-        block = CourseEndDate(self.course, self.user)
+        course = self.create_course_run(days_till_start=-2, days_till_end=-1)
+        user = self.create_user()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+        block = CourseEndDate(course, user)
         self.assertEqual(
             block.description,
             'This course is archived, which means you can review course content but it is no longer active.'
@@ -315,25 +341,38 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
         """Verify the block link redirects to ecommerce checkout if it's enabled."""
         sku = 'TESTSKU'
         configuration = CommerceConfiguration.objects.create(checkout_on_ecommerce_service=True)
-        self.setup_course_and_user(sku=sku)
-        block = VerifiedUpgradeDeadlineDate(self.course, self.user)
+        course = self.create_course_run()
+        user = self.create_user()
+        course_mode = CourseMode.objects.get(course_id=course.id, mode_slug=CourseMode.VERIFIED)
+        course_mode.sku = sku
+        course_mode.save()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+
+        block = VerifiedUpgradeDeadlineDate(course, user)
         self.assertEqual(block.link, '{}?sku={}'.format(configuration.MULTIPLE_ITEMS_BASKET_PAGE_URL, sku))
 
     ## VerificationDeadlineDate
     def test_no_verification_deadline(self):
-        self.setup_course_and_user(days_till_start=-1, days_till_verification_deadline=None)
-        block = VerificationDeadlineDate(self.course, self.user)
+        course = self.create_course_run(days_till_start=-1, days_till_verification_deadline=None)
+        user = self.create_user()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+        block = VerificationDeadlineDate(course, user)
         self.assertFalse(block.is_enabled)
 
     def test_no_verified_enrollment(self):
-        self.setup_course_and_user(days_till_start=-1, enrollment_mode=CourseMode.AUDIT)
-        block = VerificationDeadlineDate(self.course, self.user)
+        course = self.create_course_run(days_till_start=-1)
+        user = self.create_user()
+        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.AUDIT)
+        block = VerificationDeadlineDate(course, user)
         self.assertFalse(block.is_enabled)
 
     def test_verification_deadline_date_upcoming(self):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user(days_till_start=-1)
-            block = VerificationDeadlineDate(self.course, self.user)
+            course = self.create_course_run(days_till_start=-1)
+            user = self.create_user()
+            CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+
+            block = VerificationDeadlineDate(course, user)
             self.assertEqual(block.css_class, 'verification-deadline-upcoming')
             self.assertEqual(block.title, 'Verification Deadline')
             self.assertEqual(block.date, datetime.now(utc) + timedelta(days=14))
@@ -342,12 +381,15 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
                 'You must successfully complete verification before this date to qualify for a Verified Certificate.'
             )
             self.assertEqual(block.link_text, 'Verify My Identity')
-            self.assertEqual(block.link, reverse('verify_student_verify_now', args=(self.course.id,)))
+            self.assertEqual(block.link, reverse('verify_student_verify_now', args=(course.id,)))
 
     def test_verification_deadline_date_retry(self):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user(days_till_start=-1, verification_status='denied')
-            block = VerificationDeadlineDate(self.course, self.user)
+            course = self.create_course_run(days_till_start=-1)
+            user = self.create_user(verification_status='denied')
+            CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+
+            block = VerificationDeadlineDate(course, user)
             self.assertEqual(block.css_class, 'verification-deadline-retry')
             self.assertEqual(block.title, 'Verification Deadline')
             self.assertEqual(block.date, datetime.now(utc) + timedelta(days=14))
@@ -360,12 +402,11 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
 
     def test_verification_deadline_date_denied(self):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user(
-                days_till_start=-10,
-                verification_status='denied',
-                days_till_verification_deadline=-1,
-            )
-            block = VerificationDeadlineDate(self.course, self.user)
+            course = self.create_course_run(days_till_start=-10, days_till_verification_deadline=-1)
+            user = self.create_user(verification_status='denied')
+            CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+
+            block = VerificationDeadlineDate(course, user)
             self.assertEqual(block.css_class, 'verification-deadline-passed')
             self.assertEqual(block.title, 'Missed Verification Deadline')
             self.assertEqual(block.date, datetime.now(utc) + timedelta(days=-1))
@@ -383,69 +424,76 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
     @ddt.unpack
     def test_render_date_string_past(self, delta, expected_date_string):
         with freeze_time('2015-01-02'):
-            self.setup_course_and_user(
-                days_till_start=-10,
-                verification_status='denied',
-                days_till_verification_deadline=delta,
-            )
-            block = VerificationDeadlineDate(self.course, self.user)
+            course = self.create_course_run(days_till_start=-10, days_till_verification_deadline=delta)
+            user = self.create_user(verification_status='denied')
+            CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+
+            block = VerificationDeadlineDate(course, user)
             self.assertEqual(block.relative_datestring, expected_date_string)
 
     def create_self_paced_course_run(self, **kwargs):
         defaults = {
-            'enroll_user': False,
             'days_till_upgrade_deadline': 100,
         }
         defaults.update(kwargs)
-        self.setup_course_and_user(**defaults)
-        self.course.self_paced = True
-        self.store.update_item(self.course, self.user.id)
-        overview = CourseOverview.get_from_id(self.course.id)
+
+        course = self.create_course_run(**defaults)
+        course.self_paced = True
+        self.store.update_item(course, None)
+        overview = CourseOverview.get_from_id(course.id)
         self.assertTrue(overview.self_paced)
 
-    def test_date_with_self_paced(self):
-        """ The date returned for self-paced course runs should be dependent on the learner's enrollment date. """
-        global_config = DynamicUpgradeDeadlineConfiguration.objects.create(enabled=True)
+        return course
 
-        # Enrollments made before the course start should use the course start date as the content availability date
-        self.create_self_paced_course_run(days_till_start=3)
-        CourseEnrollmentFactory.create(course_id=self.course.id, user=self.user, mode=CourseMode.AUDIT)
-        block = VerifiedUpgradeDeadlineDate(self.course, self.user)
-        overview = CourseOverview.get_from_id(self.course.id)
-        expected = overview.start + timedelta(days=global_config.deadline_days)
+    def assert_upgrade_deadline(self, course, expected):
+        """ Asserts the VerifiedUpgradeDeadlineDate block's date matches the expected value. """
+        enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
+        block = VerifiedUpgradeDeadlineDate(course, enrollment.user)
         self.assertEqual(block.date, expected)
 
-        # Enrollments made after the course start should use the enrollment date as the content availability date
-        self.create_self_paced_course_run(days_till_start=-1)
-        enrollment = CourseEnrollmentFactory.create(course_id=self.course.id, user=self.user, mode=CourseMode.AUDIT)
-        block = VerifiedUpgradeDeadlineDate(self.course, self.user)
+    def test_date_with_self_paced_with_enrollment_before_course_start(self):
+        """ Enrolling before a course begins should result in the upgrade deadline being set relative to the
+        course start date. """
+        global_config = DynamicUpgradeDeadlineConfiguration.objects.create(enabled=True)
+        course = self.create_self_paced_course_run(days_till_start=3)
+        overview = CourseOverview.get_from_id(course.id)
+        expected = overview.start + timedelta(days=global_config.deadline_days)
+        self.assert_upgrade_deadline(course, expected)
+
+    def test_date_with_self_paced_with_enrollment_after_course_start(self):
+        """ Enrolling after a course begins should result in the upgrade deadline being set relative to the
+        enrollment date. """
+        global_config = DynamicUpgradeDeadlineConfiguration.objects.create(enabled=True)
+        course = self.create_self_paced_course_run(days_till_start=-1)
+        enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
+        block = VerifiedUpgradeDeadlineDate(course, enrollment.user)
         expected = enrollment.created + timedelta(days=global_config.deadline_days)
         self.assertEqual(block.date, expected)
 
         # Courses should be able to override the deadline
         course_config = CourseDynamicUpgradeDeadlineConfiguration.objects.create(
-            enabled=True, course_id=self.course.id, opt_out=False, deadline_days=3
+            enabled=True, course_id=course.id, opt_out=False, deadline_days=3
         )
-        block = VerifiedUpgradeDeadlineDate(self.course, self.user)
+        enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
+        block = VerifiedUpgradeDeadlineDate(course, enrollment.user)
         expected = enrollment.created + timedelta(days=course_config.deadline_days)
         self.assertEqual(block.date, expected)
 
-        # Disabling the functionality should result in the verified mode's expiration date being returned.
-        global_config.enabled = False
-        global_config.save()
-        block = VerifiedUpgradeDeadlineDate(self.course, self.user)
-        expected = CourseMode.objects.get(course_id=self.course.id, mode_slug=CourseMode.VERIFIED).expiration_datetime
-        self.assertEqual(block.date, expected)
+    def test_date_with_self_paced_without_dynamic_upgrade_deadline(self):
+        """ Disabling the dynamic upgrade deadline functionality should result in the verified mode's
+        expiration date being returned. """
+        DynamicUpgradeDeadlineConfiguration.objects.create(enabled=False)
+        course = self.create_self_paced_course_run()
+        expected = CourseMode.objects.get(course_id=course.id, mode_slug=CourseMode.VERIFIED).expiration_datetime
+        self.assert_upgrade_deadline(course, expected)
 
     def test_date_with_self_paced_with_course_opt_out(self):
         """ If the course run has opted out of the dynamic deadline, the course mode's deadline should be used. """
-        self.create_self_paced_course_run(days_till_start=-1)
+        course = self.create_self_paced_course_run(days_till_start=-1)
         DynamicUpgradeDeadlineConfiguration.objects.create(enabled=True)
-        CourseEnrollmentFactory.create(course_id=self.course.id, user=self.user, mode=CourseMode.AUDIT)
+        CourseDynamicUpgradeDeadlineConfiguration.objects.create(enabled=True, course_id=course.id, opt_out=True)
+        enrollment = CourseEnrollmentFactory(course_id=course.id, mode=CourseMode.AUDIT)
 
-        # Opt the course out of the dynamic upgrade deadline
-        CourseDynamicUpgradeDeadlineConfiguration.objects.create(enabled=True, course_id=self.course.id, opt_out=True)
-
-        block = VerifiedUpgradeDeadlineDate(self.course, self.user)
-        expected = CourseMode.objects.get(course_id=self.course.id, mode_slug=CourseMode.VERIFIED).expiration_datetime
+        block = VerifiedUpgradeDeadlineDate(course, enrollment.user)
+        expected = CourseMode.objects.get(course_id=course.id, mode_slug=CourseMode.VERIFIED).expiration_datetime
         self.assertEqual(block.date, expected)
diff --git a/lms/djangoapps/courseware/tests/test_draft_modulestore.py b/lms/djangoapps/courseware/tests/test_draft_modulestore.py
index c2985e4057..dac9675b73 100644
--- a/lms/djangoapps/courseware/tests/test_draft_modulestore.py
+++ b/lms/djangoapps/courseware/tests/test_draft_modulestore.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 
 from xmodule.modulestore.django import modulestore
 
@@ -14,7 +14,7 @@ class TestDraftModuleStore(TestCase):
         store = modulestore()
 
         # fix was to allow get_items() to take the course_id parameter
-        store.get_items(SlashSeparatedCourseKey('a', 'b', 'c'), qualifiers={'category': 'vertical'})
+        store.get_items(CourseKey.from_string('a/b/c'), qualifiers={'category': 'vertical'})
 
         # test success is just getting through the above statement.
         # The bug was that 'course_id' argument was
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index 24f39fd900..3c215bbff2 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -24,7 +24,6 @@ from milestones.tests.utils import MilestonesTestCaseMixin
 from mock import MagicMock, Mock, patch
 from nose.plugins.attrib import attr
 from opaque_keys.edx.keys import CourseKey, UsageKey
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from pyquery import PyQuery
 from xblock.core import XBlock, XBlockAside
 from xblock.field_data import FieldData
@@ -1650,14 +1649,14 @@ class TestAnonymousStudentId(SharedModuleStoreTestCase, LoginEnrollmentTestCase)
             # This value is set by observation, so that later changes to the student
             # id computation don't break old data
             'e3b0b940318df9c14be59acb08e78af5',
-            self._get_anonymous_id(SlashSeparatedCourseKey('MITx', '6.00x', '2012_Fall'), descriptor_class)
+            self._get_anonymous_id(CourseKey.from_string('MITx/6.00x/2012_Fall'), descriptor_class)
         )
 
         self.assertEquals(
             # This value is set by observation, so that later changes to the student
             # id computation don't break old data
             'f82b5416c9f54b5ce33989511bb5ef2e',
-            self._get_anonymous_id(SlashSeparatedCourseKey('MITx', '6.00x', '2013_Spring'), descriptor_class)
+            self._get_anonymous_id(CourseKey.from_string('MITx/6.00x/2013_Spring'), descriptor_class)
         )
 
 
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 4f10ce7677..845256f9b2 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -41,7 +41,8 @@ from lms.djangoapps.grades.config.waffle import ASSUME_ZERO_GRADE_IF_ABSENT
 from milestones.tests.utils import MilestonesTestCaseMixin
 from mock import MagicMock, PropertyMock, create_autospec, patch
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import Location, SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locations import Location
 from openedx.core.djangoapps.catalog.tests.factories import CourseFactory as CatalogCourseFactory
 from openedx.core.djangoapps.catalog.tests.factories import CourseRunFactory, ProgramFactory
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
@@ -86,7 +87,7 @@ class TestJumpTo(ModuleStoreTestCase):
     def setUp(self):
         super(TestJumpTo, self).setUp()
         # Use toy course from XML
-        self.course_key = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        self.course_key = CourseKey.from_string('edX/toy/2012_Fall')
 
     def test_jumpto_invalid_location(self):
         location = self.course_key.make_usage_key(None, 'NoSuchPlace')
@@ -211,8 +212,8 @@ class IndexQueryTestCase(ModuleStoreTestCase):
     NUM_PROBLEMS = 20
 
     @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 10, 144),
-        (ModuleStoreEnum.Type.split, 4, 144),
+        (ModuleStoreEnum.Type.mongo, 10, 146),
+        (ModuleStoreEnum.Type.split, 4, 146),
     )
     @ddt.unpack
     def test_index_query_counts(self, store_type, expected_mongo_query_count, expected_mysql_query_count):
@@ -577,26 +578,6 @@ class ViewsTestCase(ModuleStoreTestCase):
             response = self.client.get(request_url)
             self.assertEqual(response.status_code, 404)
 
-    @override_settings(PAID_COURSE_REGISTRATION_CURRENCY=["USD", "$"])
-    def test_get_cosmetic_display_price(self):
-        """
-        Check that get_cosmetic_display_price() returns the correct price given its inputs.
-        """
-        registration_price = 99
-        self.course.cosmetic_display_price = 10
-        with patch('course_modes.models.CourseMode.min_course_price_for_currency', return_value=registration_price):
-            # Since registration_price is set, it overrides the cosmetic_display_price and should be returned
-            self.assertEqual(views.get_cosmetic_display_price(self.course), "$99")
-
-        registration_price = 0
-        with patch('course_modes.models.CourseMode.min_course_price_for_currency', return_value=registration_price):
-            # Since registration_price is not set, cosmetic_display_price should be returned
-            self.assertEqual(views.get_cosmetic_display_price(self.course), "$10")
-
-        self.course.cosmetic_display_price = 0
-        # Since both prices are not set, there is no price, thus "Free"
-        self.assertEqual(views.get_cosmetic_display_price(self.course), "Free")
-
     def test_jump_to_invalid(self):
         # TODO add a test for invalid location
         # TODO add a test for no data *
@@ -1207,7 +1188,7 @@ class StartDateTests(ModuleStoreTestCase):
     )
     @unittest.skip
     def test_format_localized_in_xml_course(self):
-        response = self.get_about_response(SlashSeparatedCourseKey('edX', 'toy', 'TT_2012_Fall'))
+        response = self.get_about_response(CourseKey.fron_string('edX/toy/TT_2012_Fall'))
         # The start date is set in common/test/data/two_toys/policies/TT_2012_Fall/policy.json
         self.assertContains(response, "2015-JULY-17")
 
@@ -1464,12 +1445,12 @@ class ProgressPageTests(ProgressPageBaseTests):
         """Test that query counts remain the same for self-paced and instructor-paced courses."""
         SelfPacedConfiguration(enabled=self_paced_enabled).save()
         self.setup_course(self_paced=self_paced)
-        with self.assertNumQueries(40, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST), check_mongo_calls(1):
+        with self.assertNumQueries(42, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST), check_mongo_calls(1):
             self._get_progress_page()
 
     @ddt.data(
-        (False, 40, 26),
-        (True, 33, 22)
+        (False, 42, 28),
+        (True, 35, 24)
     )
     @ddt.unpack
     def test_progress_queries(self, enable_waffle, initial, subsequent):
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index cd964dab14..9489ba60f8 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -7,7 +7,7 @@ from unittest import TestCase
 import mock
 from django.core.urlresolvers import reverse
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from lms.djangoapps.lms_xblock.field_data import LmsFieldData
@@ -151,7 +151,7 @@ class TestDraftModuleStore(ModuleStoreTestCase):
         store = modulestore()
 
         # fix was to allow get_items() to take the course_id parameter
-        store.get_items(SlashSeparatedCourseKey('abc', 'def', 'ghi'), qualifiers={'category': 'vertical'})
+        store.get_items(CourseKey.from_string('abc/def/ghi'), qualifiers={'category': 'vertical'})
 
         # test success is just getting through the above statement.
         # The bug was that 'course_id' argument was
diff --git a/lms/djangoapps/courseware/testutils.py b/lms/djangoapps/courseware/testutils.py
index 1374e50a27..91ba8d813a 100644
--- a/lms/djangoapps/courseware/testutils.py
+++ b/lms/djangoapps/courseware/testutils.py
@@ -148,9 +148,9 @@ class RenderXBlockTestMixin(object):
         return response
 
     @ddt.data(
-        ('vertical_block', ModuleStoreEnum.Type.mongo, 14),
+        ('vertical_block', ModuleStoreEnum.Type.mongo, 10),
         ('vertical_block', ModuleStoreEnum.Type.split, 6),
-        ('html_block', ModuleStoreEnum.Type.mongo, 15),
+        ('html_block', ModuleStoreEnum.Type.mongo, 11),
         ('html_block', ModuleStoreEnum.Type.split, 6),
     )
     @ddt.unpack
diff --git a/lms/djangoapps/courseware/views/index.py b/lms/djangoapps/courseware/views/index.py
index c088ae3106..444a6c8531 100644
--- a/lms/djangoapps/courseware/views/index.py
+++ b/lms/djangoapps/courseware/views/index.py
@@ -22,6 +22,7 @@ from web_fragments.fragment import Fragment
 
 from edxmako.shortcuts import render_to_response, render_to_string
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect
+from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
 from lms.djangoapps.gating.api import get_entrance_exam_score_ratio, get_entrance_exam_usage_key
 from lms.djangoapps.grades.new.course_grade_factory import CourseGradeFactory
 from openedx.core.djangoapps.crawlers.models import CrawlersConfig
@@ -34,6 +35,7 @@ from openedx.features.course_experience.views.course_sock import CourseSockFragm
 from openedx.features.enterprise_support.api import data_sharing_consent_required
 from shoppingcart.models import CourseRegistrationCode
 from student.views import is_course_blocked
+from student.models import CourseEnrollment
 from util.views import ensure_valid_course_key
 from xmodule.modulestore.django import modulestore
 from xmodule.x_module import STUDENT_VIEW
@@ -52,8 +54,6 @@ from ..model_data import FieldDataCache
 from ..module_render import get_module_for_descriptor, toc_for_course
 from .views import (
     CourseTabView,
-    check_and_get_upgrade_link,
-    get_cosmetic_verified_display_price
 )
 
 log = logging.getLogger("edx.courseware.views.index")
@@ -325,6 +325,7 @@ class CoursewareIndex(View):
         """
         course_url_name = default_course_url_name(self.course.id)
         course_url = reverse(course_url_name, kwargs={'course_id': unicode(self.course.id)})
+
         courseware_context = {
             'csrf': csrf(self.request)['csrf_token'],
             'course': self.course,
@@ -344,11 +345,14 @@ class CoursewareIndex(View):
             'section_title': None,
             'sequence_title': None,
             'disable_accordion': COURSE_OUTLINE_PAGE_FLAG.is_enabled(self.course.id),
-            # TODO: (Experimental Code). See https://openedx.atlassian.net/wiki/display/RET/2.+In-course+Verification+Prompts
-            'upgrade_link': check_and_get_upgrade_link(request, self.effective_user, self.course.id),
-            'upgrade_price': get_cosmetic_verified_display_price(self.course),
-            # ENDTODO
         }
+        courseware_context.update(
+            get_experiment_user_metadata_context(
+                request,
+                self.course,
+                self.effective_user,
+            )
+        )
         table_of_contents = toc_for_course(
             self.effective_user,
             self.request,
diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index d48f50a088..691792de19 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -14,11 +14,12 @@ import waffle
 from certificates import api as certs_api
 from certificates.models import CertificateStatuses
 from commerce.utils import EcommerceService
-from course_modes.models import CourseMode
+from course_modes.models import (CourseMode, get_course_prices)
 from courseware.access import has_access, has_ccx_coach_role
 from courseware.access_utils import check_course_open_for_learner
 from courseware.courses import (
     can_self_enroll_in_course,
+    course_open_for_self_enrollment,
     get_course,
     get_course_overview_with_access,
     get_course_with_access,
@@ -61,6 +62,7 @@ from ipware.ip import get_ip
 from lms.djangoapps.ccx.custom_exception import CCXLocatorValidationException
 from lms.djangoapps.ccx.utils import prep_course_for_grading
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect, Redirect
+from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
 from lms.djangoapps.grades.new.course_grade_factory import CourseGradeFactory
 from lms.djangoapps.instructor.enrollment import uses_shib
 from lms.djangoapps.instructor.views.api import require_global_staff
@@ -311,6 +313,7 @@ def course_info(request, course_id):
             'request': request,
             'masquerade_user': user,
             'course_id': course_key.to_deprecated_string(),
+            'url_to_enroll': CourseTabView.url_to_enroll(course_key),
             'cache': None,
             'course': course,
             'staff_access': staff_access,
@@ -320,15 +323,15 @@ def course_info(request, course_id):
             'show_enroll_banner': show_enroll_banner,
             'user_is_enrolled': user_is_enrolled,
             'dates_fragment': dates_fragment,
-            'url_to_enroll': CourseTabView.url_to_enroll(course_key),
             'course_tools': course_tools,
-
-            # TODO: (Experimental Code). See https://openedx.atlassian.net/wiki/display/RET/2.+In-course+Verification+Prompts
-            'upgrade_link': check_and_get_upgrade_link(request, user, course.id),
-            'upgrade_price': get_cosmetic_verified_display_price(course),
-            'course_tools': course_tools,
-            # ENDTODO
         }
+        context.update(
+            get_experiment_user_metadata_context(
+                request,
+                course,
+                user,
+            )
+        )
 
         # Get the URL of the user's last position in order to display the 'where you were last' message
         context['resume_course_url'] = None
@@ -348,20 +351,6 @@ def course_info(request, course_id):
 UPGRADE_COOKIE_NAME = 'show_upgrade_notification'
 
 
-# TODO: (Experimental Code). See https://openedx.atlassian.net/wiki/display/RET/2.+In-course+Verification+Prompts
-def check_and_get_upgrade_link(request, user, course_id):
-    upgrade_link = None
-
-    if request.user.is_authenticated():
-        upgrade_data = VerifiedUpgradeDeadlineDate(None, user, course_id=course_id)
-        if upgrade_data.is_enabled:
-            upgrade_link = upgrade_data.link
-            request.need_to_set_upgrade_cookie = True
-
-    return upgrade_link
-# ENDTODO
-
-
 class StaticCourseTabView(EdxFragmentView):
     """
     View that displays a static course tab with a given name.
@@ -461,15 +450,22 @@ class CourseTabView(EdxFragmentView):
                 )
             )
         elif not is_enrolled and not is_staff:
-            PageLevelMessages.register_warning_message(
-                request,
-                Text(_('You must be enrolled in the course to see course content. {enroll_link}.')).format(
-                    enroll_link=HTML('<a href="{url_to_enroll}">{enroll_link_label}</a>').format(
-                        url_to_enroll=CourseTabView.url_to_enroll(course_key),
-                        enroll_link_label=_("Enroll now"),
+            # Only show enroll button if course is open for enrollment.
+            if course_open_for_self_enrollment(course_key):
+                enroll_message = _('You must be enrolled in the course to see course content. \
+                        {enroll_link_start}Enroll now{enroll_link_end}.')
+                PageLevelMessages.register_warning_message(
+                    request,
+                    Text(enroll_message).format(
+                        enroll_link_start=HTML('<button class="enroll-btn btn-link">'),
+                        enroll_link_end=HTML('</button>')
                     )
                 )
-            )
+            else:
+                PageLevelMessages.register_warning_message(
+                    request,
+                    Text(_('You must be enrolled in the course to see course content.'))
+                )
 
     @staticmethod
     def handle_exceptions(request, course, exception):
@@ -521,7 +517,8 @@ class CourseTabView(EdxFragmentView):
             # Disable student view button if user is staff and
             # course is not yet visible to students.
             supports_preview_menu = False
-        return {
+
+        context = {
             'course': course,
             'tab': tab,
             'active_page': tab.get('type', None),
@@ -530,11 +527,15 @@ class CourseTabView(EdxFragmentView):
             'supports_preview_menu': supports_preview_menu,
             'uses_pattern_library': True,
             'disable_courseware_js': True,
-            # TODO: (Experimental Code). See https://openedx.atlassian.net/wiki/display/RET/2.+In-course+Verification+Prompts
-            'upgrade_link': check_and_get_upgrade_link(request, request.user, course.id),
-            'upgrade_price': get_cosmetic_verified_display_price(course),
-            # ENDTODO
         }
+        context.update(
+            get_experiment_user_metadata_context(
+                request,
+                course,
+                request.user,
+            )
+        )
+        return context
 
     def render_to_fragment(self, request, course=None, page_context=None, **kwargs):
         """
@@ -585,59 +586,6 @@ def registered_for_course(course, user):
         return False
 
 
-def get_cosmetic_verified_display_price(course):
-    """
-    Returns the minimum verified cert course price as a string preceded by correct currency, or 'Free'.
-    """
-    return get_course_prices(course, verified_only=True)[1]
-
-
-def get_cosmetic_display_price(course):
-    """
-    Returns the course price as a string preceded by correct currency, or 'Free'.
-    """
-    return get_course_prices(course)[1]
-
-
-def get_course_prices(course, verified_only=False):
-    """
-    Return registration_price and cosmetic_display_prices.
-    registration_price is the minimum price for the course across all course modes.
-    cosmetic_display_prices is the course price as a string preceded by correct currency, or 'Free'.
-    """
-    # Find the
-    if verified_only:
-        registration_price = CourseMode.min_course_price_for_verified_for_currency(
-            course.id,
-            settings.PAID_COURSE_REGISTRATION_CURRENCY[0]
-        )
-    else:
-        registration_price = CourseMode.min_course_price_for_currency(
-            course.id,
-            settings.PAID_COURSE_REGISTRATION_CURRENCY[0]
-        )
-
-    currency_symbol = settings.PAID_COURSE_REGISTRATION_CURRENCY[1]
-
-    if registration_price > 0:
-        price = registration_price
-    # Handle course overview objects which have no cosmetic_display_price
-    elif hasattr(course, 'cosmetic_display_price'):
-        price = course.cosmetic_display_price
-    else:
-        price = None
-
-    if price:
-        # Translators: This will look like '$50', where {currency_symbol} is a symbol such as '$' and {price} is a
-        # numerical amount in that currency. Adjust this display as needed for your language.
-        cosmetic_display_price = _("{currency_symbol}{price}").format(currency_symbol=currency_symbol, price=price)
-    else:
-        # Translators: This refers to the cost of the course. In this case, the course costs nothing so it is free.
-        cosmetic_display_price = _('Free')
-
-    return registration_price, cosmetic_display_price
-
-
 class EnrollStaffView(View):
     """
     Displays view for registering in the course to a global staff user.
@@ -927,7 +875,6 @@ def _progress(request, course_key, student_id):
     grade_summary = course_grade.summary
 
     studio_url = get_studio_url(course, 'settings/grading')
-
     # checking certificate generation configuration
     enrollment_mode, is_active = CourseEnrollment.enrollment_mode_for_user(student, course_key)
 
@@ -943,11 +890,14 @@ def _progress(request, course_key, student_id):
         'passed': is_course_passed(course, grade_summary),
         'credit_course_requirements': _credit_course_requirements(course_key, student),
         'certificate_data': _get_cert_data(student, course, course_key, is_active, enrollment_mode),
-        # TODO: (Experimental Code). See https://openedx.atlassian.net/wiki/display/RET/2.+In-course+Verification+Prompts
-        'upgrade_link': check_and_get_upgrade_link(request, student, course.id),
-        'upgrade_price': get_cosmetic_verified_display_price(course),
-        # ENDTODO
     }
+    context.update(
+        get_experiment_user_metadata_context(
+            request,
+            course,
+            student,
+        )
+    )
 
     with outer_atomic():
         response = render_to_response('courseware/progress.html', context)
diff --git a/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py b/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py
index f45e1d94e7..9bb05a4693 100644
--- a/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py
+++ b/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py
@@ -14,7 +14,7 @@ from django.core.management import call_command
 from django.core.management.base import CommandError
 from django.test.utils import override_settings
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 
 import dashboard.git_import as git_import
 from dashboard.git_import import (
@@ -57,7 +57,7 @@ class TestGitAddCourse(SharedModuleStoreTestCase):
     TEST_REPO = 'https://github.com/mitocw/edx4edx_lite.git'
     TEST_COURSE = 'MITx/edx4edx/edx4edx'
     TEST_BRANCH = 'testing_do_not_delete'
-    TEST_BRANCH_COURSE = SlashSeparatedCourseKey('MITx', 'edx4edx_branch', 'edx4edx')
+    TEST_BRANCH_COURSE = CourseKey.from_string('MITx/edx4edx_branch/edx4edx')
 
     ENABLED_CACHES = ['default', 'mongo_metadata_inheritance', 'loc_cache']
 
@@ -183,7 +183,7 @@ class TestGitAddCourse(SharedModuleStoreTestCase):
                             repo_dir / 'edx4edx_lite',
                             'master')
         self.assertIsNone(def_ms.get_course(self.TEST_BRANCH_COURSE))
-        self.assertIsNotNone(def_ms.get_course(SlashSeparatedCourseKey.from_deprecated_string(self.TEST_COURSE)))
+        self.assertIsNotNone(def_ms.get_course(CourseKey.from_string(self.TEST_COURSE)))
 
     def test_branch_exceptions(self):
         """
diff --git a/lms/djangoapps/dashboard/tests/test_sysadmin.py b/lms/djangoapps/dashboard/tests/test_sysadmin.py
index 0d3322edfe..5ae1eeba19 100644
--- a/lms/djangoapps/dashboard/tests/test_sysadmin.py
+++ b/lms/djangoapps/dashboard/tests/test_sysadmin.py
@@ -16,7 +16,7 @@ from django.test.client import Client
 from django.test.utils import override_settings
 from django.utils.timezone import utc as UTC
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 
 from dashboard.git_import import GitImportErrorNoDir
 from dashboard.models import CourseImportLog
@@ -46,7 +46,7 @@ class SysadminBaseTestCase(SharedModuleStoreTestCase):
 
     TEST_REPO = 'https://github.com/mitocw/edx4edx_lite.git'
     TEST_BRANCH = 'testing_do_not_delete'
-    TEST_BRANCH_COURSE = SlashSeparatedCourseKey('MITx', 'edx4edx_branch', 'edx4edx')
+    TEST_BRANCH_COURSE = CourseKey.from_string('MITx/edx4edx_branch/edx4edx')
 
     def setUp(self):
         """Setup test case by adding primary user."""
@@ -78,7 +78,7 @@ class SysadminBaseTestCase(SharedModuleStoreTestCase):
             course = def_ms.courses.get(course_path, None)
         except AttributeError:
             # Using mongo store
-            course = def_ms.get_course(SlashSeparatedCourseKey('MITx', 'edx4edx', 'edx4edx'))
+            course = def_ms.get_course(CourseKey.from_string('MITx/edx4edx/edx4edx'))
 
         # Delete git loaded course
         response = self.client.post(
@@ -168,11 +168,11 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
         self.assertNotEqual('xml', def_ms.get_modulestore_type(None))
 
         self._add_edx4edx()
-        course = def_ms.get_course(SlashSeparatedCourseKey('MITx', 'edx4edx', 'edx4edx'))
+        course = def_ms.get_course(CourseKey.from_string('MITx/edx4edx/edx4edx'))
         self.assertIsNotNone(course)
 
         self._rm_edx4edx()
-        course = def_ms.get_course(SlashSeparatedCourseKey('MITx', 'edx4edx', 'edx4edx'))
+        course = def_ms.get_course(CourseKey.from_string('MITx/edx4edx/edx4edx'))
         self.assertIsNone(course)
 
     def test_course_info(self):
@@ -301,7 +301,7 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
 
         for _ in xrange(15):
             CourseImportLog(
-                course_id=SlashSeparatedCourseKey("test", "test", "test"),
+                course_id=CourseKey.from_string("test/test/test"),
                 location="location",
                 import_log="import_log",
                 git_log="git_log",
@@ -347,7 +347,7 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
 
         # Add user as staff in course team
         def_ms = modulestore()
-        course = def_ms.get_course(SlashSeparatedCourseKey('MITx', 'edx4edx', 'edx4edx'))
+        course = def_ms.get_course(CourseKey.from_string('MITx/edx4edx/edx4edx'))
         CourseStaffRole(course.id).add_users(self.user)
 
         self.assertTrue(CourseStaffRole(course.id).has_user(self.user))
diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py
index 4a0f126e18..44fc1ef0d1 100644
--- a/lms/djangoapps/discussion/views.py
+++ b/lms/djangoapps/discussion/views.py
@@ -24,6 +24,7 @@ from rest_framework import status
 from web_fragments.fragment import Fragment
 
 import django_comment_client.utils as utils
+from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
 import lms.lib.comment_client as cc
 from courseware.access import has_access
 from courseware.courses import get_course_with_access
@@ -44,7 +45,6 @@ from django_comment_client.utils import (
     strip_none
 )
 from django_comment_common.utils import ThreadContext, get_course_discussion_settings, set_course_discussion_settings
-from lms.djangoapps.courseware.views.views import check_and_get_upgrade_link, get_cosmetic_verified_display_price
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 from student.models import CourseEnrollment
 from util.json_request import JsonResponse, expect_json
@@ -481,13 +481,16 @@ def _create_discussion_board_context(request, base_context, thread=None):
         'category_map': course_settings["category_map"],
         'course_settings': course_settings,
         'is_commentable_divided': is_commentable_divided(course_key, discussion_id, course_discussion_settings),
-        # TODO: (Experimental Code). See https://openedx.atlassian.net/wiki/display/RET/2.+In-course+Verification+Prompts
-        'upgrade_link': check_and_get_upgrade_link(request, user, course.id),
-        'upgrade_price': get_cosmetic_verified_display_price(course),
-        # ENDTODO
         # If the default topic id is None the front-end code will look for a topic that contains "General"
         'discussion_default_topic_id': _get_discussion_default_topic_id(course),
     })
+    context.update(
+        get_experiment_user_metadata_context(
+            request,
+            course,
+            user,
+        )
+    )
     return context
 
 
diff --git a/lms/djangoapps/email_marketing/migrations/0007_auto_20170809_0653.py b/lms/djangoapps/email_marketing/migrations/0007_auto_20170809_0653.py
new file mode 100644
index 0000000000..e99d25e163
--- /dev/null
+++ b/lms/djangoapps/email_marketing/migrations/0007_auto_20170809_0653.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('email_marketing', '0006_auto_20170711_0615'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emailmarketingconfiguration',
+            name='sailthru_welcome_template',
+            field=models.CharField(help_text='Sailthru template to use on welcome send.', max_length=20, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='emailmarketingconfiguration',
+            name='sailthru_activation_template',
+            field=models.CharField(help_text='DEPRECATED: use sailthru_welcome_template instead.', max_length=20, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='emailmarketingconfiguration',
+            name='welcome_email_send_delay',
+            field=models.IntegerField(default=600, help_text='Number of seconds to delay the sending of User Welcome email after user has been created'),
+        ),
+    ]
diff --git a/lms/djangoapps/email_marketing/migrations/0008_auto_20170809_0539.py b/lms/djangoapps/email_marketing/migrations/0008_auto_20170809_0539.py
new file mode 100644
index 0000000000..c4c580b867
--- /dev/null
+++ b/lms/djangoapps/email_marketing/migrations/0008_auto_20170809_0539.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def migrate_data_forwards(apps, schema_editor):
+    EmailMarketingConfiguration = apps.get_model('email_marketing', 'EmailMarketingConfiguration')
+    EmailMarketingConfiguration.objects.all().update(
+        sailthru_welcome_template=models.F('sailthru_activation_template')
+    )
+
+
+def migrate_data_backwards(apps, schema_editor):
+    # Just copying old field's value to new one in forward migration, so nothing needed here.
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('email_marketing', '0007_auto_20170809_0653'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_data_forwards, migrate_data_backwards)
+    ]
diff --git a/lms/djangoapps/email_marketing/models.py b/lms/djangoapps/email_marketing/models.py
index 8aa182047d..224fcfebbd 100644
--- a/lms/djangoapps/email_marketing/models.py
+++ b/lms/djangoapps/email_marketing/models.py
@@ -51,7 +51,15 @@ class EmailMarketingConfiguration(ConfigurationModel):
         max_length=20,
         blank=True,
         help_text=_(
-            "Sailthru template to use on activation send. "
+            "DEPRECATED: use sailthru_welcome_template instead."
+        )
+    )
+
+    sailthru_welcome_template = models.fields.CharField(
+        max_length=20,
+        blank=True,
+        help_text=_(
+            "Sailthru template to use on welcome send."
         )
     )
 
@@ -132,7 +140,7 @@ class EmailMarketingConfiguration(ConfigurationModel):
     welcome_email_send_delay = models.fields.IntegerField(
         default=600,
         help_text=_(
-            "Number of seconds to delay the sending of User Welcome email after user has been activated"
+            "Number of seconds to delay the sending of User Welcome email after user has been created"
         )
     )
 
@@ -145,5 +153,5 @@ class EmailMarketingConfiguration(ConfigurationModel):
     )
 
     def __unicode__(self):
-        return u"Email marketing configuration: New user list %s, Activation template: %s" % \
-               (self.sailthru_new_user_list, self.sailthru_activation_template)
+        return u"Email marketing configuration: New user list %s, Welcome template: %s" % \
+               (self.sailthru_new_user_list, self.sailthru_welcome_template)
diff --git a/lms/djangoapps/email_marketing/signals.py b/lms/djangoapps/email_marketing/signals.py
index 80a29f0bfe..745de42748 100644
--- a/lms/djangoapps/email_marketing/signals.py
+++ b/lms/djangoapps/email_marketing/signals.py
@@ -149,9 +149,9 @@ def email_marketing_user_field_changed(sender, user=None, table=None, setting=No
         if not email_config.enabled:
             return
 
-        # perform update asynchronously, flag if activation
+        # perform update asynchronously
         update_user.delay(_create_sailthru_user_vars(user, user.profile), user.email, site=_get_current_site(),
-                          new_user=False, activation=(setting == 'is_active') and new_value is True)
+                          new_user=False)
 
     elif setting == 'email':
         # email update is special case
diff --git a/lms/djangoapps/email_marketing/tasks.py b/lms/djangoapps/email_marketing/tasks.py
index a6e952e515..a0d4b254b4 100644
--- a/lms/djangoapps/email_marketing/tasks.py
+++ b/lms/djangoapps/email_marketing/tasks.py
@@ -59,14 +59,13 @@ def get_email_cookies_via_sailthru(self, user_email, post_parms):
 
 # pylint: disable=not-callable
 @task(bind=True, default_retry_delay=3600, max_retries=24)
-def update_user(self, sailthru_vars, email, site=None, new_user=False, activation=False):
+def update_user(self, sailthru_vars, email, site=None, new_user=False):
     """
     Adds/updates Sailthru profile information for a user.
      Args:
         sailthru_vars(dict): User profile information to pass as 'vars' to Sailthru
         email(str): User email address
         new_user(boolean): True if new registration
-        activation(boolean): True if activation request
     Returns:
         None
     """
@@ -95,15 +94,15 @@ def update_user(self, sailthru_vars, email, site=None, new_user=False, activatio
                              max_retries=email_config.sailthru_max_retries)
         return
 
-    # if activating user, send welcome email
-    if activation and email_config.sailthru_activation_template:
+    # if new user, send welcome email
+    if new_user and email_config.sailthru_welcome_template:
         scheduled_datetime = datetime.utcnow() + timedelta(seconds=email_config.welcome_email_send_delay)
         try:
             sailthru_response = sailthru_client.api_post(
                 "send",
                 {
                     "email": email,
-                    "template": email_config.sailthru_activation_template,
+                    "template": email_config.sailthru_welcome_template,
                     "schedule_time": scheduled_datetime.strftime('%Y-%m-%dT%H:%M:%SZ')
                 }
             )
diff --git a/lms/djangoapps/email_marketing/tests/test_signals.py b/lms/djangoapps/email_marketing/tests/test_signals.py
index 2bf28791a6..62b44ccabc 100644
--- a/lms/djangoapps/email_marketing/tests/test_signals.py
+++ b/lms/djangoapps/email_marketing/tests/test_signals.py
@@ -41,7 +41,7 @@ TEST_EMAIL = "test@edx.org"
 
 
 def update_email_marketing_config(enabled=True, key='badkey', secret='badsecret', new_user_list='new list',
-                                  template='Activation', enroll_cost=100, lms_url_override='http://testserver'):
+                                  template='Welcome', enroll_cost=100, lms_url_override='http://testserver'):
     """
     Enable / Disable Sailthru integration
     """
@@ -50,7 +50,7 @@ def update_email_marketing_config(enabled=True, key='badkey', secret='badsecret'
         sailthru_key=key,
         sailthru_secret=secret,
         sailthru_new_user_list=new_user_list,
-        sailthru_activation_template=template,
+        sailthru_welcome_template=template,
         sailthru_enroll_template='enroll_template',
         sailthru_lms_url_override=lms_url_override,
         sailthru_get_tags_from_sailthru=False,
@@ -175,7 +175,7 @@ class EmailMarketingTests(TestCase):
     @patch('email_marketing.tasks.SailthruClient.api_get')
     def test_add_user(self, mock_sailthru_get, mock_sailthru_post, mock_log_error):
         """
-        test async method in tasks that actually updates Sailthru
+        test async method in tasks that actually updates Sailthru and send Welcome template.
         """
         site_dict = {'id': self.site.id, 'domain': self.site.domain, 'name': self.site.name}
         mock_sailthru_post.return_value = SailthruResponse(JsonResponse({'ok': True}))
@@ -183,15 +183,13 @@ class EmailMarketingTests(TestCase):
         update_user.delay(
             {'gender': 'm', 'username': 'test', 'activated': 1}, TEST_EMAIL, site_dict, new_user=True
         )
+        expected_schedule = datetime.datetime.utcnow() + datetime.timedelta(seconds=600)
         self.assertFalse(mock_log_error.called)
-        self.assertEquals(mock_sailthru_post.call_args[0][0], "user")
+        self.assertEquals(mock_sailthru_post.call_args[0][0], "send")
         userparms = mock_sailthru_post.call_args[0][1]
-        self.assertEquals(userparms['key'], "email")
-        self.assertEquals(userparms['id'], TEST_EMAIL)
-        self.assertEquals(userparms['vars']['gender'], "m")
-        self.assertEquals(userparms['vars']['username'], "test")
-        self.assertEquals(userparms['vars']['activated'], 1)
-        self.assertEquals(userparms['lists']['new list'], 1)
+        self.assertEquals(userparms['email'], TEST_EMAIL)
+        self.assertEquals(userparms['template'], "Welcome")
+        self.assertEquals(userparms['schedule_time'], expected_schedule.strftime('%Y-%m-%dT%H:%M:%SZ'))
 
     @patch('email_marketing.tasks.SailthruClient.api_post')
     @patch('email_marketing.tasks.SailthruClient.api_get')
@@ -199,6 +197,8 @@ class EmailMarketingTests(TestCase):
         """
         test non existing domain name updates Sailthru user lists with default list
         """
+        # Set template to empty string to disable 2nd post call to Sailthru
+        update_email_marketing_config(template='')
         existing_site = Site.objects.create(domain='testing.com', name='testing.com')
         site_dict = {'id': existing_site.id, 'domain': existing_site.domain, 'name': existing_site.name}
         mock_sailthru_post.return_value = SailthruResponse(JsonResponse({'ok': True}))
@@ -216,18 +216,16 @@ class EmailMarketingTests(TestCase):
     @patch('email_marketing.tasks.SailthruClient.api_get')
     def test_user_activation(self, mock_sailthru_get, mock_sailthru_post):
         """
-        test send of activation template
+        Test that welcome template not sent if not new user.
         """
         mock_sailthru_post.return_value = SailthruResponse(JsonResponse({'ok': True}))
         mock_sailthru_get.return_value = SailthruResponse(JsonResponse({'lists': [{'name': 'new list'}], 'ok': True}))
-        expected_schedule = datetime.datetime.utcnow() + datetime.timedelta(seconds=600)
-        update_user.delay({}, self.user.email, new_user=True, activation=True)
+        update_user.delay({}, self.user.email, new_user=False)
         # look for call args for 2nd call
-        self.assertEquals(mock_sailthru_post.call_args[0][0], "send")
+        self.assertEquals(mock_sailthru_post.call_args[0][0], "user")
         userparms = mock_sailthru_post.call_args[0][1]
-        self.assertEquals(userparms['email'], TEST_EMAIL)
-        self.assertEquals(userparms['template'], "Activation")
-        self.assertEquals(userparms['schedule_time'], expected_schedule.strftime('%Y-%m-%dT%H:%M:%SZ'))
+        self.assertIsNone(userparms.get('email'))
+        self.assertIsNone(userparms.get('template'))
 
     @patch('email_marketing.tasks.log.error')
     @patch('email_marketing.tasks.SailthruClient.api_post')
@@ -248,14 +246,14 @@ class EmailMarketingTests(TestCase):
         # force Sailthru API exception on 2nd call
         mock_log_error.reset_mock()
         mock_sailthru.side_effect = [SailthruResponse(JsonResponse({'ok': True})), SailthruClientError]
-        update_user.delay({}, self.user.email, activation=True)
+        update_user.delay({}, self.user.email, new_user=True)
         self.assertTrue(mock_log_error.called)
 
         # force Sailthru API error return on 2nd call
         mock_log_error.reset_mock()
         mock_sailthru.side_effect = [SailthruResponse(JsonResponse({'ok': True})),
                                      SailthruResponse(JsonResponse({'error': 100, 'errormsg': 'Got an error'}))]
-        update_user.delay({}, self.user.email, activation=True)
+        update_user.delay({}, self.user.email, new_user=True)
         self.assertTrue(mock_log_error.called)
 
     @patch('email_marketing.tasks.update_user.retry')
diff --git a/lms/djangoapps/experiments/utils.py b/lms/djangoapps/experiments/utils.py
new file mode 100644
index 0000000000..cbd45b238d
--- /dev/null
+++ b/lms/djangoapps/experiments/utils.py
@@ -0,0 +1,50 @@
+from student.models import CourseEnrollment
+from course_modes.models import (
+    get_cosmetic_verified_display_price
+)
+from courseware.date_summary import (
+    VerifiedUpgradeDeadlineDate
+)
+
+
+def check_and_get_upgrade_link(request, user, course_id):
+    """
+    For an authenticated user, return a link to allow them to upgrade
+    in the specified course.
+    """
+    if request.user.is_authenticated():
+        upgrade_data = VerifiedUpgradeDeadlineDate(None, user, course_id=course_id)
+        if upgrade_data.is_enabled:
+            request.need_to_set_upgrade_cookie = True
+            return upgrade_data
+
+    return None
+
+
+def get_experiment_user_metadata_context(request, course, user):
+    """
+    Return a context dictionary with the keys used by the user_metadata.html.
+    """
+    enrollment_mode = None
+    enrollment_time = None
+    try:
+        enrollment = CourseEnrollment.objects.get(user_id=user.id, course_id=course.id)
+        if enrollment.is_active:
+            enrollment_mode = enrollment.mode
+            enrollment_time = enrollment.created
+    except CourseEnrollment.DoesNotExist:
+        pass  # Not enrolled, used the default None values
+
+    upgrade_data = check_and_get_upgrade_link(request, user, course.id)
+
+    return {
+        'upgrade_link': upgrade_data and upgrade_data.link,
+        'upgrade_price': get_cosmetic_verified_display_price(course),
+        'enrollment_mode': enrollment_mode,
+        'enrollment_time': enrollment_time,
+        'pacing_type': 'self_paced' if course.self_paced else 'instructor_paced',
+        'upgrade_deadline': upgrade_data and upgrade_data.date,
+        'course_key': course.id,
+        'course_start': course.start,
+        'course_end': course.end,
+    }
diff --git a/lms/djangoapps/grades/config/waffle.py b/lms/djangoapps/grades/config/waffle.py
index 6453a75e97..5029ff3c88 100644
--- a/lms/djangoapps/grades/config/waffle.py
+++ b/lms/djangoapps/grades/config/waffle.py
@@ -11,6 +11,7 @@ WAFFLE_NAMESPACE = u'grades'
 WRITE_ONLY_IF_ENGAGED = u'write_only_if_engaged'
 ASSUME_ZERO_GRADE_IF_ABSENT = u'assume_zero_grade_if_absent'
 ESTIMATE_FIRST_ATTEMPTED = u'estimate_first_attempted'
+DISABLE_REGRADE_ON_POLICY_CHANGE = u'disable_regrade_on_policy_change'
 
 # Course Flags
 REJECTED_EXAM_OVERRIDES_GRADE = u'rejected_exam_overrides_grade'
diff --git a/lms/djangoapps/grades/new/course_grade_factory.py b/lms/djangoapps/grades/new/course_grade_factory.py
index 4ffe091b79..68ea2bd3d7 100644
--- a/lms/djangoapps/grades/new/course_grade_factory.py
+++ b/lms/djangoapps/grades/new/course_grade_factory.py
@@ -154,7 +154,7 @@ class CourseGradeFactory(object):
         """
         Returns a ZeroCourseGrade object for the given user and course.
         """
-        log.info(u'Grades: CreateZero, %s, User: %s', unicode(course_data), user.id)
+        log.debug(u'Grades: CreateZero, %s, User: %s', unicode(course_data), user.id)
         return ZeroCourseGrade(user, course_data)
 
     @staticmethod
diff --git a/lms/djangoapps/grades/new/subsection_grade.py b/lms/djangoapps/grades/new/subsection_grade.py
index ff767bf5f7..13fa42149f 100644
--- a/lms/djangoapps/grades/new/subsection_grade.py
+++ b/lms/djangoapps/grades/new/subsection_grade.py
@@ -33,9 +33,6 @@ class SubsectionGradeBase(object):
         self.course_version = getattr(subsection, 'course_version', None)
         self.subtree_edited_timestamp = getattr(subsection, 'subtree_edited_on', None)
 
-        self.graded_total = None  # aggregated grade for all graded problems
-        self.all_total = None  # aggregated grade for all problems, regardless of whether they are graded
-
         self.override = None
 
     @property
@@ -65,10 +62,20 @@ class ZeroSubsectionGrade(SubsectionGradeBase):
 
     def __init__(self, subsection, course_data):
         super(ZeroSubsectionGrade, self).__init__(subsection)
-        self.graded_total = AggregatedScore(tw_earned=0, tw_possible=None, graded=False, first_attempted=None)
-        self.all_total = AggregatedScore(tw_earned=0, tw_possible=None, graded=self.graded, first_attempted=None)
         self.course_data = course_data
 
+    @property
+    def all_total(self):
+        return self._aggregate_scores[0]
+
+    @property
+    def graded_total(self):
+        return self._aggregate_scores[1]
+
+    @lazy
+    def _aggregate_scores(self):
+        return graders.aggregate_scores(self.problem_scores.values())
+
     @lazy
     def problem_scores(self):
         """
diff --git a/lms/djangoapps/grades/signals/handlers.py b/lms/djangoapps/grades/signals/handlers.py
index 59874b6b00..84bec121f3 100644
--- a/lms/djangoapps/grades/signals/handlers.py
+++ b/lms/djangoapps/grades/signals/handlers.py
@@ -233,12 +233,6 @@ def enqueue_subsection_update(sender, **kwargs):  # pylint: disable=unused-argum
         ),
         countdown=RECALCULATE_GRADE_DELAY,
     )
-    log.info(
-        u'Grades: Request async calculation of subsection grades with args: {}. Task [{}]'.format(
-            ', '.join('{}:{}'.format(arg, kwargs[arg]) for arg in sorted(kwargs)),
-            getattr(result, 'id', 'N/A'),
-        )
-    )
 
 
 @receiver(SUBSECTION_SCORE_CHANGED)
diff --git a/lms/djangoapps/grades/tasks.py b/lms/djangoapps/grades/tasks.py
index b107a847cb..073065068a 100644
--- a/lms/djangoapps/grades/tasks.py
+++ b/lms/djangoapps/grades/tasks.py
@@ -26,7 +26,7 @@ from track.event_transaction_utils import set_event_transaction_id, set_event_tr
 from util.date_utils import from_timestamp
 from xmodule.modulestore.django import modulestore
 
-from .config.waffle import ESTIMATE_FIRST_ATTEMPTED, waffle
+from .config.waffle import ESTIMATE_FIRST_ATTEMPTED, DISABLE_REGRADE_ON_POLICY_CHANGE, waffle
 from .constants import ScoreDatabaseTableEnum
 from .exceptions import DatabaseNotReadyError
 from .new.course_grade_factory import CourseGradeFactory
@@ -59,14 +59,19 @@ def compute_all_grades_for_course(**kwargs):
     Kicks off a series of compute_grades_for_course_v2 tasks
     to cover all of the students in the course.
     """
-    course_key = CourseKey.from_string(kwargs.pop('course_key'))
-    for course_key_string, offset, batch_size in _course_task_args(course_key=course_key, **kwargs):
-        kwargs.update({
-            'course_key': course_key_string,
-            'offset': offset,
-            'batch_size': batch_size,
-        })
-        compute_grades_for_course_v2.apply_async(kwargs=kwargs, routing_key=settings.POLICY_CHANGE_GRADES_ROUTING_KEY)
+    if waffle().is_enabled(DISABLE_REGRADE_ON_POLICY_CHANGE):
+        log.debug('Grades: ignoring policy change regrade due to waffle switch')
+    else:
+        course_key = CourseKey.from_string(kwargs.pop('course_key'))
+        for course_key_string, offset, batch_size in _course_task_args(course_key=course_key, **kwargs):
+            kwargs.update({
+                'course_key': course_key_string,
+                'offset': offset,
+                'batch_size': batch_size,
+            })
+            compute_grades_for_course_v2.apply_async(
+                kwargs=kwargs, routing_key=settings.POLICY_CHANGE_GRADES_ROUTING_KEY
+            )
 
 
 @task(base=_BaseTask, bind=True, default_retry_delay=30, max_retries=1)
diff --git a/lms/djangoapps/grades/tests/test_new.py b/lms/djangoapps/grades/tests/test_new.py
index 5c1d07ce01..cd4d405724 100644
--- a/lms/djangoapps/grades/tests/test_new.py
+++ b/lms/djangoapps/grades/tests/test_new.py
@@ -727,10 +727,6 @@ class TestCourseGradeLogging(ProblemSubmissionTestMixin, SharedModuleStoreTestCa
             enabled_for_course=True
         ):
             with patch('lms.djangoapps.grades.new.course_grade_factory.log') as log_mock:
-                # returns Zero when no grade, with ASSUME_ZERO_GRADE_IF_ABSENT
-                with waffle().override(ASSUME_ZERO_GRADE_IF_ABSENT, active=True):
-                    self._create_course_grade_and_check_logging(grade_factory.create, log_mock.info, u'CreateZero')
-
                 # read, but not persisted
                 self._create_course_grade_and_check_logging(grade_factory.create, log_mock.info, u'Update')
 
@@ -742,3 +738,48 @@ class TestCourseGradeLogging(ProblemSubmissionTestMixin, SharedModuleStoreTestCa
 
                 # read from persistence, using read
                 self._create_course_grade_and_check_logging(grade_factory.read, log_mock.debug, u'Read')
+
+
+class TestCourseGradeFactory(GradeTestBase):
+    def test_course_grade_summary(self):
+        with mock_get_score(1, 2):
+            self.subsection_grade_factory.update(self.course_structure[self.sequence.location])
+        course_grade = CourseGradeFactory().update(self.request.user, self.course)
+
+        actual_summary = course_grade.summary
+
+        # We should have had a zero subsection grade for sequential 2, since we never
+        # gave it a mock score above.
+        expected_summary = {
+            'grade': None,
+            'grade_breakdown': {
+                'Homework': {
+                    'category': 'Homework',
+                    'percent': 0.25,
+                    'detail': 'Homework = 25.00% of a possible 100.00%',
+                }
+            },
+            'percent': 0.25,
+            'section_breakdown': [
+                {
+                    'category': 'Homework',
+                    'detail': u'Homework 1 - Test Sequential 1 - 50% (1/2)',
+                    'label': u'HW 01',
+                    'percent': 0.5
+                },
+                {
+                    'category': 'Homework',
+                    'detail': u'Homework 2 - Test Sequential 2 - 0% (0/1)',
+                    'label': u'HW 02',
+                    'percent': 0.0
+                },
+                {
+                    'category': 'Homework',
+                    'detail': u'Homework Average = 25%',
+                    'label': u'HW Avg',
+                    'percent': 0.25,
+                    'prominent': True
+                },
+            ]
+        }
+        self.assertEqual(expected_summary, actual_summary)
diff --git a/lms/djangoapps/grades/tests/test_signals.py b/lms/djangoapps/grades/tests/test_signals.py
index dfaca5dd4c..58890f8276 100644
--- a/lms/djangoapps/grades/tests/test_signals.py
+++ b/lms/djangoapps/grades/tests/test_signals.py
@@ -197,28 +197,6 @@ class ScoreChangedSignalRelayTest(TestCase):
         expected_set_kwargs['score_deleted'] = False
         self.signal_mock.assert_called_with(**expected_set_kwargs)
 
-    @patch('lms.djangoapps.grades.signals.handlers.log.info')
-    def test_subsection_update_logging(self, mocklog):
-        enqueue_subsection_update(
-            sender='test',
-            user_id=1,
-            course_id=u'course-v1:edX+Demo_Course+DemoX',
-            usage_id=u'block-v1:block-key',
-            modified=FROZEN_NOW_DATETIME,
-            score_db_table=ScoreDatabaseTableEnum.courseware_student_module,
-        )
-        log_statement = mocklog.call_args[0][0]
-        log_statement = UUID_REGEX.sub(u'*UUID*', log_statement)
-        self.assertEqual(
-            log_statement,
-            (
-                u'Grades: Request async calculation of subsection grades with args: '
-                u'course_id:course-v1:edX+Demo_Course+DemoX, modified:{time}, '
-                u'score_db_table:csm, '
-                u'usage_id:block-v1:block-key, user_id:1. Task [*UUID*]'
-            ).format(time=FROZEN_NOW_DATETIME)
-        )
-
     @ddt.data(
         [score_set, 'lms.djangoapps.grades.signals.handlers.submissions_score_set_handler', SUBMISSION_SET_KWARGS],
         [score_reset, 'lms.djangoapps.grades.signals.handlers.submissions_score_reset_handler', SUBMISSION_RESET_KWARGS]
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index ba07cbade0..f731629620 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _
 from mock import Mock, patch
 from nose.plugins.attrib import attr
 from nose.tools import raises
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import UsageKey
 
 import lms.djangoapps.instructor.views.api
@@ -52,7 +52,11 @@ from lms.djangoapps.instructor.views.api import (
     generate_unique_password,
     require_finance_admin
 )
-from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError
+from lms.djangoapps.instructor_task.api_helper import (
+    AlreadyRunningError,
+    QueueConnectionError,
+    generate_already_running_error_message
+)
 from openedx.core.djangoapps.course_groups.cohorts import set_course_cohorted
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
@@ -143,6 +147,7 @@ REPORTS_DATA = (
 EXECUTIVE_SUMMARY_DATA = (
     {
         'report_type': 'executive summary',
+        'task_type': 'exec_summary_report',
         'instructor_api_endpoint': 'get_exec_summary_report',
         'task_api_endpoint': 'lms.djangoapps.instructor_task.api.submit_executive_summary_report',
         'extra_instructor_api_kwargs': {}
@@ -244,7 +249,16 @@ def view_alreadyrunningerror(request):  # pylint: disable=unused-argument
     raise AlreadyRunningError()
 
 
+@common_exceptions_400
+def view_queue_connection_error(request):  # pylint: disable=unused-argument
+    """
+    A dummy view that raises a QueueConnectionError exception.
+    """
+    raise QueueConnectionError()
+
+
 @attr(shard=1)
+@ddt.ddt
 class TestCommonExceptions400(TestCase):
     """
     Testing the common_exceptions_400 decorator.
@@ -269,21 +283,29 @@ class TestCommonExceptions400(TestCase):
         self.request.is_ajax.return_value = True
         resp = view_user_doesnotexist(self.request)  # pylint: disable=assignment-from-no-return
         self.assertEqual(resp.status_code, 400)
-        result = json.loads(resp.content)
-        self.assertIn("User does not exist", result["error"])
+        self.assertIn("User does not exist", resp.content)
 
     def test_alreadyrunningerror(self):
         self.request.is_ajax.return_value = False
         resp = view_alreadyrunningerror(self.request)  # pylint: disable=assignment-from-no-return
         self.assertEqual(resp.status_code, 400)
-        self.assertIn("Task is already running", resp.content)
+        self.assertIn("Requested task is already running", resp.content)
 
     def test_alreadyrunningerror_ajax(self):
         self.request.is_ajax.return_value = True
         resp = view_alreadyrunningerror(self.request)  # pylint: disable=assignment-from-no-return
         self.assertEqual(resp.status_code, 400)
-        result = json.loads(resp.content)
-        self.assertIn("Task is already running", result["error"])
+        self.assertIn("Requested task is already running", resp.content)
+
+    @ddt.data(True, False)
+    def test_queue_connection_error(self, is_ajax):
+        """
+        Tests that QueueConnectionError exception is handled in common_exception_400.
+        """
+        self.request.is_ajax.return_value = is_ajax
+        resp = view_queue_connection_error(self.request)  # pylint: disable=assignment-from-no-return
+        self.assertEqual(resp.status_code, 400)
+        self.assertIn('Error occured. Please try again later', resp.content)
 
 
 @attr(shard=1)
@@ -401,6 +423,7 @@ class TestInstructorAPIDenyLevels(SharedModuleStoreTestCase, LoginEnrollmentTest
             ('get_proctored_exam_results', {}),
             ('get_problem_responses', {}),
             ('export_ora2_data', {}),
+
         ]
         # Endpoints that only Instructors can access
         self.instructor_level_endpoints = [
@@ -2680,14 +2703,15 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
             'get_problem_responses',
             kwargs={'course_id': unicode(self.course.id)}
         )
-
+        task_type = 'problem_responses_csv'
+        already_running_status = generate_already_running_error_message(task_type)
         with patch('lms.djangoapps.instructor_task.api.submit_calculate_problem_responses_csv') as submit_task_function:
-            error = AlreadyRunningError()
+            error = AlreadyRunningError(already_running_status)
             submit_task_function.side_effect = error
             response = self.client.post(url, {})
-            res_json = json.loads(response.content)
-            self.assertIn('status', res_json)
-            self.assertIn('already in progress', res_json['status'])
+
+        self.assertEqual(response.status_code, 400)
+        self.assertIn(already_running_status, response.content)
 
     def test_get_students_features(self):
         """
@@ -2757,17 +2781,16 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
         )
         # Successful case:
         response = self.client.post(url, {})
-        res_json = json.loads(response.content)
-        self.assertIn('status', res_json)
-        self.assertNotIn('currently being created', res_json['status'])
+        self.assertEqual(response.status_code, 200)
         # CSV generation already in progress:
+        task_type = 'may_enroll_info_csv'
+        already_running_status = generate_already_running_error_message(task_type)
         with patch('lms.djangoapps.instructor_task.api.submit_calculate_may_enroll_csv') as submit_task_function:
-            error = AlreadyRunningError()
+            error = AlreadyRunningError(already_running_status)
             submit_task_function.side_effect = error
             response = self.client.post(url, {})
-            res_json = json.loads(response.content)
-            self.assertIn('status', res_json)
-            self.assertIn('currently being created', res_json['status'])
+        self.assertEqual(response.status_code, 400)
+        self.assertIn(already_running_status, response.content)
 
     def test_get_student_exam_results(self):
         """
@@ -2778,19 +2801,19 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
             'get_proctored_exam_results',
             kwargs={'course_id': unicode(self.course.id)}
         )
+
         # Successful case:
         response = self.client.post(url, {})
-        res_json = json.loads(response.content)
-        self.assertIn('status', res_json)
-        self.assertNotIn('currently being created', res_json['status'])
+        self.assertEqual(response.status_code, 200)
         # CSV generation already in progress:
+        task_type = 'proctored_exam_results_report'
+        already_running_status = generate_already_running_error_message(task_type)
         with patch('lms.djangoapps.instructor_task.api.submit_proctored_exam_results_report') as submit_task_function:
-            error = AlreadyRunningError()
+            error = AlreadyRunningError(already_running_status)
             submit_task_function.side_effect = error
             response = self.client.post(url, {})
-            res_json = json.loads(response.content)
-            self.assertIn('status', res_json)
-            self.assertIn('currently being created', res_json['status'])
+            self.assertEqual(response.status_code, 400)
+            self.assertIn(already_running_status, response.content)
 
     def test_access_course_finance_admin_with_invalid_course_key(self):
         """
@@ -3045,10 +3068,11 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
     def test_executive_summary_report_success(
             self,
             report_type,
+            task_type,
             instructor_api_endpoint,
             task_api_endpoint,
             extra_instructor_api_kwargs
-    ):
+    ):  # pylint: disable=unused-argument
         kwargs = {'course_id': unicode(self.course.id)}
         kwargs.update(extra_instructor_api_kwargs)
         url = reverse(instructor_api_endpoint, kwargs=kwargs)
@@ -3066,6 +3090,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
     def test_executive_summary_report_already_running(
             self,
             report_type,
+            task_type,
             instructor_api_endpoint,
             task_api_endpoint,
             extra_instructor_api_kwargs
@@ -3075,14 +3100,12 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
         url = reverse(instructor_api_endpoint, kwargs=kwargs)
 
         CourseFinanceAdminRole(self.course.id).add_users(self.instructor)
+        already_running_status = generate_already_running_error_message(task_type)
         with patch(task_api_endpoint) as mock:
-            mock.side_effect = AlreadyRunningError()
+            mock.side_effect = AlreadyRunningError(already_running_status)
             response = self.client.post(url, {})
-        already_running_status = "The {report_type} report is currently being created." \
-                                 " To view the status of the report, see Pending Tasks below." \
-                                 " You will be able to download the report" \
-                                 " when it is" \
-                                 " complete.".format(report_type=report_type)
+
+        self.assertEqual(response.status_code, 400)
         self.assertIn(already_running_status, response.content)
 
     def test_get_ora2_responses_success(self):
@@ -3091,16 +3114,19 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
         with patch('lms.djangoapps.instructor_task.api.submit_export_ora2_data') as mock_submit_ora2_task:
             mock_submit_ora2_task.return_value = True
             response = self.client.post(url, {})
-        success_status = "The ORA data report is being generated."
+        success_status = "The ORA data report is being created."
         self.assertIn(success_status, response.content)
 
     def test_get_ora2_responses_already_running(self):
         url = reverse('export_ora2_data', kwargs={'course_id': unicode(self.course.id)})
+        task_type = 'export_ora2_data'
+        already_running_status = generate_already_running_error_message(task_type)
 
         with patch('lms.djangoapps.instructor_task.api.submit_export_ora2_data') as mock_submit_ora2_task:
-            mock_submit_ora2_task.side_effect = AlreadyRunningError()
+            mock_submit_ora2_task.side_effect = AlreadyRunningError(already_running_status)
             response = self.client.post(url, {})
-        already_running_status = "An ORA data report generation task is already in progress."
+
+        self.assertEqual(response.status_code, 400)
         self.assertIn(already_running_status, response.content)
 
     def test_get_student_progress_url(self):
@@ -4049,10 +4075,10 @@ class TestInstructorAPIHelpers(TestCase):
         self.assertEqual(_split_input_list(scary_unistuff), [scary_unistuff])
 
     def test_msk_from_problem_urlname(self):
-        course_id = SlashSeparatedCourseKey('MITx', '6.002x', '2013_Spring')
+        course_id = CourseKey.from_string('MITx/6.002x/2013_Spring')
         name = 'L2Node1'
         output = 'i4x://MITx/6.002x/problem/L2Node1'
-        self.assertEqual(msk_from_problem_urlname(course_id, name).to_deprecated_string(), output)
+        self.assertEqual(unicode(msk_from_problem_urlname(course_id, name)), output)
 
     @raises(ValueError)
     def test_msk_from_problem_urlname_error(self):
diff --git a/lms/djangoapps/instructor/tests/test_email.py b/lms/djangoapps/instructor/tests/test_email.py
index fb18334b0d..4a0b89ffd4 100644
--- a/lms/djangoapps/instructor/tests/test_email.py
+++ b/lms/djangoapps/instructor/tests/test_email.py
@@ -7,7 +7,7 @@ that the view is conditionally available when Course Auth is turned on.
 
 from django.core.urlresolvers import reverse
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 
 from bulk_email.models import BulkEmailFlag, CourseAuthorization
 from student.tests.factories import AdminFactory
@@ -119,10 +119,10 @@ class TestNewInstructorDashboardEmailViewXMLBacked(SharedModuleStoreTestCase):
     @classmethod
     def setUpClass(cls):
         super(TestNewInstructorDashboardEmailViewXMLBacked, cls).setUpClass()
-        cls.course_key = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
+        cls.course_key = CourseKey.from_string('edX/toy/2012_Fall')
 
         # URL for instructor dash
-        cls.url = reverse('instructor_dashboard', kwargs={'course_id': cls.course_key.to_deprecated_string()})
+        cls.url = reverse('instructor_dashboard', kwargs={'course_id': unicode(cls.course_key)})
         # URL for email view
         cls.email_link = '<button type="button" class="btn-link send_email" data-section="send_email">Email</button>'
 
diff --git a/lms/djangoapps/instructor/tests/test_enrollment.py b/lms/djangoapps/instructor/tests/test_enrollment.py
index af8a5604ab..3593ad5d38 100644
--- a/lms/djangoapps/instructor/tests/test_enrollment.py
+++ b/lms/djangoapps/instructor/tests/test_enrollment.py
@@ -13,7 +13,7 @@ from django.utils.translation import override as override_language
 from django.utils.translation import get_language
 from mock import patch
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
 from courseware.models import StudentModule
@@ -44,7 +44,7 @@ class TestSettableEnrollmentState(CacheIsolationTestCase):
     """ Test the basis class for enrollment tests. """
     def setUp(self):
         super(TestSettableEnrollmentState, self).setUp()
-        self.course_key = SlashSeparatedCourseKey('Robot', 'fAKE', 'C-%-se-%-ID')
+        self.course_key = CourseLocator('Robot', 'fAKE', 'C--se--ID')
 
     def test_mes_create(self):
         """
@@ -75,7 +75,7 @@ class TestEnrollmentChangeBase(CacheIsolationTestCase):
 
     def setUp(self):
         super(TestEnrollmentChangeBase, self).setUp()
-        self.course_key = SlashSeparatedCourseKey('Robot', 'fAKE', 'C-%-se-%-ID')
+        self.course_key = CourseLocator('Robot', 'fAKE', 'C--se--ID')
 
     def _run_state_change_test(self, before_ideal, after_ideal, action):
         """
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index f9911ddb4e..cb9e2852b8 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -71,7 +71,7 @@ from lms.djangoapps.instructor.enrollment import (
 from lms.djangoapps.instructor.views import INVOICE_KEY
 from lms.djangoapps.instructor.views.instructor_task_helpers import extract_email_features, extract_task_features
 from lms.djangoapps.instructor_task.api import submit_override_score
-from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError
+from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError, QueueConnectionError
 from lms.djangoapps.instructor_task.models import ReportStore
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.course_groups.cohorts import is_course_cohorted
@@ -133,29 +133,31 @@ log = logging.getLogger(__name__)
 
 TASK_SUBMISSION_OK = 'created'
 
+SUCCESS_MESSAGE_TEMPLATE = _("The {report_type} report is being created. "
+                             "To view the status of the report, see Pending Tasks below.")
+
 
 def common_exceptions_400(func):
     """
     Catches common exceptions and renders matching 400 errors.
     (decorator without arguments)
     """
+
     def wrapped(request, *args, **kwargs):  # pylint: disable=missing-docstring
         use_json = (request.is_ajax() or
                     request.META.get("HTTP_ACCEPT", "").startswith("application/json"))
         try:
             return func(request, *args, **kwargs)
         except User.DoesNotExist:
-            message = _("User does not exist.")
-            if use_json:
-                return JsonResponse({"error": message}, 400)
-            else:
-                return HttpResponseBadRequest(message)
-        except AlreadyRunningError:
-            message = _("Task is already running.")
-            if use_json:
-                return JsonResponse({"error": message}, 400)
-            else:
-                return HttpResponseBadRequest(message)
+            message = _('User does not exist.')
+        except (AlreadyRunningError, QueueConnectionError) as err:
+            message = str(err)
+
+        if use_json:
+            return JsonResponseBadRequest(message)
+        else:
+            return HttpResponseBadRequest(message)
+
     return wrapped
 
 
@@ -829,12 +831,12 @@ def bulk_beta_modify_access(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('instructor')
-@common_exceptions_400
 @require_post_params(
     unique_student_identifier="email or username of user to change access",
     rolename="'instructor', 'staff', 'beta', or 'ccx_coach'",
     action="'allow' or 'revoke'"
 )
+@common_exceptions_400
 def modify_access(request, course_id):
     """
     Modify staff/instructor access of other user.
@@ -964,6 +966,7 @@ def list_course_role_members(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def get_problem_responses(request, course_id):
     """
     Initiate generation of a CSV file containing all student answers
@@ -978,6 +981,7 @@ def get_problem_responses(request, course_id):
     """
     course_key = CourseKey.from_string(course_id)
     problem_location = request.POST.get('problem_location', '')
+    report_type = _('problem responses')
 
     try:
         problem_key = UsageKey.from_string(problem_location)
@@ -990,20 +994,10 @@ def get_problem_responses(request, course_id):
     except InvalidKeyError:
         return JsonResponseBadRequest(_("Could not find problem with this location."))
 
-    try:
-        lms.djangoapps.instructor_task.api.submit_calculate_problem_responses_csv(request, course_key, problem_location)
-        success_status = _(
-            "The problem responses report is being created."
-            " To view the status of the report, see Pending Tasks below."
-        )
-        return JsonResponse({"status": success_status})
-    except AlreadyRunningError:
-        already_running_status = _(
-            "A problem responses report generation task is already in progress. "
-            "Check the 'Pending Tasks' table for the status of the task. "
-            "When completed, the report will be available for download in the table below."
-        )
-        return JsonResponse({"status": already_running_status})
+    lms.djangoapps.instructor_task.api.submit_calculate_problem_responses_csv(request, course_key, problem_location)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 @require_POST
@@ -1209,6 +1203,7 @@ def get_issued_certificates(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def get_students_features(request, course_id, csv=False):  # pylint: disable=redefined-outer-name
     """
     Respond with json which contains a summary of all enrolled students profile information.
@@ -1220,7 +1215,7 @@ def get_students_features(request, course_id, csv=False):  # pylint: disable=red
     """
     course_key = CourseKey.from_string(course_id)
     course = get_course_by_id(course_key)
-
+    report_type = _('enrolled learner profile')
     available_features = instructor_analytics.basic.AVAILABLE_FEATURES
 
     # Allow for sites to be able to define additional columns.
@@ -1285,22 +1280,16 @@ def get_students_features(request, course_id, csv=False):  # pylint: disable=red
             'available_features': available_features,
         }
         return JsonResponse(response_payload)
+
     else:
-        try:
-            lms.djangoapps.instructor_task.api.submit_calculate_students_features_csv(
-                request,
-                course_key,
-                query_features
-            )
-            success_status = _("The enrolled learner profile report is being created."
-                               " To view the status of the report, see Pending Tasks below.")
-            return JsonResponse({"status": success_status})
-        except AlreadyRunningError:
-            already_running_status = _(
-                "This enrollment report is currently being created."
-                " To view the status of the report, see Pending Tasks below."
-                " You will be able to download the report when it is complete.")
-            return JsonResponse({"status": already_running_status})
+        lms.djangoapps.instructor_task.api.submit_calculate_students_features_csv(
+            request,
+            course_key,
+            query_features
+        )
+        success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+        return JsonResponse({"status": success_status})
 
 
 @transaction.non_atomic_requests
@@ -1308,6 +1297,7 @@ def get_students_features(request, course_id, csv=False):  # pylint: disable=red
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def get_students_who_may_enroll(request, course_id):
     """
     Initiate generation of a CSV file containing information about
@@ -1319,21 +1309,11 @@ def get_students_who_may_enroll(request, course_id):
     """
     course_key = CourseKey.from_string(course_id)
     query_features = ['email']
-    try:
-        lms.djangoapps.instructor_task.api.submit_calculate_may_enroll_csv(request, course_key, query_features)
-        success_status = _(
-            "The enrollment report is being created. This report contains"
-            " information about learners who can enroll in the course."
-            " To view the status of the report, see Pending Tasks below."
-        )
-        return JsonResponse({"status": success_status})
-    except AlreadyRunningError:
-        already_running_status = _(
-            "This enrollment report is currently being created."
-            " To view the status of the report, see Pending Tasks below."
-            " You will be able to download the report when it is complete."
-        )
-        return JsonResponse({"status": already_running_status})
+    report_type = _('enrollment')
+    lms.djangoapps.instructor_task.api.submit_calculate_may_enroll_csv(request, course_key, query_features)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 @transaction.non_atomic_requests
@@ -1341,6 +1321,7 @@ def get_students_who_may_enroll(request, course_id):
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_POST
 @require_level('staff')
+@common_exceptions_400
 def add_users_to_cohorts(request, course_id):
     """
     View method that accepts an uploaded file (using key "uploaded-file")
@@ -1417,23 +1398,17 @@ def get_coupon_codes(request, course_id):  # pylint: disable=unused-argument
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
 @require_finance_admin
+@common_exceptions_400
 def get_enrollment_report(request, course_id):
     """
     get the enrollment report for the particular course.
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    try:
-        lms.djangoapps.instructor_task.api.submit_detailed_enrollment_features_csv(request, course_key)
-        success_status = _("The detailed enrollment report is being created."
-                           " To view the status of the report, see Pending Tasks below.")
-        return JsonResponse({"status": success_status})
-    except AlreadyRunningError:
-        already_running_status = _("The detailed enrollment report is being created."
-                                   " To view the status of the report, see Pending Tasks below."
-                                   " You will be able to download the report when it is complete.")
-        return JsonResponse({
-            "status": already_running_status
-        })
+    report_type = _('detailed enrollment')
+    lms.djangoapps.instructor_task.api.submit_detailed_enrollment_features_csv(request, course_key)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 @transaction.non_atomic_requests
@@ -1442,24 +1417,17 @@ def get_enrollment_report(request, course_id):
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
 @require_finance_admin
+@common_exceptions_400
 def get_exec_summary_report(request, course_id):
     """
     get the executive summary report for the particular course.
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    try:
-        lms.djangoapps.instructor_task.api.submit_executive_summary_report(request, course_key)
-        status_response = _("The executive summary report is being created."
-                            " To view the status of the report, see Pending Tasks below.")
-    except AlreadyRunningError:
-        status_response = _(
-            "The executive summary report is currently being created."
-            " To view the status of the report, see Pending Tasks below."
-            " You will be able to download the report when it is complete."
-        )
-    return JsonResponse({
-        "status": status_response
-    })
+    report_type = _('executive summary')
+    lms.djangoapps.instructor_task.api.submit_executive_summary_report(request, course_key)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 @transaction.non_atomic_requests
@@ -1467,24 +1435,17 @@ def get_exec_summary_report(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def get_course_survey_results(request, course_id):
     """
     get the survey results report for the particular course.
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    try:
-        lms.djangoapps.instructor_task.api.submit_course_survey_report(request, course_key)
-        status_response = _("The survey report is being created."
-                            " To view the status of the report, see Pending Tasks below.")
-    except AlreadyRunningError:
-        status_response = _(
-            "The survey report is currently being created."
-            " To view the status of the report, see Pending Tasks below."
-            " You will be able to download the report when it is complete."
-        )
-    return JsonResponse({
-        "status": status_response
-    })
+    report_type = _('survey')
+    lms.djangoapps.instructor_task.api.submit_course_survey_report(request, course_key)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 @transaction.non_atomic_requests
@@ -1492,6 +1453,7 @@ def get_course_survey_results(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def get_proctored_exam_results(request, course_id):
     """
     get the proctored exam resultsreport for the particular course.
@@ -1508,19 +1470,11 @@ def get_proctored_exam_results(request, course_id):
     ]
 
     course_key = CourseKey.from_string(course_id)
-    try:
-        lms.djangoapps.instructor_task.api.submit_proctored_exam_results_report(request, course_key, query_features)
-        status_response = _("The proctored exam results report is being created."
-                            " To view the status of the report, see Pending Tasks below.")
-    except AlreadyRunningError:
-        status_response = _(
-            "The proctored exam results report is currently being created."
-            " To view the status of the report, see Pending Tasks below."
-            " You will be able to download the report when it is complete."
-        )
-    return JsonResponse({
-        "status": status_response
-    })
+    report_type = _('proctored exam results')
+    lms.djangoapps.instructor_task.api.submit_proctored_exam_results_report(request, course_key, query_features)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 def save_registration_code(user, course_id, mode_slug, invoice=None, order=None, invoice_item=None):
@@ -1901,11 +1855,11 @@ def get_anon_ids(request, course_id):  # pylint: disable=unused-argument
 @require_POST
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@common_exceptions_400
 @require_level('staff')
 @require_post_params(
     unique_student_identifier="email or username of student for whom to get progress url"
 )
+@common_exceptions_400
 def get_student_progress_url(request, course_id):
     """
     Get the progress url of a student.
@@ -2147,6 +2101,7 @@ def rescore_problem(request, course_id):
             )
         except NotImplementedError as exc:
             return HttpResponseBadRequest(exc.message)
+
     elif all_students:
         try:
             lms.djangoapps.instructor_task.api.submit_rescore_problem_for_all_students(
@@ -2453,25 +2408,17 @@ def list_financial_report_downloads(_request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def export_ora2_data(request, course_id):
     """
     Pushes a Celery task which will aggregate ora2 responses for a course into a .csv
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    try:
-        lms.djangoapps.instructor_task.api.submit_export_ora2_data(request, course_key)
-        success_status = _("The ORA data report is being generated.")
+    report_type = _('ORA data')
+    lms.djangoapps.instructor_task.api.submit_export_ora2_data(request, course_key)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
 
-        return JsonResponse({"status": success_status})
-    except AlreadyRunningError:
-        already_running_status = _(
-            "An ORA data report generation task is already in "
-            "progress. Check the 'Pending Tasks' table "
-            "for the status of the task. When completed, the report "
-            "will be available for download in the table below."
-        )
-
-        return JsonResponse({"status": already_running_status})
+    return JsonResponse({"status": success_status})
 
 
 @transaction.non_atomic_requests
@@ -2479,21 +2426,17 @@ def export_ora2_data(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def calculate_grades_csv(request, course_id):
     """
     AlreadyRunningError is raised if the course's grades are already being updated.
     """
+    report_type = _('grade')
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    try:
-        lms.djangoapps.instructor_task.api.submit_calculate_grades_csv(request, course_key)
-        success_status = _("The grade report is being created."
-                           " To view the status of the report, see Pending Tasks below.")
-        return JsonResponse({"status": success_status})
-    except AlreadyRunningError:
-        already_running_status = _("The grade report is currently being created."
-                                   " To view the status of the report, see Pending Tasks below."
-                                   " You will be able to download the report when it is complete.")
-        return JsonResponse({"status": already_running_status})
+    lms.djangoapps.instructor_task.api.submit_calculate_grades_csv(request, course_key)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 @transaction.non_atomic_requests
@@ -2501,6 +2444,7 @@ def calculate_grades_csv(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
+@common_exceptions_400
 def problem_grade_report(request, course_id):
     """
     Request a CSV showing students' grades for all problems in the
@@ -2510,18 +2454,11 @@ def problem_grade_report(request, course_id):
     updated.
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    try:
-        lms.djangoapps.instructor_task.api.submit_problem_grade_report(request, course_key)
-        success_status = _("The problem grade report is being created."
-                           " To view the status of the report, see Pending Tasks below.")
-        return JsonResponse({"status": success_status})
-    except AlreadyRunningError:
-        already_running_status = _("A problem grade report is already being generated."
-                                   " To view the status of the report, see Pending Tasks below."
-                                   " You will be able to download the report when it is complete.")
-        return JsonResponse({
-            "status": already_running_status
-        })
+    report_type = _('problem grade')
+    lms.djangoapps.instructor_task.api.submit_problem_grade_report(request, course_key)
+    success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+
+    return JsonResponse({"status": success_status})
 
 
 @require_POST
@@ -2601,6 +2538,7 @@ def list_forum_members(request, course_id):
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
 @require_post_params(send_to="sending to whom", subject="subject line", message="message text")
+@common_exceptions_400
 def send_email(request, course_id):
     """
     Send an email to self, staff, cohorts, or everyone involved in a course.
@@ -2667,6 +2605,7 @@ def send_email(request, course_id):
         'course_id': course_id.to_deprecated_string(),
         'success': True,
     }
+
     return JsonResponse(response_payload)
 
 
@@ -2944,6 +2883,7 @@ def mark_student_can_skip_entrance_exam(request, course_id):  # pylint: disable=
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_global_staff
 @require_POST
+@common_exceptions_400
 def start_certificate_generation(request, course_id):
     """
     Start generating certificates for all students enrolled in given course.
@@ -2956,6 +2896,7 @@ def start_certificate_generation(request, course_id):
         'message': message,
         'task_id': task.task_id
     }
+
     return JsonResponse(response_payload)
 
 
@@ -2964,6 +2905,7 @@ def start_certificate_generation(request, course_id):
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_global_staff
 @require_POST
+@common_exceptions_400
 def start_certificate_regeneration(request, course_id):
     """
     Start regenerating certificates for students whose certificate statuses lie with in 'certificate_statuses'
@@ -2990,11 +2932,8 @@ def start_certificate_regeneration(request, course_id):
             {'message': _('Please select certificate statuses from the list only.')},
             status=400
         )
-    try:
-        lms.djangoapps.instructor_task.api.regenerate_certificates(request, course_key, certificates_statuses)
-    except AlreadyRunningError as error:
-        return JsonResponse({'message': error.message}, status=400)
 
+    lms.djangoapps.instructor_task.api.regenerate_certificates(request, course_key, certificates_statuses)
     response_payload = {
         'message': _('Certificate regeneration task has been started. '
                      'You can view the status of the generation task in the "Pending Tasks" section.'),
@@ -3183,6 +3122,7 @@ def get_student(username_or_email, course_key):
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_global_staff
 @require_POST
+@common_exceptions_400
 def generate_certificate_exceptions(request, course_id, generate_for=None):
     """
     Generate Certificate for students in the Certificate White List.
@@ -3213,7 +3153,6 @@ def generate_certificate_exceptions(request, course_id, generate_for=None):
         )
 
     lms.djangoapps.instructor_task.api.generate_certificates_for_students(request, course_key, student_set=students)
-
     response_payload = {
         'success': True,
         'message': _('Certificate generation started for white listed students.'),
@@ -3401,6 +3340,7 @@ def invalidate_certificate(request, generated_certificate, certificate_invalidat
     }
 
 
+@common_exceptions_400
 def re_validate_certificate(request, course_key, generated_certificate):
     """
     Remove certificate invalidation from db and start certificate generation task for this student.
@@ -3421,6 +3361,7 @@ def re_validate_certificate(request, course_key, generated_certificate):
 
     # We need to generate certificate only for a single student here
     student = certificate_invalidation.generated_certificate.user
+
     lms.djangoapps.instructor_task.api.generate_certificates_for_students(
         request, course_key, student_set="specific_student", specific_student_id=student.id
     )
diff --git a/lms/djangoapps/instructor_analytics/tests/test_distributions.py b/lms/djangoapps/instructor_analytics/tests/test_distributions.py
index 0a91a04ba1..80923d5baf 100644
--- a/lms/djangoapps/instructor_analytics/tests/test_distributions.py
+++ b/lms/djangoapps/instructor_analytics/tests/test_distributions.py
@@ -2,7 +2,7 @@
 
 from django.test import TestCase
 from nose.tools import raises
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from instructor_analytics.distributions import AVAILABLE_PROFILE_FEATURES, profile_distribution
 from student.models import CourseEnrollment
@@ -14,7 +14,7 @@ class TestAnalyticsDistributions(TestCase):
 
     def setUp(self):
         super(TestAnalyticsDistributions, self).setUp()
-        self.course_id = SlashSeparatedCourseKey('robot', 'course', 'id')
+        self.course_id = CourseLocator('robot', 'course', 'id')
 
         self.users = [UserFactory(
             profile__gender=['m', 'f', 'o'][i % 3],
@@ -77,7 +77,7 @@ class TestAnalyticsDistributionsNoData(TestCase):
 
     def setUp(self):
         super(TestAnalyticsDistributionsNoData, self).setUp()
-        self.course_id = SlashSeparatedCourseKey('robot', 'course', 'id')
+        self.course_id = CourseLocator('robot', 'course', 'id')
 
         self.users = [UserFactory(
             profile__year_of_birth=i + 1930,
diff --git a/lms/djangoapps/instructor_task/api_helper.py b/lms/djangoapps/instructor_task/api_helper.py
index 3996af339a..c49a9be1d8 100644
--- a/lms/djangoapps/instructor_task/api_helper.py
+++ b/lms/djangoapps/instructor_task/api_helper.py
@@ -25,7 +25,26 @@ log = logging.getLogger(__name__)
 
 class AlreadyRunningError(Exception):
     """Exception indicating that a background task is already running"""
-    pass
+
+    message = _('Requested task is already running')
+
+    def __init__(self, message=None):
+
+        if not message:
+            message = self.message
+        super(AlreadyRunningError, self).__init__(message)
+
+
+class QueueConnectionError(Exception):
+    """
+    Exception indicating that celery task was not created successfully.
+    """
+    message = _('Error occured. Please try again later.')
+
+    def __init__(self, message=None):
+        if not message:
+            message = self.message
+        super(QueueConnectionError, self).__init__(message)
 
 
 def _task_is_running(course_id, task_type, task_key):
@@ -57,7 +76,8 @@ def _reserve_task(course_id, task_type, task_key, task_input, requester):
 
     if _task_is_running(course_id, task_type, task_key):
         log.warning("Duplicate task found for task_type %s and task_key %s", task_type, task_key)
-        raise AlreadyRunningError("requested task is already running")
+        error_message = generate_already_running_error_message(task_type)
+        raise AlreadyRunningError(error_message)
 
     try:
         most_recent_id = InstructorTask.objects.latest('id').id
@@ -75,6 +95,37 @@ def _reserve_task(course_id, task_type, task_key, task_input, requester):
     return InstructorTask.create(course_id, task_type, task_key, task_input, requester)
 
 
+def generate_already_running_error_message(task_type):
+    """
+    Returns already running error message for given task type.
+    """
+
+    message = ''
+    report_types = {
+        'grade_problems': _('problem grade'),
+        'problem_responses_csv': _('problem responses'),
+        'profile_info_csv': _('enrolled learner profile'),
+        'may_enroll_info_csv': _('enrollment'),
+        'detailed_enrollment_report': _('detailed enrollment'),
+        'exec_summary_report': _('executive summary'),
+        'course_survey_report': _('survey'),
+        'proctored_exam_results_report': _('proctored exam results'),
+        'export_ora2_data': _('ORA data'),
+        'grade_course': _('grade'),
+
+    }
+
+    if report_types.get(task_type):
+
+        message = _(
+            "The {report_type} report is being created. "
+            "To view the status of the report, see Pending Tasks below. "
+            "You will be able to download the report when it is complete."
+        ).format(report_type=report_types.get(task_type))
+
+    return message
+
+
 def _get_xmodule_instance_args(request, task_id):
     """
     Calculate parameters needed for instantiating xmodule instances.
@@ -190,6 +241,27 @@ def _update_instructor_task(instructor_task, task_result):
             instructor_task.save()
 
 
+def _update_instructor_task_state(instructor_task, task_state, message=None):
+    """
+    Update state and output of InstructorTask object.
+    """
+    instructor_task.task_state = task_state
+    if message:
+        instructor_task.task_output = message
+
+    instructor_task.save()
+
+
+def _handle_instructor_task_failure(instructor_task, error):
+    """
+    Do required operations if task creation was not complete.
+    """
+    log.info("instructor task (%s) failed, result: %s", instructor_task.task_id, error.message)
+    _update_instructor_task_state(instructor_task, FAILURE, error.message)
+
+    raise QueueConnectionError()
+
+
 def get_updated_instructor_task(task_id):
     """
     Returns InstructorTask object corresponding to a given `task_id`.
@@ -365,6 +437,10 @@ def submit_task(request, task_type, task_class, course_key, task_input, task_key
 
     task_id = instructor_task.task_id
     task_args = [instructor_task.id, _get_xmodule_instance_args(request, task_id)]
-    task_class.apply_async(task_args, task_id=task_id)
+    try:
+        task_class.apply_async(task_args, task_id=task_id)
+
+    except Exception as error:
+        _handle_instructor_task_failure(instructor_task, error)
 
     return instructor_task
diff --git a/lms/djangoapps/instructor_task/tests/factories.py b/lms/djangoapps/instructor_task/tests/factories.py
index 9be5423dce..c194e46d7e 100644
--- a/lms/djangoapps/instructor_task/tests/factories.py
+++ b/lms/djangoapps/instructor_task/tests/factories.py
@@ -3,7 +3,7 @@ import json
 import factory
 from celery.states import PENDING
 from factory.django import DjangoModelFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from lms.djangoapps.instructor_task.models import InstructorTask
 from student.tests.factories import UserFactory as StudentUserFactory
@@ -14,7 +14,7 @@ class InstructorTaskFactory(DjangoModelFactory):
         model = InstructorTask
 
     task_type = 'rescore_problem'
-    course_id = SlashSeparatedCourseKey("MITx", "999", "Robot_Super_Course")
+    course_id = CourseLocator("MITx", "999", "Robot_Super_Course")
     task_input = json.dumps({})
     task_key = None
     task_id = None
diff --git a/lms/djangoapps/instructor_task/tests/test_api.py b/lms/djangoapps/instructor_task/tests/test_api.py
index 741de82f4c..e010455ff5 100644
--- a/lms/djangoapps/instructor_task/tests/test_api.py
+++ b/lms/djangoapps/instructor_task/tests/test_api.py
@@ -32,7 +32,7 @@ from lms.djangoapps.instructor_task.api import (
     submit_reset_problem_attempts_for_all_students,
     submit_reset_problem_attempts_in_entrance_exam
 )
-from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError
+from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError, QueueConnectionError
 from lms.djangoapps.instructor_task.models import PROGRESS, InstructorTask
 from lms.djangoapps.instructor_task.tasks import export_ora2_data
 from lms.djangoapps.instructor_task.tests.test_base import (
@@ -43,6 +43,7 @@ from lms.djangoapps.instructor_task.tests.test_base import (
     TestReportMixin
 )
 from xmodule.modulestore.exceptions import ItemNotFoundError
+from celery.states import FAILURE
 
 
 class InstructorTaskReportTest(InstructorTaskTestCase):
@@ -164,15 +165,31 @@ class InstructorTaskModuleSubmitTest(InstructorTaskModuleTestCase):
     )
     @ddt.unpack
     def test_submit_task(self, task_function, expected_task_type, params=None):
+        """
+        Tests submission of instructor task.
+        """
         if params is None:
             params = {}
         if params.get('student'):
             params['student'] = self.student
 
-        # tests submit, and then tests a second identical submission.
         problem_url_name = 'H1P1'
         self.define_option_problem(problem_url_name)
         location = InstructorTaskModuleTestCase.problem_location(problem_url_name)
+
+        # unsuccessful submission, exception raised while submitting.
+        with patch('lms.djangoapps.instructor_task.tasks_base.BaseInstructorTask.apply_async') as apply_async:
+
+            error = Exception()
+            apply_async.side_effect = error
+
+            with self.assertRaises(QueueConnectionError):
+                instructor_task = task_function(self.create_task_request(self.instructor), location, **params)
+
+            most_recent_task = InstructorTask.objects.latest('id')
+            self.assertEquals(most_recent_task.task_state, FAILURE)
+
+        # successful submission
         instructor_task = task_function(self.create_task_request(self.instructor), location, **params)
         self.assertEquals(instructor_task.task_type, expected_task_type)
 
diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py
index d9be20925a..3bc4a6baad 100644
--- a/lms/djangoapps/instructor_task/tests/test_base.py
+++ b/lms/djangoapps/instructor_task/tests/test_base.py
@@ -14,7 +14,8 @@ from celery.states import FAILURE, SUCCESS
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from mock import Mock, patch
-from opaque_keys.edx.locations import Location, SlashSeparatedCourseKey
+from opaque_keys.edx.locations import Location
+from opaque_keys.edx.keys import CourseKey
 
 from capa.tests.response_xml_factory import OptionResponseXMLFactory
 from courseware.model_data import StudentModule
@@ -34,7 +35,7 @@ from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 TEST_COURSE_ORG = 'edx'
 TEST_COURSE_NAME = 'test_course'
 TEST_COURSE_NUMBER = '1.23x'
-TEST_COURSE_KEY = SlashSeparatedCourseKey(TEST_COURSE_ORG, TEST_COURSE_NUMBER, TEST_COURSE_NAME)
+TEST_COURSE_KEY = CourseKey.from_string('/'.join([TEST_COURSE_ORG, TEST_COURSE_NUMBER, TEST_COURSE_NAME]))
 TEST_CHAPTER_NAME = "Section"
 TEST_SECTION_NAME = "Subsection"
 
diff --git a/lms/djangoapps/lms_xblock/test/test_runtime.py b/lms/djangoapps/lms_xblock/test/test_runtime.py
index aa6331d969..73e4db3026 100644
--- a/lms/djangoapps/lms_xblock/test/test_runtime.py
+++ b/lms/djangoapps/lms_xblock/test/test_runtime.py
@@ -9,7 +9,7 @@ from django.conf import settings
 from django.test import TestCase
 from mock import Mock, patch
 from opaque_keys.edx.keys import CourseKey
-from opaque_keys.edx.locations import BlockUsageLocator, CourseLocator, SlashSeparatedCourseKey
+from opaque_keys.edx.locations import BlockUsageLocator, CourseLocator
 from xblock.exceptions import NoSuchServiceError
 from xblock.fields import ScopeIds
 
@@ -56,7 +56,7 @@ class TestHandlerUrl(TestCase):
     def setUp(self):
         super(TestHandlerUrl, self).setUp()
         self.block = BlockMock(name='block', scope_ids=ScopeIds(None, None, None, 'dummy'))
-        self.course_key = SlashSeparatedCourseKey("org", "course", "run")
+        self.course_key = CourseLocator("org", "course", "run")
         self.runtime = LmsModuleSystem(
             static_url='/static',
             track_function=Mock(),
@@ -120,7 +120,7 @@ class TestUserServiceAPI(TestCase):
 
     def setUp(self):
         super(TestUserServiceAPI, self).setUp()
-        self.course_id = SlashSeparatedCourseKey("org", "course", "run")
+        self.course_id = CourseLocator("org", "course", "run")
         self.user = UserFactory.create()
 
         def mock_get_real_user(_anon_id):
diff --git a/lms/djangoapps/shoppingcart/admin.py b/lms/djangoapps/shoppingcart/admin.py
index e40646302d..75569c8db3 100644
--- a/lms/djangoapps/shoppingcart/admin.py
+++ b/lms/djangoapps/shoppingcart/admin.py
@@ -1,5 +1,5 @@
 """Django admin interface for the shopping cart models. """
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from shoppingcart.models import (
     Coupon,
diff --git a/lms/djangoapps/student_account/test/test_views.py b/lms/djangoapps/student_account/test/test_views.py
index e82d4b4ab0..0944ebc49c 100644
--- a/lms/djangoapps/student_account/test/test_views.py
+++ b/lms/djangoapps/student_account/test/test_views.py
@@ -36,7 +36,6 @@ from openedx.core.djangoapps.oauth_dispatch.tests import factories as dot_factor
 from openedx.core.djangoapps.programs.tests.mixins import ProgramsApiConfigMixin
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
 from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme_context
-from openedx.core.djangoapps.user_api.accounts import EMAIL_MAX_LENGTH
 from openedx.core.djangoapps.user_api.accounts.api import activate_account, create_account
 from openedx.core.djangolib.js_utils import dump_js_escaped_json
 from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
@@ -62,24 +61,6 @@ class StudentAccountUpdateTest(CacheIsolationTestCase, UrlResetMixin):
     NEW_EMAIL = u"walt@savewalterwhite.com"
 
     INVALID_ATTEMPTS = 100
-
-    INVALID_EMAILS = [
-        None,
-        u"",
-        u"a",
-        "no_domain",
-        "no+domain",
-        "@",
-        "@domain.com",
-        "test@no_extension",
-
-        # Long email -- subtract the length of the @domain
-        # except for one character (so we exceed the max length limit)
-        u"{user}@example.com".format(
-            user=(u'e' * (EMAIL_MAX_LENGTH - 11))
-        )
-    ]
-
     INVALID_KEY = u"123abc"
 
     URLCONF_MODULES = ['student_accounts.urls']
@@ -610,6 +591,7 @@ class StudentAccountLoginAndRegistrationTest(ThirdPartyAuthTestMixin, UrlResetMi
             "secondaryProviders": [],
             "finishAuthUrl": finish_auth_url,
             "errorMessage": None,
+            "registerFormSubmitButtonText": "Create Account",
         }
         if expected_ec is not None:
             # If we set an EnterpriseCustomer, third-party auth providers ought to be hidden.
diff --git a/lms/djangoapps/student_account/views.py b/lms/djangoapps/student_account/views.py
index 6351a405af..4825f2d2d2 100644
--- a/lms/djangoapps/student_account/views.py
+++ b/lms/djangoapps/student_account/views.py
@@ -198,7 +198,7 @@ def password_change_request_handler(request):
 
     if email:
         try:
-            request_password_change(email, request.get_host(), request.is_secure())
+            request_password_change(email, request.is_secure())
             user = user if user.is_authenticated() else User.objects.get(email=email)
             destroy_oauth_tokens(user)
         except UserNotFound:
@@ -316,6 +316,7 @@ def _third_party_auth_context(request, redirect_to, tpa_hint=None):
         "secondaryProviders": [],
         "finishAuthUrl": None,
         "errorMessage": None,
+        "registerFormSubmitButtonText": _("Create Account"),
     }
 
     if third_party_auth.is_enabled():
@@ -361,6 +362,7 @@ def _third_party_auth_context(request, redirect_to, tpa_hint=None):
                         ).format(
                             configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)
                         )
+                        context["registerFormSubmitButtonText"] = _("Continue")
 
         # Check for any error messages we may want to display:
         for msg in messages.get_messages(request):
diff --git a/lms/djangoapps/verify_student/admin.py b/lms/djangoapps/verify_student/admin.py
index a454712e0d..0a53729184 100644
--- a/lms/djangoapps/verify_student/admin.py
+++ b/lms/djangoapps/verify_student/admin.py
@@ -4,7 +4,7 @@ Admin site configurations for verify_student.
 """
 
 from config_models.admin import ConfigurationModelAdmin
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
 
diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py
index bb7f67ad61..c72c4de518 100644
--- a/lms/djangoapps/verify_student/tests/test_views.py
+++ b/lms/djangoapps/verify_student/tests/test_views.py
@@ -24,7 +24,7 @@ from django.test.client import Client, RequestFactory
 from django.test.utils import override_settings
 from mock import Mock, patch
 from nose.plugins.attrib import attr
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import CourseLocator
 from waffle.testutils import override_switch
 
@@ -35,6 +35,7 @@ from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationDeadline
 from lms.djangoapps.verify_student.views import PayAndVerifyView, checkout_with_ecommerce_service, render_to_response
+from commerce.utils import EcommerceService
 from openedx.core.djangoapps.embargo.test_utils import restrict_course
 from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme
 from openedx.core.djangoapps.user_api.accounts.api import get_account_settings
@@ -141,12 +142,17 @@ class TestPayAndVerifyView(UrlResetMixin, ModuleStoreTestCase, XssTestMixin):
         )
         configuration = CommerceConfiguration.objects.create(checkout_on_ecommerce_service=True)
         checkout_page = configuration.MULTIPLE_ITEMS_BASKET_PAGE_URL
+        checkout_page += "?utm_source=test"
         httpretty.register_uri(httpretty.GET, "{}{}".format(TEST_PUBLIC_URL_ROOT, checkout_page))
 
         course = self._create_course('verified', sku=sku)
         self._enroll(course.id)
-        response = self._get_page('verify_student_start_flow', course.id, expected_status_code=302)
-        expected_page = '{}{}?sku={}'.format(TEST_PUBLIC_URL_ROOT, checkout_page, sku)
+
+        # Verify that utm params are included in the url used for redirect
+        url_with_utm = 'http://www.example.com/basket/add/?utm_source=test&sku=TESTSKU'
+        with mock.patch.object(EcommerceService, 'get_checkout_page_url', return_value=url_with_utm):
+            response = self._get_page('verify_student_start_flow', course.id, expected_status_code=302)
+        expected_page = '{}{}&sku={}'.format(TEST_PUBLIC_URL_ROOT, checkout_page, sku)
         self.assertRedirects(response, expected_page, fetch_redirect_response=False)
 
     @ddt.data(
@@ -1304,7 +1310,7 @@ class TestCreateOrderView(ModuleStoreTestCase):
         self.course_id = 'Robot/999/Test_Course'
         self.course = CourseFactory.create(org='Robot', number='999', display_name='Test Course')
         verified_mode = CourseMode(
-            course_id=SlashSeparatedCourseKey("Robot", "999", 'Test_Course'),
+            course_id=CourseKey.from_string("Robot/999/Test_Course"),
             mode_slug="verified",
             mode_display_name="Verified Certificate",
             min_price=50
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index ea2819ba31..5c305873b1 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -520,8 +520,7 @@ class PayAndVerifyView(View):
 
         # Redirect if necessary, otherwise implicitly return None
         if url is not None:
-            if waffle.switch_is_active('add-utm-params'):
-                url = self.add_utm_params_to_url(url)
+            url = self.add_utm_params_to_url(url)
             return redirect(url)
 
     def _get_paid_mode(self, course_key):
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 63d28a9767..69bbf05107 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -842,6 +842,10 @@ PROFILE_IMAGE_SECRET_KEY = AUTH_TOKENS.get('PROFILE_IMAGE_SECRET_KEY', PROFILE_I
 PROFILE_IMAGE_MAX_BYTES = ENV_TOKENS.get('PROFILE_IMAGE_MAX_BYTES', PROFILE_IMAGE_MAX_BYTES)
 PROFILE_IMAGE_MIN_BYTES = ENV_TOKENS.get('PROFILE_IMAGE_MIN_BYTES', PROFILE_IMAGE_MIN_BYTES)
 PROFILE_IMAGE_DEFAULT_FILENAME = 'images/profiles/default'
+PROFILE_IMAGE_SIZES_MAP = ENV_TOKENS.get(
+    'PROFILE_IMAGE_SIZES_MAP',
+    PROFILE_IMAGE_SIZES_MAP
+)
 
 # EdxNotes config
 
@@ -1012,9 +1016,11 @@ ICP_LICENSE = ENV_TOKENS.get('ICP_LICENSE', None)
 ############## Settings for CourseGraph ############################
 COURSEGRAPH_JOB_QUEUE = ENV_TOKENS.get('COURSEGRAPH_JOB_QUEUE', LOW_PRIORITY_QUEUE)
 
-############## Settings for Profile Image Size ######################
+########################## Parental controls config  #######################
 
-PROFILE_IMAGE_SIZES_MAP = ENV_TOKENS.get(
-    'PROFILE_IMAGE_SIZES_MAP',
-    PROFILE_IMAGE_SIZES_MAP
+# The age at which a learner no longer requires parental consent, or None
+# if parental consent is never required.
+PARENTAL_CONSENT_AGE_LIMIT = ENV_TOKENS.get(
+    'PARENTAL_CONSENT_AGE_LIMIT',
+    PARENTAL_CONSENT_AGE_LIMIT
 )
diff --git a/lms/envs/bok_choy_docker.env.json b/lms/envs/bok_choy_docker.env.json
index 7858095afa..137ebfa4aa 100644
--- a/lms/envs/bok_choy_docker.env.json
+++ b/lms/envs/bok_choy_docker.env.json
@@ -56,7 +56,7 @@
         }
     },
     "COMMENTS_SERVICE_KEY": "password",
-    "COMMENTS_SERVICE_URL": "http://localhost:4567",
+    "COMMENTS_SERVICE_URL": "http://edx.devstack.forum:4567",
     "CONTACT_EMAIL": "info@example.com",
     "DEFAULT_FEEDBACK_EMAIL": "feedback@example.com",
     "DEFAULT_FROM_EMAIL": "registration@example.com",
diff --git a/lms/envs/common.py b/lms/envs/common.py
index d87c336fc1..ed92ba16ca 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2241,8 +2241,8 @@ INSTALLED_APPS = (
     # Unusual migrations
     'database_fixups',
 
-    # Waffle related utilities
     'openedx.core.djangoapps.waffle_utils',
+    'openedx.core.djangoapps.schedules',
 
     # Features
     'openedx.features.course_bookmarks',
@@ -2251,7 +2251,6 @@ INSTALLED_APPS = (
     'openedx.features.enterprise_support',
     'openedx.features.learner_profile',
 
-    # Experiments
     'experiments',
 
     # DRF filters
@@ -3005,6 +3004,12 @@ PROFILE_IMAGE_DEFAULT_FILE_EXTENSION = 'png'
 PROFILE_IMAGE_SECRET_KEY = 'placeholder secret key'
 PROFILE_IMAGE_MAX_BYTES = 1024 * 1024
 PROFILE_IMAGE_MIN_BYTES = 100
+PROFILE_IMAGE_SIZES_MAP = {
+    'full': 500,
+    'large': 120,
+    'medium': 50,
+    'small': 30
+}
 
 # Sets the maximum number of courses listed on the homepage
 # If set to None, all courses will be listed on the homepage
@@ -3246,12 +3251,3 @@ COURSES_API_CACHE_TIMEOUT = 3600  # Value is in seconds
 
 ############## Settings for CourseGraph ############################
 COURSEGRAPH_JOB_QUEUE = LOW_PRIORITY_QUEUE
-
-############## Settings for Profile Image Size ######################
-
-PROFILE_IMAGE_SIZES_MAP = {
-    'full': 500,
-    'large': 120,
-    'medium': 50,
-    'small': 30
-}
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index c817cae8a8..9169f9a308 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -83,7 +83,6 @@ DEBUG_TOOLBAR_PANELS = (
 
 DEBUG_TOOLBAR_CONFIG = {
     'SHOW_TOOLBAR_CALLBACK': 'lms.envs.devstack.should_show_debug_toolbar',
-    'JQUERY_URL': None,
 }
 
 
@@ -91,9 +90,6 @@ def should_show_debug_toolbar(request):
     # We always want the toolbar on devstack unless running tests from another Docker container
     if request.get_host().startswith('edx.devstack.lms:'):
         return False
-    # Only display for non-ajax requests.
-    if request.is_ajax():
-        return False
     return True
 
 ########################### PIPELINE #################################
diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py
index c8db837fcd..60737aba0d 100644
--- a/lms/envs/devstack_docker.py
+++ b/lms/envs/devstack_docker.py
@@ -17,6 +17,8 @@ LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)
 ECOMMERCE_PUBLIC_URL_ROOT = 'http://localhost:18130'
 ECOMMERCE_API_URL = 'http://edx.devstack.ecommerce:18130/api/v2'
 
+COMMENTS_SERVICE_URL = 'http://edx.devstack.forum:4567'
+
 ENTERPRISE_API_URL = '{}/enterprise/api/v1/'.format(LMS_ROOT_URL)
 ENABLE_ENTERPRISE_INTEGRATION = False
 
diff --git a/lms/static/js/i18n/ar/djangojs.js b/lms/static/js/i18n/ar/djangojs.js
index a78d5f919e..e7b40d6342 100644
--- a/lms/static/js/i18n/ar/djangojs.js
+++ b/lms/static/js/i18n/ar/djangojs.js
@@ -193,15 +193,10 @@
     "A valid email address is required": "\u064a\u062c\u0628 \u0625\u062f\u062e\u0627\u0644 \u0639\u0646\u0648\u0627\u0646 \u0635\u062d\u064a\u062d \u0644\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a.", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "\u0623 \u0628 \u062a \u062b \u062c \u062d \u062e \u062f \u0630 \u0631 \u0632 \u0633 \u0634 \u0635 \u0636 \u0637 \u0638 \u0639 \u063a \u0641 \u0642 \u0643 \u0644 \u0645 \u0646 \u0647\u0640 \u0648 \u064a", 
     "Abbreviation": "\u0627\u0644\u0627\u062e\u062a\u0635\u0627\u0631", 
-    "About Me": "\u0646\u0628\u0630\u0629 \u0639\u0646\u0651\u064a", 
     "About You": "\u0646\u0628\u0630\u0629 \u0639\u0646\u0643", 
-    "About me": "\u0646\u0628\u0630\u0629 \u0639\u0646\u064a", 
-    "Accomplishments": "\u0627\u0644\u0625\u0646\u062c\u0627\u0632\u0627\u062a", 
-    "Accomplishments Pagination": "\u062a\u0631\u0642\u064a\u0645 \u0635\u0641\u062d\u0627\u062a \u0627\u0644\u0625\u0646\u062c\u0627\u0632\u0627\u062a", 
     "Account Information": "\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628", 
     "Account Not Activated": "\u0627\u0644\u062d\u0633\u0627\u0628 \u063a\u064a\u0631 \u0645\u0641\u0639\u0651\u0644", 
     "Account Settings": "\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628", 
-    "Account Settings page.": "\u0635\u0641\u062d\u0629 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628", 
     "Action": "\u0627\u0644\u0625\u062c\u0631\u0627\u0621", 
     "Action required: Enter a valid date.": "\u0625\u062c\u0631\u0627\u0621 \u0644\u0627\u0632\u0645: \u0623\u062f\u062e\u0644 \u062a\u0627\u0631\u064a\u062e\u0627\u064b \u0635\u0627\u0644\u062d\u0627\u064b.", 
     "Actions": "\u0627\u0644\u0625\u062c\u0631\u0627\u0621\u0627\u062a", 
@@ -213,7 +208,6 @@
     "Add Additional Signatory": "\u0625\u0636\u0627\u0641\u0629 \u0645\u064f\u0648\u064e\u0642\u0651\u0639 \u0625\u0636\u0627\u0641\u064a", 
     "Add Cohort": "\u0625\u0636\u0627\u0641\u0629 \u0634\u0639\u0628\u0629", 
     "Add Component:": "\u0625\u0636\u0627\u0641\u0629 \u0645\u0643\u0648\u0651\u0650\u0646:", 
-    "Add Country": "\u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0628\u0644\u062f", 
     "Add New Component": "\u0625\u0636\u0627\u0641\u0629 \u0645\u0643\u0648\u0651\u0650\u0646 \u062c\u062f\u064a\u062f", 
     "Add URLs for additional versions": "\u0625\u0636\u0627\u0641\u0629 \u0631\u0648\u0627\u0628\u0637 \u0644\u0644\u0646\u0633\u062e\u0627\u062a \u0627\u0644\u0625\u0636\u0627\u0641\u064a\u0629", 
     "Add a Chapter": "\u0625\u0636\u0627\u0641\u0629 \u0641\u0635\u0644", 
@@ -224,7 +218,6 @@
     "Add a learning outcome here": "\u0625\u0636\u0627\u0641\u0629 \u0646\u062a\u064a\u062c\u0629 \u062a\u0639\u0644\u064a\u0645\u064a\u0629 \u0647\u0646\u0627", 
     "Add a response:": "\u0623\u0636\u0641 \u0631\u062f\u0627\u064b:", 
     "Add another group": "\u0625\u0636\u0627\u0641\u0629 \u0645\u062c\u0645\u0648\u0639\u0629 \u0623\u062e\u0631\u0649", 
-    "Add language": "\u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0644\u063a\u0629", 
     "Add notes about this learner": "\u0623\u0636\u0641 \u0645\u0644\u0627\u062d\u0638\u0627\u062a \u062a\u062e\u0635\u0651 \u0647\u0630\u0627 \u0627\u0644\u0645\u062a\u0639\u0644\u0651\u0645", 
     "Add to Dictionary": "\u0623\u0636\u0641 \u0625\u0644\u0649 \u0627\u0644\u0642\u0627\u0645\u0648\u0633", 
     "Add to Exception List": "\u0625\u0636\u0641 \u0625\u0644\u0649 \u0644\u0627\u0626\u062d\u0629 \u0627\u0644\u0627\u0633\u062a\u062b\u0646\u0627\u0621\u0627\u062a", 
@@ -376,7 +369,6 @@
     "Change Manually": "\u0627\u0644\u062a\u063a\u064a\u064a\u0631 \u064a\u062f\u0648\u064a\u0651\u064b\u0627 ", 
     "Change My Email Address": "\u062a\u063a\u064a\u064a\u0631 \u0639\u0646\u0648\u0627\u0646 \u0628\u0631\u064a\u062f\u064a \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a", 
     "Change image": "\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0635\u0648\u0631\u0629", 
-    "Change the settings for {display_name}": "\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0644\u0640  {display_name}", 
     "Chapter Asset": "\u0645\u0627\u062f\u0629 \u0645\u0644\u062d\u0642\u0629 \u0628\u0641\u0635\u0644", 
     "Chapter Name": "\u0627\u0633\u0645 \u0627\u0644\u0641\u0635\u0644", 
     "Chapter information": "\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0639\u0646 \u0627\u0644\u0641\u0635\u0644", 
@@ -606,7 +598,6 @@
     "Edit Membership": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0639\u0636\u0648\u064a\u0651\u0629", 
     "Edit Team": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0641\u0631\u064a\u0642", 
     "Edit Your Name": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0633\u0645\u0643 ", 
-    "Edit the name": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0627\u0633\u0645", 
     "Edit this certificate?": "\u0647\u0644 \u062a\u0631\u064a\u062f \u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0634\u0647\u0627\u062f\u0629\u061f", 
     "Edit your post below.": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 \u0623\u062f\u0646\u0627\u0647.", 
     "Editable": "\u0642\u0627\u0628\u0644 \u0644\u0644\u062a\u0639\u062f\u064a\u0644", 
@@ -736,7 +727,6 @@
     "Free text notes": "\u0645\u0644\u0627\u062d\u0638\u0627\u062a \u0645\u0643\u062a\u0648\u0628\u0629 \u062d\u0631\u0629", 
     "Frequently Asked Questions": "\u0627\u0644\u0623\u0633\u0626\u0644\u0629 \u0627\u0644\u0634\u0627\u0626\u0639\u0629", 
     "Full Name": "\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0643\u0627\u0645\u0644", 
-    "Full Profile": "\u0643\u0627\u0645\u0644 \u0645\u0644\u0641\u0651\u064a \u0627\u0644\u0634\u062e\u0635\u064a", 
     "Fullscreen": "\u0639\u0631\u0636 \u0628\u0634\u0627\u0634\u0629 \u0643\u0627\u0645\u0644\u0629", 
     "Fully Supported": "\u0645\u062f\u0639\u0648\u0645 \u062a\u0645\u0627\u0645\u0627\u064b", 
     "Gender": "\u0627\u0644\u062c\u0646\u0633", 
@@ -898,7 +888,6 @@
     "License Display": "\u0639\u0631\u0636 \u0627\u0644\u0625\u062c\u0627\u0632\u0629", 
     "License Type": "\u0646\u0648\u0639 \u0627\u0644\u0625\u062c\u0627\u0632\u0629", 
     "Limit Access": "\u0627\u0644\u062d\u062f\u0651 \u0645\u0646 \u0635\u0644\u0627\u062d\u064a\u0629 \u0627\u0644\u0648\u0635\u0648\u0644", 
-    "Limited Profile": "\u0645\u0644\u0641\u0651\u064a \u0627\u0644\u0634\u062e\u0635\u064a \u0627\u0644\u0645\u062d\u062f\u0648\u062f", 
     "Link Description": "\u0648\u0635\u0641 \u0627\u0644\u0631\u0627\u0628\u0637", 
     "Link Your Account": "\u0627\u0631\u0628\u0637 \u062d\u0633\u0627\u0628\u0643", 
     "Link types should be unique.": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u0643\u0648\u0646 \u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0631\u0648\u0627\u0628\u0637 \u0641\u0631\u064a\u062f\u0629.", 
@@ -1134,9 +1123,6 @@
     "Professional Certificate for {courseName}": "\u0634\u0647\u0627\u062f\u0629 \u0627\u062d\u062a\u0631\u0627\u0641\u064a\u0629 \u0644\u0640 {courseName}", 
     "Professional Education": "\u0627\u0644\u062a\u0639\u0644\u064a\u0645 \u0627\u0644\u0645\u0647\u0646\u064a", 
     "Professional Education Verified Certificate": "\u0634\u0647\u0627\u062f\u0629 \u0645\u0648\u062b\u0651\u0642\u0629 \u0644\u0644\u062a\u0639\u0644\u064a\u0645 \u0627\u0644\u0645\u0647\u0646\u064a", 
-    "Profile": "\u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0634\u062e\u0635\u064a", 
-    "Profile Image": "\u0635\u0648\u0631\u0629 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0634\u062e\u0635\u064a", 
-    "Profile image for {username}": "\u0635\u0648\u0631\u0629 \u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645 {username}", 
     "Promote another member to Admin to remove your admin rights": "\u064a\u064f\u0631\u062c\u0649 \u062a\u0631\u0642\u064a\u0629 \u0639\u0636\u0648 \u0622\u062e\u0631 \u0625\u0644\u0649 \u062f\u0631\u062c\u0629 \u0645\u0634\u0631\u0650\u0641 \u0644\u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0625\u0644\u063a\u0627\u0621 \u062d\u0642\u0648\u0642\u0643 \u0643\u0645\u0634\u0631\u0650\u0641.", 
     "Provisional": "\u0645\u0624\u0642\u062a", 
     "Provisionally Supported": "\u0645\u062f\u0639\u0648\u0645 \u0645\u0624\u0642\u062a\u0627\u064b", 
@@ -1400,7 +1386,6 @@
     "Team name cannot have more than 255 characters.": "\u064a\u062c\u0628 \u0623\u0644\u0627 \u064a\u062a\u062c\u0627\u0648\u0632 \u0627\u0633\u0645 \u0627\u0644\u0641\u0631\u064a\u0642 255 \u062d\u0631\u0641\u064b\u0627.", 
     "Teams": "\u0627\u0644\u0641\u0650\u0631\u064e\u0642", 
     "Teams Pagination": "\u062a\u0631\u0642\u064a\u0645 \u0635\u0641\u062d\u0627\u062a \u0627\u0644\u0641\u0650\u0631\u0642", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u062a\u0641\u0636\u0651\u0644 \u0628\u0625\u0639\u0637\u0627\u0621 \u0627\u0644\u0645\u062a\u0639\u0644\u0651\u0645\u064a\u0646 \u0627\u0644\u0622\u062e\u0631\u064a\u0646 \u0641\u0643\u0631\u0629 \u0639\u0627\u0645\u0629 \u0639\u0646\u0643: \u0645\u0643\u0627\u0646 \u0633\u0643\u0646\u0643\u060c \u0627\u0647\u062a\u0645\u0627\u0645\u0627\u062a\u0643\u060c \u0633\u0628\u0628 \u0627\u0644\u062a\u062d\u0627\u0642\u0643 \u0628\u0647\u0630\u0647 \u0627\u0644\u0645\u0633\u0627\u0642\u0627\u062a\u060c \u0623\u0648 \u0645\u0627 \u062a\u0631\u063a\u0628 \u0641\u064a \u062a\u0639\u0644\u0651\u0645\u0647.", 
     "Templates": "\u0646\u0645\u0627\u0630\u062c", 
     "Text": "\u0646\u0635\u0651", 
     "Text color": "\u0644\u0648\u0646 \u0627\u0644\u0646\u0635", 
@@ -1640,14 +1625,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "\u064a\u064f\u0631\u062c\u0649 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0643\u0627\u0645\u064a\u0631\u062a\u0643 \u0644\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u0629 \u0644\u0648\u062c\u0647\u0643. \u062b\u0645\u0651 \u0633\u0646\u0637\u0627\u0628\u0642 \u0647\u0630\u0647 \u0627\u0644\u0635\u0648\u0631\u0629 \u0645\u0639 \u0635\u0648\u0631\u0629 \u0648\u062c\u0647\u0643 \u0648\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0645\u0648\u062c\u0648\u062f\u064a\u0646 \u0641\u064a \u062d\u0633\u0627\u0628\u0643.  ", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "\u0627\u0633\u062a\u062e\u062f\u0645 \u0643\u0627\u0645\u064a\u0631\u062a\u0643 \u0644\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u0629 \u0644\u0648\u062c\u0647\u0643. \u062b\u0645\u0651 \u0633\u0646\u0637\u0627\u0628\u0642 \u0647\u0630\u0647 \u0627\u0644\u0635\u0648\u0631\u0629 \u0645\u0639 \u0627\u0644\u0635\u0648\u0631\u0629 \u0627\u0644\u0645\u0648\u062c\u0648\u062f\u0629 \u0639\u0644\u0649 \u0628\u0637\u0627\u0642\u062a\u0643 \u0627\u0644\u0634\u062e\u0635\u064a\u0629.  ", 
     "Used": "\u0645\u0633\u062a\u062e\u062f\u064e\u0645", 
-    "Used in {count} unit": [
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629", 
-      "\u0645\u0633\u062a\u062e\u062f\u0645 \u0641\u064a {count} \u0648\u062d\u062f\u0629"
-    ], 
     "User": "\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645", 
     "User Email": "\u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0627\u0644\u062e\u0627\u0635 \u0628\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645", 
     "Username": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645", 
@@ -1772,12 +1749,10 @@
     "You haven't added any assets to this course yet.": "\u0644\u0645 \u062a\u064f\u0636\u0650\u0641 \u0623\u064a \u0645\u0648\u0627\u062f \u0645\u0644\u062d\u0642\u0629 \u0628\u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u0627\u0642 \u0628\u0639\u062f. ", 
     "You haven't added any content to this course yet.": "\u0644\u0645 \u062a\u064f\u0636\u0650\u0641 \u0623\u064a \u0645\u062d\u062a\u0648\u0649 \u0625\u0644\u0649 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u0627\u0642 \u0628\u0639\u062f.", 
     "You haven't added any textbooks to this course yet.": "\u0644\u0645 \u062a\u064f\u0636\u0650\u0641 \u0628\u0639\u062f \u0623\u064a \u0643\u062a\u0628 \u0625\u0644\u0649 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u0627\u0642.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\u064a\u062c\u0628 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0639\u0645\u0631\u0643 \u0645\u0627 \u0641\u0648\u0642 13 \u0633\u0646\u0629 \u0644\u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0645\u0634\u0627\u0631\u0643\u0629 \u0635\u0641\u062d\u062a\u0643 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0628\u0623\u0643\u0645\u0644\u0647\u0627. \u0641\u0625\u0630\u0627 \u0643\u0627\u0646 \u0639\u0645\u0631\u0643 \u0645\u0627 \u0641\u0648\u0642 13 \u0633\u0646\u0629\u060c \u064a\u064f\u0631\u062c\u0649 \u0627\u0644\u062a\u0623\u0643\u0651\u062f \u0645\u0646 \u0623\u0646\u0651\u0643 \u062d\u062f\u0651\u062f\u062a \u0633\u0646\u0629 \u0645\u064a\u0644\u0627\u062f\u0643 \u0641\u064a \u0635\u0641\u062d\u0629 \u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a {account_settings_page_link}.", 
     "You must enter a valid email address in order to add a new team member": "\u064a\u062c\u0628 \u0639\u0644\u064a\u0643 \u0623\u0646 \u062a\u064f\u062f\u062e\u0650\u0644 \u0639\u0646\u0648\u0627\u0646 \u0635\u062d\u064a\u062d \u0644\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0644\u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0625\u0636\u0627\u0641\u0629 \u0639\u0636\u0648 \u062c\u062f\u064a\u062f \u0625\u0644\u0649 \u0627\u0644\u0641\u0631\u064a\u0642.", 
     "You must sign out and sign back in before your language changes take effect.": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u0633\u062c\u0651\u0644 \u062e\u0631\u0648\u062c\u0643 \u062b\u0645\u0651 \u062a\u064f\u0639\u064a\u062f \u062a\u0633\u062c\u064a\u0644 \u062f\u062e\u0648\u0644\u0643 \u0644\u064a\u062c\u0631\u064a \u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u062a\u063a\u064a\u064a\u0631\u0627\u062a \u0627\u0644\u062a\u064a \u0623\u062f\u062e\u0644\u062a\u0647\u0627 \u0639\u0644\u0649 \u0627\u0644\u0644\u063a\u0629.", 
     "You must specify a name": "\u0639\u0644\u064a\u0643 \u0623\u0646 \u062a\u062d\u062f\u0651\u062f \u0627\u0633\u0645\u064b\u0627.", 
     "You must specify a name for the cohort": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u062d\u062f\u0651\u062f \u0627\u0633\u0645\u064b\u0627 \u0644\u0644\u0634\u0639\u0628\u0629.", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u064a\u062c\u0628 \u0623\u0646 \u062a\u062d\u062f\u0651\u062f \u0633\u0646\u0629 \u0645\u064a\u0644\u0627\u062f\u0643 \u0642\u0628\u0644 \u0623\u0646 \u062a\u062a\u0645\u0643\u0651\u0646 \u0645\u0646 \u0645\u0634\u0627\u0631\u0643\u0629 \u0635\u0641\u062d\u062a\u0643 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0628\u0623\u0643\u0645\u0644\u0647\u0627. \u0648\u0644\u062a\u062d\u062f\u0651\u062f \u0633\u0646\u0629 \u0645\u064a\u0644\u0627\u062f\u0643\u060c \u064a\u064f\u0631\u062c\u0649 \u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0635\u0641\u062d\u0629 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062d\u0633\u0627\u0628 {account_settings_page_link}.", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u062c\u0647\u0627\u0632 \u0643\u0648\u0645\u0628\u064a\u0648\u062a\u0631 \u0645\u0632\u0648\u0651\u064e\u062f \u0628\u0643\u0627\u0645\u064a\u0631\u0627. \u0648\u0639\u0646\u062f \u0627\u0633\u062a\u0644\u0627\u0645\u0643 \u0644\u0639\u0644\u0627\u0645\u0629 \u0627\u0633\u062a\u0639\u062f\u0627\u062f \u0645\u0646 \u0627\u0644\u0645\u062a\u0635\u0641\u0651\u062d\u060c \u064a\u064f\u0631\u062c\u0649 \u0627\u0644\u062a\u0623\u0643\u0651\u062f \u0645\u0646 \u0627\u0644\u0633\u0645\u0627\u062d \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0631\u062e\u0635\u0629 \u0642\u064a\u0627\u062f\u0629 \u0623\u0648 \u062c\u0648\u0627\u0632 \u0633\u0641\u0631 \u0623\u0648 \u063a\u064a\u0631\u0647\u0627 \u0645\u0646 \u0627\u0644\u0645\u0633\u062a\u0646\u062f\u0627\u062a \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0627\u0644\u0635\u0627\u062f\u0631\u0629 \u0639\u0646 \u0627\u0644\u062d\u0643\u0648\u0645\u0629 \u0648\u0627\u0644\u062a\u064a \u062a\u062d\u0645\u0644 \u0627\u0633\u0645\u0643 \u0648\u0635\u0648\u0631\u062a\u0643.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0628\u0637\u0627\u0642\u0629 \u0634\u062e\u0635\u064a\u0629 \u062a\u062d\u0645\u0644 \u0627\u0633\u0645\u0643 \u0648\u0635\u0648\u0631\u062a\u0643. \u0648\u064a\u0645\u0643\u0646 \u062a\u0642\u062f\u064a\u0645 \u0631\u062e\u0635\u0629 \u0627\u0644\u0642\u064a\u0627\u062f\u0629\u060c \u0623\u0648 \u062c\u0648\u0627\u0632 \u0627\u0644\u0633\u0641\u0631\u060c \u0623\u0648 \u0628\u0637\u0627\u0642\u0629 \u0634\u062e\u0635\u064a\u0629 \u0623\u062e\u0631\u0649 \u0635\u0627\u062f\u0631\u0629 \u0639\u0646 \u0627\u0644\u062d\u0643\u0648\u0645\u0629\u060c \u0641\u062c\u0645\u064a\u0639 \u0647\u0630\u0647 \u0627\u0644\u0648\u062b\u0627\u0626\u0642 \u0645\u0642\u0628\u0648\u0644\u0629.  ", 
@@ -1944,7 +1919,6 @@
       "{numVotes} \u0635\u0648\u062a"
     ], 
     "{organization}\\'s logo": "\u0634\u0639\u0627\u0631 \u0627\u0644{organization}", 
-    "{platform_name} learners can see my:": "\u064a\u0645\u0643\u0646 \u0644\u0644\u0645\u062a\u0639\u0644\u0651\u0645\u064a\u0646 \u0641\u064a \u0645\u0646\u0635\u0651\u0629 {platform_name} \u0631\u0624\u064a\u0629:", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u062a\u062d\u0630\u064a\u0631:{screen_reader_end}  \u062a\u0639\u0630\u0651\u0631 \u0625\u064a\u062c\u0627\u062f \u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0645\u062d\u062a\u0648\u0649.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u062a\u062d\u0630\u064a\u0631:{screen_reader_end} \u062d\u0651\u0630\u0641\u062a \u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u062d\u062a\u0648\u0649 \u0627\u0644\u0645\u062d\u062f\u0651\u062f\u0629 \u0633\u0627\u0628\u0642\u064b\u0627. \u064a\u064f\u0631\u062c\u0649 \u0627\u062e\u062a\u064a\u0627\u0631 \u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u062d\u062a\u0648\u0649 \u0623\u062e\u0631\u0649.", 
     "{start_strong}{total}{end_strong} words submitted in total.": "\u0625\u062c\u0645\u0627\u0644\u064a \u0639\u062f\u062f \u0627\u0644\u0643\u0644\u0645\u0627\u062a \u0627\u0644\u062a\u064a \u062a\u0645 \u0627\u0631\u0633\u0627\u0644\u0647\u0627 {start_strong}{total}{end_strong}.", 
diff --git a/lms/static/js/i18n/eo/djangojs.js b/lms/static/js/i18n/eo/djangojs.js
index ef58f0bf45..964edd9576 100644
--- a/lms/static/js/i18n/eo/djangojs.js
+++ b/lms/static/js/i18n/eo/djangojs.js
@@ -1451,6 +1451,7 @@
     "Thanks for returning to verify your ID in: {courseName}": "Th\u00e4nks f\u00f6r r\u00e9t\u00fcrn\u00efng t\u00f6 v\u00e9r\u00eff\u00fd \u00fd\u00f6\u00fcr \u00ccD \u00efn: {courseName} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#", 
     "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Th\u00e9 \u00dbRL \u00fd\u00f6\u00fc \u00e9nt\u00e9r\u00e9d s\u00e9\u00e9ms t\u00f6 \u00df\u00e9 \u00e4n \u00e9m\u00e4\u00efl \u00e4ddr\u00e9ss. D\u00f6 \u00fd\u00f6\u00fc w\u00e4nt t\u00f6 \u00e4dd th\u00e9 r\u00e9q\u00fc\u00efr\u00e9d m\u00e4\u00eflt\u00f6: pr\u00e9f\u00efx? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "Th\u00e9 \u00dbRL \u00fd\u00f6\u00fc \u00e9nt\u00e9r\u00e9d s\u00e9\u00e9ms t\u00f6 \u00df\u00e9 \u00e4n \u00e9xt\u00e9rn\u00e4l l\u00efnk. D\u00f6 \u00fd\u00f6\u00fc w\u00e4nt t\u00f6 \u00e4dd th\u00e9 r\u00e9q\u00fc\u00efr\u00e9d http:// pr\u00e9f\u00efx? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
+    "The certificate available date must be later than the enrollment start date.": "Th\u00e9 \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 \u00e4v\u00e4\u00efl\u00e4\u00dfl\u00e9 d\u00e4t\u00e9 m\u00fcst \u00df\u00e9 l\u00e4t\u00e9r th\u00e4n th\u00e9 \u00e9nr\u00f6llm\u00e9nt st\u00e4rt d\u00e4t\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#", 
     "The certificate for this learner has been re-validated and the system is re-running the grade for this learner.": "Th\u00e9 \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 f\u00f6r th\u00efs l\u00e9\u00e4rn\u00e9r h\u00e4s \u00df\u00e9\u00e9n r\u00e9-v\u00e4l\u00efd\u00e4t\u00e9d \u00e4nd th\u00e9 s\u00fdst\u00e9m \u00efs r\u00e9-r\u00fcnn\u00efng th\u00e9 gr\u00e4d\u00e9 f\u00f6r th\u00efs l\u00e9\u00e4rn\u00e9r. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #", 
     "The cohort cannot be added": "Th\u00e9 \u00e7\u00f6h\u00f6rt \u00e7\u00e4nn\u00f6t \u00df\u00e9 \u00e4dd\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#", 
     "The cohort cannot be saved": "Th\u00e9 \u00e7\u00f6h\u00f6rt \u00e7\u00e4nn\u00f6t \u00df\u00e9 s\u00e4v\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#", 
@@ -1586,6 +1587,7 @@
     "This team does not have any members.": "Th\u00efs t\u00e9\u00e4m d\u00f6\u00e9s n\u00f6t h\u00e4v\u00e9 \u00e4n\u00fd m\u00e9m\u00df\u00e9rs. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#", 
     "This team is full.": "Th\u00efs t\u00e9\u00e4m \u00efs f\u00fcll. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442#", 
     "This thread is closed.": "Th\u00efs thr\u00e9\u00e4d \u00efs \u00e7l\u00f6s\u00e9d. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#", 
+    "This unit has validation issues.": "Th\u00efs \u00fcn\u00eft h\u00e4s v\u00e4l\u00efd\u00e4t\u00ef\u00f6n \u00efss\u00fc\u00e9s. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#", 
     "This vote could not be processed. Refresh the page and try again.": "Th\u00efs v\u00f6t\u00e9 \u00e7\u00f6\u00fcld n\u00f6t \u00df\u00e9 pr\u00f6\u00e7\u00e9ss\u00e9d. R\u00e9fr\u00e9sh th\u00e9 p\u00e4g\u00e9 \u00e4nd tr\u00fd \u00e4g\u00e4\u00efn. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#", 
     "This {parentCategory} has no {childCategory}": "Th\u00efs {parentCategory} h\u00e4s n\u00f6 {childCategory} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442,#", 
     "Thumbnail": "Th\u00fcm\u00dfn\u00e4\u00efl \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#", 
diff --git a/lms/static/js/i18n/es-419/djangojs.js b/lms/static/js/i18n/es-419/djangojs.js
index 8d2568f239..8823e143ac 100644
--- a/lms/static/js/i18n/es-419/djangojs.js
+++ b/lms/static/js/i18n/es-419/djangojs.js
@@ -137,15 +137,10 @@
     "A valid email address is required": "Un email correcto es requerido.", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "ABCDEFGHIJKLMN\u00d1OPQRSTUVWXYZ", 
     "Abbreviation": "Abreviatura", 
-    "About Me": "Sobre M\u00ed", 
     "About You": "Acerca de usted", 
-    "About me": "Sobre m\u00ed", 
-    "Accomplishments": "Logros", 
-    "Accomplishments Pagination": "Paginaci\u00f3n de Logros", 
     "Account Information": "Informaci\u00f3n de la cuenta", 
     "Account Not Activated": "Cuenta no activada", 
     "Account Settings": "Configuraci\u00f3n de cuenta", 
-    "Account Settings page.": "P\u00e1gina de configuraci\u00f3n de cuenta.", 
     "Action": "Acci\u00f3n", 
     "Action required: Enter a valid date.": "Acci\u00f3n requerida: Introduzca una fecha v\u00e1lida.", 
     "Actions": "Acciones", 
@@ -157,7 +152,6 @@
     "Add Additional Signatory": "A\u00f1adir signatario adicional", 
     "Add Cohort": "A\u00f1adir cohorte", 
     "Add Component:": "A\u00f1adir Componente:", 
-    "Add Country": "A\u00f1adir pa\u00eds", 
     "Add New Component": "A\u00f1adir nuevo Componente", 
     "Add URLs for additional versions": "A\u00f1ada URLs para las versiones adicionales", 
     "Add a Chapter": "A\u00f1adir cap\u00edtulo", 
@@ -168,7 +162,6 @@
     "Add a learning outcome here": "Agregar Resultado de aprendizaje", 
     "Add a response:": "A\u00f1ada su respuesta:", 
     "Add another group": "A\u00f1adir nuevo grupo", 
-    "Add language": "A\u00f1adir idioma", 
     "Add notes about this learner": "A\u00f1ada una nota sobre este estudiante", 
     "Add to Dictionary": "Agregar al diccionario", 
     "Add to Exception List": "Agregar a lista de excepciones", 
@@ -324,7 +317,6 @@
     "Change Manually": "Cambiar Manualmente", 
     "Change My Email Address": "Cambiar mi direcci\u00f3n de correo electr\u00f3nico", 
     "Change image": "Cambiar imagen", 
-    "Change the settings for {display_name}": "Cambiar los ajustes para {display_name}", 
     "Chapter Asset": "Recursos del cap\u00edtulo", 
     "Chapter Name": "Nombre del cap\u00edtulo", 
     "Chapter information": "Informaci\u00f3n del cap\u00edtulo", 
@@ -547,7 +539,6 @@
     "Edit Membership": "Editar membres\u00eda", 
     "Edit Team": "Editar Equipo", 
     "Edit Your Name": "Edite su nombre", 
-    "Edit the name": "Editar el nombre", 
     "Edit this certificate?": "\u00bfEditar este certificado?", 
     "Edit your post below.": "Edite su publicaci\u00f3n a continuaci\u00f3n.", 
     "Editable": "Editable", 
@@ -682,7 +673,6 @@
     "Free text notes": "Notas libres", 
     "Frequently Asked Questions": "Preguntas frecuentes", 
     "Full Name": "Nombre completo", 
-    "Full Profile": "Perfil completo", 
     "Fullscreen": "Pantalla completa", 
     "Fully Supported": "Completamente soportado", 
     "Gender": "G\u00e9nero", 
@@ -845,7 +835,6 @@
     "License Display": "Muestra de la Licencia", 
     "License Type": "Tipo de Licencia", 
     "Limit Access": "Restrinja permisos", 
-    "Limited Profile": "Perfil limitado", 
     "Link Description": "Descripci\u00f3n del v\u00ednculo", 
     "Link Your Account": "Vincular tu cuenta", 
     "Link types should be unique.": "Los tipos de v\u00ednculos deben ser \u00fanicos.", 
@@ -1084,9 +1073,6 @@
     "Professional Certificate for {courseName}": "Certificado Profesional para {courseName}", 
     "Professional Education": "Educaci\u00f3n profesional", 
     "Professional Education Verified Certificate": "Certificado Verificado de Educaci\u00f3n Profesional", 
-    "Profile": "Perfil", 
-    "Profile Image": "Foto de perfil", 
-    "Profile image for {username}": "Foto de perfil para {username}", 
     "Promote another member to Admin to remove your admin rights": "Promueva a otro miembro del equipo a administrador si quiere quitar sus propios privilegios de administrador", 
     "Provisional": "Provisional", 
     "Provisionally Supported": "Soportado de forma provisional", 
@@ -1347,7 +1333,6 @@
     "Team name cannot have more than 255 characters.": "El nombre del equipo no puede tener m\u00e1s de 255 caracteres.", 
     "Teams": "Equipos", 
     "Teams Pagination": "Paginaci\u00f3n de Equipos", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "Comparte con otros usuarios algo sobre ti: donde vives, cuales son tus intereses, porque est\u00e1s tomando estos cursos, o cuales son tus expectativas de aprendizaje.", 
     "Templates": "Plantillas", 
     "Terms of Service and Honor Code": "T\u00e9rminos del servicio y c\u00f3digo de honor", 
     "Text": "Texto", 
@@ -1609,10 +1594,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "Use su c\u00e1mara web para tomar una fotograf\u00eda de su documento de identidad. Usaremos esta foto para verificarla contra la fotograf\u00eda de su cara y el nombre de su cuenta.", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "Use su c\u00e1mara web para tomar una fotograf\u00eda de su cara. Usaremos esta foto para verificarla contra la fotograf\u00eda de su documento de identificaci\u00f3n.", 
     "Used": "Utilizado", 
-    "Used in {count} unit": [
-      "Usado en {count} unidades", 
-      "Usado en {count} unidades"
-    ], 
     "User": "Usuario", 
     "User Email": "Correo electr\u00f3nico del usuario", 
     "Username": "Nombre de usuario", 
@@ -1740,12 +1721,10 @@
     "You haven't added any assets to this course yet.": "No ha a\u00f1adido a\u00fan ning\u00fan recurso a este curso.", 
     "You haven't added any content to this course yet.": "Todav\u00eda no ha a\u00f1adido ning\u00fan contenido a este curso.", 
     "You haven't added any textbooks to this course yet.": "No ha a\u00f1adido a\u00fan ning\u00fan libro de texto a este curso.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "Debes tener 13 a\u00f1os o m\u00e1s para compartir un perfil completo.  Si tienes m\u00e1s de esta edad, aseg\u00farate que has especificado un a\u00f1o de nacimiento en {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "Se debe introducir un email valido para adicionar un nuevo miembro en el equipo. ", 
     "You must sign out and sign back in before your language changes take effect.": "Debes cerrar sesi\u00f3n y volver a iniciar para que se aplique el cambio de idioma", 
     "You must specify a name": "Debe especificar un nombre", 
     "You must specify a name for the cohort": "Debes especificar un nombre para el cohorte", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "Debes especificar un a\u00f1o de nacimiento antes de poder compartir tu perfil completo. Para definir un a\u00f1o de nacimiento, visita {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "Necesita un equipo que tenga una webcam. Cuando reciba un mensaje desde su navegador web, aseg\u00farese de permitir el acceso a su webcam.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "Necesita el documento de identidad, licencia de conducir, pasaporte u otra identificaci\u00f3n certificada por el gobierno, que contenga su foto y nombre.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "Necesitas un ID con tu nombre y foto. Licencia, pasaporte, c\u00e9dula todos son aceptados.", 
@@ -1916,7 +1895,6 @@
     ], 
     "{organization}\\'s logo": "Logo de la {organization}", 
     "{paragraphStart}You entered {boldStart}{email}{boldEnd}. If this email address is associated with your {platform_name} account, we will send a message with password reset instructions to this email address.{paragraphEnd}{paragraphStart}If you do not receive a password reset message, verify that you entered the correct email address, or check your spam folder.{paragraphEnd}{paragraphStart}If you need further assistance, {anchorStart}contact technical support{anchorEnd}.{paragraphEnd}": "{paragraphStart}Tu ingresaste {boldStart}{email}{boldEnd}. Si esta direcci\u00f3n de email est\u00e1 asociada con tu cuenta en {platform_name}, enviaremos un mensaje a esta direcci\u00f3n con instrucciones para restablecer tu contrase\u00f1a.{paragraphEnd}{paragraphStart}Si no recibes ning\u00fan mensaje, verifica que ingresaste la direcci\u00f3n correctamente y revisa tu carpeta de spam.{paragraphEnd}{paragraphStart}Si necesitas asistencia adicional, {anchorStart}contacta al equipo de soporte{anchorEnd}.{paragraphEnd}", 
-    "{platform_name} learners can see my:": "Los usuarios de {platform_name} pueden ver mi:", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}Advertencia:{screen_reader_end} No existe ning\u00fan grupo de contenido.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}Advertencia:{screen_reader_end} El grupo de contenido previamente seleccionado ha sido borrado. Seleccione otro grupo de contenido.", 
     "{start_strong}{total}{end_strong} words submitted in total.": "{start_strong}{total}{end_strong} palabras enviadas en total.", 
diff --git a/lms/static/js/i18n/fake2/djangojs.js b/lms/static/js/i18n/fake2/djangojs.js
index ec40ea0c90..71b910f28d 100644
--- a/lms/static/js/i18n/fake2/djangojs.js
+++ b/lms/static/js/i18n/fake2/djangojs.js
@@ -1451,6 +1451,7 @@
     "Thanks for returning to verify your ID in: {courseName}": "\u0166\u0265\u0250n\u029es \u025f\u00f8\u0279 \u0279\u01dd\u0287n\u0279n\u1d09n\u0183 \u0287\u00f8 \u028c\u01dd\u0279\u1d09\u025f\u028e \u028e\u00f8n\u0279 \u0197\u0110 \u1d09n: {courseName}", 
     "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0166\u0265\u01dd \u0244\u024c\u0141 \u028e\u00f8n \u01ddn\u0287\u01dd\u0279\u01ddd s\u01dd\u01dd\u026fs \u0287\u00f8 b\u01dd \u0250n \u01dd\u026f\u0250\u1d09l \u0250dd\u0279\u01ddss. \u0110\u00f8 \u028e\u00f8n \u028d\u0250n\u0287 \u0287\u00f8 \u0250dd \u0287\u0265\u01dd \u0279\u01ddbn\u1d09\u0279\u01ddd \u026f\u0250\u1d09l\u0287\u00f8: d\u0279\u01dd\u025f\u1d09x?", 
     "The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "\u0166\u0265\u01dd \u0244\u024c\u0141 \u028e\u00f8n \u01ddn\u0287\u01dd\u0279\u01ddd s\u01dd\u01dd\u026fs \u0287\u00f8 b\u01dd \u0250n \u01ddx\u0287\u01dd\u0279n\u0250l l\u1d09n\u029e. \u0110\u00f8 \u028e\u00f8n \u028d\u0250n\u0287 \u0287\u00f8 \u0250dd \u0287\u0265\u01dd \u0279\u01ddbn\u1d09\u0279\u01ddd \u0265\u0287\u0287d:// d\u0279\u01dd\u025f\u1d09x?", 
+    "The certificate available date must be later than the enrollment start date.": "\u0166\u0265\u01dd \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u0250\u028c\u0250\u1d09l\u0250bl\u01dd d\u0250\u0287\u01dd \u026fns\u0287 b\u01dd l\u0250\u0287\u01dd\u0279 \u0287\u0265\u0250n \u0287\u0265\u01dd \u01ddn\u0279\u00f8ll\u026f\u01ddn\u0287 s\u0287\u0250\u0279\u0287 d\u0250\u0287\u01dd.", 
     "The certificate for this learner has been re-validated and the system is re-running the grade for this learner.": "\u0166\u0265\u01dd \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u025f\u00f8\u0279 \u0287\u0265\u1d09s l\u01dd\u0250\u0279n\u01dd\u0279 \u0265\u0250s b\u01dd\u01ddn \u0279\u01dd-\u028c\u0250l\u1d09d\u0250\u0287\u01ddd \u0250nd \u0287\u0265\u01dd s\u028es\u0287\u01dd\u026f \u1d09s \u0279\u01dd-\u0279nnn\u1d09n\u0183 \u0287\u0265\u01dd \u0183\u0279\u0250d\u01dd \u025f\u00f8\u0279 \u0287\u0265\u1d09s l\u01dd\u0250\u0279n\u01dd\u0279.", 
     "The cohort cannot be added": "\u0166\u0265\u01dd \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0254\u0250nn\u00f8\u0287 b\u01dd \u0250dd\u01ddd", 
     "The cohort cannot be saved": "\u0166\u0265\u01dd \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0254\u0250nn\u00f8\u0287 b\u01dd s\u0250\u028c\u01ddd", 
@@ -1586,6 +1587,7 @@
     "This team does not have any members.": "\u0166\u0265\u1d09s \u0287\u01dd\u0250\u026f d\u00f8\u01dds n\u00f8\u0287 \u0265\u0250\u028c\u01dd \u0250n\u028e \u026f\u01dd\u026fb\u01dd\u0279s.", 
     "This team is full.": "\u0166\u0265\u1d09s \u0287\u01dd\u0250\u026f \u1d09s \u025fnll.", 
     "This thread is closed.": "\u0166\u0265\u1d09s \u0287\u0265\u0279\u01dd\u0250d \u1d09s \u0254l\u00f8s\u01ddd.", 
+    "This unit has validation issues.": "\u0166\u0265\u1d09s nn\u1d09\u0287 \u0265\u0250s \u028c\u0250l\u1d09d\u0250\u0287\u1d09\u00f8n \u1d09ssn\u01dds.", 
     "This vote could not be processed. Refresh the page and try again.": "\u0166\u0265\u1d09s \u028c\u00f8\u0287\u01dd \u0254\u00f8nld n\u00f8\u0287 b\u01dd d\u0279\u00f8\u0254\u01ddss\u01ddd. \u024c\u01dd\u025f\u0279\u01dds\u0265 \u0287\u0265\u01dd d\u0250\u0183\u01dd \u0250nd \u0287\u0279\u028e \u0250\u0183\u0250\u1d09n.", 
     "This {parentCategory} has no {childCategory}": "\u0166\u0265\u1d09s {parentCategory} \u0265\u0250s n\u00f8 {childCategory}", 
     "Thumbnail": "\u0166\u0265n\u026fbn\u0250\u1d09l", 
diff --git a/lms/static/js/i18n/fr/djangojs.js b/lms/static/js/i18n/fr/djangojs.js
index e2fb72ba9b..9f6cee11d2 100644
--- a/lms/static/js/i18n/fr/djangojs.js
+++ b/lms/static/js/i18n/fr/djangojs.js
@@ -112,15 +112,10 @@
     "A valid email address is required": "Une adresse email valide est requise", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 
     "Abbreviation": "Abr\u00e9viation", 
-    "About Me": "\u00c0 propos de moi", 
     "About You": "A propos de vous", 
-    "About me": "A propos de moi", 
-    "Accomplishments": "Accomplissements", 
-    "Accomplishments Pagination": "Paginations des r\u00e9alisations", 
     "Account Information": "Information du compte", 
     "Account Not Activated": "Compte non activ\u00e9", 
     "Account Settings": "Param\u00e8tres du compte", 
-    "Account Settings page.": "Param\u00e8tres du compte", 
     "Action": "Action", 
     "Action required: Enter a valid date.": "Action requise : Entrez une date valide.", 
     "Actions": "Actions", 
@@ -131,7 +126,6 @@
     "Add Additional Signatory": "Ajouter une signature additionnelle.", 
     "Add Cohort": "Ajouter une cohorte", 
     "Add Component:": "Ajouter un composant :", 
-    "Add Country": "Ajouter un Pays", 
     "Add New Component": "Ajouter un nouveau Composant", 
     "Add URLs for additional versions": "Ajoutez des URL pour des versions suppl\u00e9mentaires", 
     "Add a Chapter": "Ajouter un chapitre", 
@@ -141,7 +135,6 @@
     "Add a comment": "Ajouter un commentaire", 
     "Add a response:": "Ajouter une r\u00e9ponse", 
     "Add another group": "Ajouter un autre groupe", 
-    "Add language": "Ajouter une langue", 
     "Add to Dictionary": "Ajouter au dictionnaire", 
     "Add your first content group": "Ajouter votre premier groupe de contenu", 
     "Add your first group configuration": "Ajouter votre premier groupe de configuration", 
@@ -267,7 +260,6 @@
     "Change Manually": "Changer manuellement", 
     "Change My Email Address": "Modifier mon adresse email", 
     "Change image": "Modifier l'image", 
-    "Change the settings for {display_name}": "Modifier les param\u00e8tres pour {display_name}", 
     "Chapter Asset": "Ressource associ\u00e9e au chapitre", 
     "Chapter Name": "Nom du chapitre", 
     "Chapter information": "Information sur le chapitre", 
@@ -455,7 +447,6 @@
     "Edit HTML": "Editer le code HTML", 
     "Edit Team": "Modifier l'\u00e9quipe", 
     "Edit Your Name": "Modifier votre nom", 
-    "Edit the name": "Modifier le nom", 
     "Edit this certificate?": "Modifier ce certificat ?", 
     "Editable": "Modifiable", 
     "Editing comment": "Commentaire en cours d'\u00e9dition", 
@@ -562,7 +553,6 @@
     "Free text notes": "Notes libres", 
     "Frequently Asked Questions": "Foire Aux Questions", 
     "Full Name": "Nom complet", 
-    "Full Profile": "Profil complet", 
     "Fullscreen": "Plein \u00e9cran", 
     "Gender": "Genre", 
     "General": "G\u00e9n\u00e9ral", 
@@ -690,7 +680,6 @@
     "License Display": "Affichage de la licence", 
     "License Type": "Type de licence", 
     "Limit Access": "Acc\u00e8s Limit\u00e9", 
-    "Limited Profile": "Profil restreint", 
     "Link Description": "Description du Lien", 
     "Link Your Account": "Liez votre compte", 
     "Link types should be unique.": "Les types de liens doivent \u00eatre uniques.", 
@@ -895,9 +884,6 @@
     "Proctored exams are timed and they record video of each learner taking the exam. The videos are then reviewed to ensure that learners follow all examination rules.": "Les examens v\u00e9rifi\u00e9s sont minut\u00e9s et un enregistrement vid\u00e9o est fait que chaque \u00e9tudiant. Les vid\u00e9o sont ensuite v\u00e9rifi\u00e9es pour s'assurer que les conditions de l'examen \u00e9taient correctes;", 
     "Professional Education": "Formation professionnelle", 
     "Professional Education Verified Certificate": "Certificat v\u00e9rifif\u00e9 professionel", 
-    "Profile": "Profil", 
-    "Profile Image": "Image du profil", 
-    "Profile image for {username}": "Image de profil pour {username}", 
     "Promote another member to Admin to remove your admin rights": "Veuillez ajouter un autre membre comme administrateur pour supprimer vos droits d'administrateurs", 
     "Public": "Public", 
     "Publish": "Publier", 
@@ -1098,7 +1084,6 @@
     "Team name cannot have more than 255 characters.": "Le nom de l'\u00e9quipe ne peut pas d\u00e9passer 255 caract\u00e8res.", 
     "Teams": "\u00c9quipes", 
     "Teams Pagination": "Pagination des \u00e9quipes", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "Parlez nous de vous : o\u00f9 habitez-vous, quels sont vos int\u00e9r\u00eats, pourquoi suivez-vous des cours ou ce que vous souhaitez apprendre.", 
     "Templates": "Mod\u00e8les", 
     "Text": "Texte", 
     "Text color": "Couleur du texte", 
@@ -1282,10 +1267,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "Utilisez votre webcam pour prendre une photo de votre pi\u00e8ce d'identit\u00e9. Nous allons v\u00e9rifier sa concordance avec la photo de votre visage et le nom de votre compte.", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "Utiliser votre webcam pour prendre une photo de votre visage, afin que nous puissions la comparer avec celle de votre pi\u00e8ce d'identit\u00e9.", 
     "Used": "Utilis\u00e9", 
-    "Used in {count} unit": [
-      "Utilis\u00e9 par {count} unit\u00e9s.", 
-      "Utilis\u00e9s par {count} unit\u00e9s."
-    ], 
     "User": "Utilisateur", 
     "User Email": "Email de l'utilisateur", 
     "Username": "Nom d'utilisateur", 
@@ -1390,12 +1371,10 @@
     "You haven't added any assets to this course yet.": "Vous n'avez encore ajout\u00e9 aucune ressource dans ce cours.", 
     "You haven't added any content to this course yet.": "Vous n'avez pas encore ajout\u00e9 de contenu \u00e0 ce cours.", 
     "You haven't added any textbooks to this course yet.": "Vous n'avez encore ajout\u00e9 aucun manuel \u00e0 ce cours.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "Vous devez avoir plus de 13 ans pour partager un profil complet. Si vous avez plus de 13 ans, assurez-vous que votre ann\u00e9e de naissance est correcte dans {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "Vous devez saisir une adresse e-mail valide afin d'ajouter un nouveau membre \u00e0 l'\u00e9quipe", 
     "You must sign out and sign back in before your language changes take effect.": "Vous devez vous d\u00e9connecter puis vous connecter \u00e0 nouveau afin que les param\u00e8tres de langue prennent effet.", 
     "You must specify a name": "Vous devez indiquer un nom", 
     "You must specify a name for the cohort": "Vous devez indiquer un nom pour la cohorte", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "Vous devez renseigner votre ann\u00e9e de naissance avant de pouvoir partager votre profil complet. Pour renseigner votre ann\u00e9e de naissance, allez sur {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "Vous avez besoin d'un ordinateur dot\u00e9 d'une webcam. Lors que votre explorateur vous le demandera, assurez vous de lui donner l'autorisation d'acc\u00e9der \u00e0 la webcam.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "Vous avez besoin d'un permis de conduire, d'un passeport ou d'une pi\u00e8ce d'identit\u00e9 avec votre nom et photo.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "Vous avez besoin d'un permis de conduire, un passeport ou toute pi\u00e8ce d'identit\u00e9 avec votre nom et photo.", 
@@ -1526,7 +1505,6 @@
       "{numVotes} Vote", 
       "{numVotes} Votes"
     ], 
-    "{platform_name} learners can see my:": "Les utilisateurs de {platform_name} peuvent voir mon:", 
     "{start_strong}{total}{end_strong} words submitted in total.": "{start_strong}{total}{end_strong} mots soumis au total.", 
     "{unread_comments_count} new": "{unread_comments_count} nouveaux", 
     "\u2026": "\u2026"
diff --git a/lms/static/js/i18n/he/djangojs.js b/lms/static/js/i18n/he/djangojs.js
index b14d84eaac..0691756f33 100644
--- a/lms/static/js/i18n/he/djangojs.js
+++ b/lms/static/js/i18n/he/djangojs.js
@@ -19,9 +19,17 @@
   /* gettext library */
 
   django.catalog = {
+    " and ": "\u05d5\u05d2\u05dd", 
     " learner does not exist in LMS and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3 \u05d0\u05d9\u05e0\u05d5 \u05e7\u05d9\u05d9\u05dd \u05d1-LMS \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " learner is already white listed and not added to the exception list": " \u05d4\u05ea\u05dc\u05de\u05d9\u05d3 \u05db\u05d1\u05e8 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05d4 \u05d4\u05d1\u05d8\u05d5\u05d7\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd ", 
+    " learner is not enrolled in course and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3 \u05d0\u05d9\u05e0\u05d5 \u05e8\u05e9\u05d5\u05dd \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     " learner is successfully added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3 \u05e0\u05d5\u05e1\u05e3 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " learners are already white listed and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05db\u05d1\u05e8 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05d4 \u05d4\u05dc\u05d1\u05e0\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd ", 
+    " learners are not enrolled in course and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d0\u05d9\u05e0\u05dd \u05e8\u05e9\u05d5\u05de\u05d9\u05dd \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     " learners are successfully added to exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d5 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " learners do not exist in LMS and not added to the exception list": " \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05dc\u05d0 \u05e7\u05d9\u05d9\u05de\u05d9\u05dd \u05d1-LMS \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " record is not in correct format and not added to the exception list": " \u05d4\u05e8\u05e9\u05d5\u05de\u05d4 \u05d0\u05d9\u05e0\u05d4 \u05d1\u05ea\u05d1\u05e0\u05d9\u05ea \u05d4\u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d4 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
+    " records are not in correct format and not added to the exception list": " \u05d4\u05e8\u05e9\u05d5\u05de\u05d5\u05ea \u05d0\u05d9\u05e0\u05df \u05d1\u05ea\u05d1\u05e0\u05d9\u05ea \u05d4\u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d5\u05e1\u05e4\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     "#Replies": "#\u05ea\u05e9\u05d5\u05d1\u05d5\u05ea", 
     "%(cohort_name)s (%(user_count)s)": "%(cohort_name)s (%(user_count)s)", 
     "%(comments_count)s %(span_sr_open)scomments %(span_close)s": "%(comments_count)s %(span_sr_open)s\u05d4\u05e2\u05e8\u05d5\u05ea %(span_close)s", 
@@ -104,11 +112,14 @@
     "%s from now": "%s \u05de\u05e2\u05db\u05e9\u05d9\u05d5", 
     "(Add signatories for a certificate)": "(\u05d4\u05d5\u05e1\u05e3 \u05d7\u05ea\u05d9\u05de\u05d5\u05ea \u05dc\u05ea\u05e2\u05d5\u05d3\u05d4)", 
     "(Caption will be displayed when you start playing the video.)": "(\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05d9\u05d5\u05e6\u05d2\u05d5 \u05db\u05d0\u05e9\u05e8 \u05ea\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5).", 
+    "(Community TA)": "(\u05e2\u05d5\u05d6\u05e8 \u05d4\u05d5\u05e8\u05d0\u05d4 \u05e7\u05d4\u05d9\u05dc\u05ea\u05d9)", 
     "(Required Field)": "(\u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4)", 
+    "(Staff)": "(\u05e6\u05d5\u05d5\u05ea)", 
     "(contains %(student_count)s student)": [
       "(\u05db\u05d5\u05dc\u05dc\u05ea \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 %(student_count)s)", 
       "(\u05db\u05d5\u05dc\u05dc\u05ea %(student_count)s \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd)"
     ], 
+    "(optional)": "(\u05d0\u05d5\u05e4\u05e6\u05d9\u05d5\u05e0\u05d0\u05dc\u05d9)", 
     "- Sortable": "-\u05e0\u05d9\u05ea\u05df \u05dc\u05de\u05d9\u05d5\u05df", 
     ": video upload complete.": ": \u05d4\u05e2\u05dc\u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05d5\u05e9\u05dc\u05de\u05d4.", 
     "<%= user %> already in exception list.": "<%= user %> \u05db\u05d1\u05e8 \u05e0\u05de\u05e6\u05d0 \u05d1\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd.", 
@@ -121,15 +132,10 @@
     "A valid email address is required": "\u05d3\u05e8\u05d5\u05e9\u05d4 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05ea\u05e7\u05d9\u05e0\u05d4", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9\u05db\u05dc\u05de\u05e0\u05e1\u05e2\u05e4\u05e6\u05e7\u05e8\u05e9\u05ea", 
     "Abbreviation": "\u05e7\u05d9\u05e6\u05d5\u05e8", 
-    "About Me": "\u05e2\u05dc \u05e2\u05e6\u05de\u05d9", 
     "About You": "\u05e2\u05dc \u05e2\u05e6\u05de\u05da", 
-    "About me": "\u05e2\u05dc \u05e2\u05e6\u05de\u05d9", 
-    "Accomplishments": "\u05d4\u05d9\u05e9\u05d2\u05d9\u05dd", 
-    "Accomplishments Pagination": "\u05e2\u05d9\u05de\u05d5\u05d3 \u05d4\u05d9\u05e9\u05d2\u05d9\u05dd", 
     "Account Information": "\u05e4\u05e8\u05d8\u05d9 \u05d7\u05e9\u05d1\u05d5\u05df", 
     "Account Not Activated": "\u05d4\u05d7\u05e9\u05d1\u05d5\u05df \u05d0\u05d9\u05e0\u05d5 \u05de\u05d5\u05e4\u05e2\u05dc", 
     "Account Settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d7\u05e9\u05d1\u05d5\u05df", 
-    "Account Settings page.": "\u05e2\u05de\u05d5\u05d3 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d7\u05e9\u05d1\u05d5\u05df", 
     "Action": "\u05e4\u05e2\u05d5\u05dc\u05d4", 
     "Action required: Enter a valid date.": "\u05e0\u05d3\u05e8\u05e9\u05ea \u05e4\u05e2\u05d5\u05dc\u05d4: \u05d4\u05d6\u05df \u05ea\u05d0\u05e8\u05d9\u05da \u05d7\u05d5\u05e7\u05d9.", 
     "Actions": "\u05e4\u05e2\u05d5\u05dc\u05d5\u05ea", 
@@ -141,28 +147,30 @@
     "Add Additional Signatory": "\u05d4\u05d5\u05e1\u05e3 \u05d7\u05ea\u05d9\u05de\u05d4 \u05e0\u05d5\u05e1\u05e4\u05ea", 
     "Add Cohort": "\u05d4\u05d5\u05e1\u05e3 \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
     "Add Component:": "\u05d4\u05d5\u05e1\u05e3 \u05e8\u05db\u05d9\u05d1:", 
-    "Add Country": "\u05d4\u05d5\u05e1\u05e3 \u05de\u05d3\u05d9\u05e0\u05d4", 
     "Add New Component": "\u05d4\u05d5\u05e1\u05e3 \u05e8\u05db\u05d9\u05d1 \u05d7\u05d3\u05e9", 
     "Add URLs for additional versions": "\u05d4\u05d5\u05e1\u05e3 \u05db\u05ea\u05d5\u05d1\u05d5\u05ea URL \u05e2\u05d1\u05d5\u05e8 \u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05e0\u05d5\u05e1\u05e4\u05d5\u05ea", 
     "Add a Chapter": "\u05d4\u05d5\u05e1\u05e3 \u05e4\u05e8\u05e7", 
     "Add a New Cohort": "\u05d4\u05d5\u05e1\u05e3 \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05d7\u05d3\u05e9\u05d4", 
     "Add a Post": "\u05d4\u05d5\u05e1\u05e3 \u05e4\u05d5\u05e1\u05d8", 
     "Add a Response": "\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d2\u05d5\u05d1\u05d4", 
+    "Add a clear and descriptive title to encourage participation. (Required)": "\u05d4\u05d5\u05e1\u05e3 \u05db\u05d5\u05ea\u05e8\u05ea \u05d1\u05e8\u05d5\u05e8\u05d4 \u05d5\u05ea\u05d9\u05d0\u05d5\u05e8\u05d9\u05ea \u05d1\u05db\u05d3\u05d9 \u05dc\u05e2\u05d5\u05d3\u05d3 \u05d0\u05ea \u05d4\u05d4\u05e9\u05ea\u05ea\u05e4\u05d5\u05ea \u05d1\u05d3\u05d9\u05d5\u05df. (\u05d7\u05d5\u05d1\u05d4).", 
     "Add a comment": "\u05d4\u05d5\u05e1\u05e3 \u05d4\u05e2\u05e8\u05d4", 
     "Add a learning outcome here": "\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d5\u05e6\u05d0\u05ea \u05dc\u05de\u05d9\u05d3\u05d4 \u05db\u05d0\u05df", 
     "Add a response:": "\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d2\u05d5\u05d1\u05d4:", 
     "Add another group": "\u05d4\u05d5\u05e1\u05e3 \u05e7\u05d1\u05d5\u05e6\u05d4 \u05d0\u05d7\u05e8\u05ea", 
-    "Add language": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05e4\u05d4", 
     "Add notes about this learner": "\u05d4\u05d5\u05e1\u05e3 \u05d4\u05e2\u05e8\u05d5\u05ea \u05dc\u05d2\u05d1\u05d9 \u05dc\u05d5\u05de\u05d3 \u05d6\u05d4", 
     "Add to Dictionary": "\u05d4\u05d5\u05e1\u05e3 \u05dc\u05de\u05d9\u05dc\u05d5\u05df", 
     "Add to Exception List": "\u05d4\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05e8\u05d9\u05d2\u05d9\u05dd", 
     "Add your first content group": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05d4\u05e8\u05d0\u05e9\u05d5\u05e0\u05d4 \u05e9\u05dc\u05da", 
     "Add your first group configuration": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05d4\u05d2\u05d3\u05e8\u05ea \u05ea\u05e6\u05d5\u05e8\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea\u05da \u05d4\u05e8\u05d0\u05e9\u05d5\u05e0\u05d4 ", 
     "Add your first textbook": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05e1\u05e4\u05e8 \u05d4\u05dc\u05d9\u05de\u05d5\u05d3 \u05d4\u05e8\u05d0\u05e9\u05d5\u05df \u05e9\u05dc\u05da", 
+    "Add your post to a relevant topic to help others find it. (Required)": "\u05d4\u05d5\u05e1\u05e3 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05dc\u05da \u05dc\u05e0\u05d5\u05e9\u05d0 \u05d4\u05e8\u05dc\u05d5\u05d5\u05e0\u05d8\u05d9 \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e7\u05dc \u05e2\u05dc \u05d0\u05d7\u05e8\u05d9\u05dd \u05dc\u05de\u05e6\u05d5\u05d0 \u05d0\u05d5\u05ea\u05d5. (\u05d7\u05d5\u05d1\u05d4)", 
     "Add {role} Access": "\u05d4\u05d5\u05e1\u05e3 \u05d2\u05d9\u05e9\u05ea {role}", 
     "Adding": "\u05de\u05d5\u05e1\u05d9\u05e3", 
     "Adding the selected course to your cart": "\u05d4\u05d5\u05e1\u05e4\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e9\u05e0\u05d1\u05d7\u05e8 \u05dc\u05e2\u05d2\u05dc\u05ea \u05d4\u05e7\u05e0\u05d9\u05d5\u05ea \u05e9\u05dc\u05da", 
     "Additional Information": "\u05de\u05d9\u05d3\u05e2 \u05e0\u05d5\u05e1\u05e3", 
+    "Additional posts could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e4\u05d5\u05e1\u05d8\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d9\u05dd. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "Additional responses could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05ea\u05d2\u05d5\u05d1\u05d5\u05ea \u05e0\u05d5\u05e1\u05e4\u05d5\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Adjust video speed": "\u05d4\u05ea\u05d0\u05dd \u05d0\u05ea \u05de\u05d4\u05d9\u05e8\u05d5\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5", 
     "Adjust video volume": "\u05d4\u05ea\u05d0\u05dd \u05d0\u05ea \u05e2\u05d5\u05e6\u05de\u05ea \u05d4\u05e7\u05d5\u05dc \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5", 
     "Admin": "\u05de\u05e0\u05d4\u05dc", 
@@ -183,6 +191,7 @@
     "All groups must have a name.": "\u05dc\u05db\u05dc \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd.", 
     "All groups must have a unique name.": "\u05dc\u05db\u05dc \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd \u05d9\u05d9\u05d7\u05d5\u05d3\u05d9.", 
     "All learners in the {cohort_name} cohort": "\u05db\u05dc \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3 {cohort_name}", 
+    "All learners in the {track_name} track": "\u05db\u05dc \u05de\u05d9 \u05e9\u05dc\u05d5\u05de\u05d3 \u05d1\u05de\u05e1\u05dc\u05d5\u05dc {track_name}", 
     "All learners who are enrolled in this course": "\u05db\u05dc \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05e9\u05e8\u05e9\u05d5\u05de\u05d9\u05dd \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4", 
     "All payment options are currently unavailable.": "\u05db\u05dc \u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05d4\u05ea\u05e9\u05dc\u05d5\u05dd \u05d0\u05d9\u05e0\u05df \u05d6\u05de\u05d9\u05e0\u05d5\u05ea \u05db\u05e8\u05d2\u05e2.", 
     "All professional education courses are fee-based, and require payment to complete the enrollment process.": "\u05db\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05d1\u05d7\u05d9\u05e0\u05d5\u05da \u05d4\u05de\u05e7\u05e6\u05d5\u05e2\u05d9 \u05de\u05d1\u05d5\u05e1\u05e1\u05d9\u05dd \u05e2\u05dc \u05ea\u05e9\u05dc\u05d5\u05dd, \u05d5\u05dc\u05db\u05df \u05e0\u05d3\u05e8\u05e9 \u05ea\u05e9\u05dc\u05d5\u05dd \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05ea\u05d4\u05dc\u05d9\u05da \u05d4\u05d4\u05e8\u05e9\u05de\u05d4.", 
@@ -211,6 +220,7 @@
     "An error has occurred. Refresh the page, and then try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
     "An error has occurred. Try refreshing the page, or check your Internet connection.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4. \u05e0\u05e1\u05d4 \u05dc\u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d0\u05d5 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d7\u05d9\u05d1\u05d5\u05e8 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8.", 
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d0\u05d7\u05d6\u05d5\u05e8 \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05da. \u05d0\u05e0\u05d0 \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1 \u05de\u05d0\u05d5\u05d7\u05e8 \u05d9\u05d5\u05ea\u05e8. \u05d0\u05dd \u05d4\u05d1\u05e2\u05d9\u05d4 \u05e0\u05de\u05e9\u05db\u05ea, \u05e4\u05e0\u05d4 \u05dc\u05ea\u05de\u05d9\u05db\u05d4 \u05d8\u05db\u05e0\u05d9\u05ea. ", 
+    "An error occurred when signing you in to %s.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05d4\u05d7\u05d9\u05d1\u05d5\u05e8 \u05e9\u05dc\u05da \u05dc-%s.", 
     "An error occurred while removing the member from the team. Try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05d4\u05e1\u05e8\u05ea \u05d7\u05d1\u05e8 \u05de\u05d4\u05e6\u05d5\u05d5\u05ea. \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
     "An error occurred.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4.", 
     "An error occurred. Make sure that the student's username or email address is correct and try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4. \u05d0\u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d0\u05d5 \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05d5 \u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
@@ -233,6 +243,7 @@
     "Are you sure you want to delete this update?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea \u05e2\u05d3\u05db\u05d5\u05df \u05d6\u05d4?", 
     "Are you sure you want to delete {email} from the course team for \u201c{container}\u201d?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05de\u05d7\u05d5\u05e7  {email} \u05de\u05e6\u05d5\u05d5\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e2\u05d1\u05d5\u05e8 \u201c{container}\u201d? ", 
     "Are you sure you want to delete {email} from the library \u201c{container}\u201d?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea {email} \u05de\u05e1\u05e4\u05e8\u05d9\u05d9\u05ea \u201c{container}\u201d?", 
+    "Are you sure you want to remove this video from the list?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05e1\u05d9\u05e8 \u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d6\u05d4 \u05de\u05d4\u05e8\u05e9\u05d9\u05de\u05d4?", 
     "Are you sure you want to restrict {email} access to \u201c{container}\u201d?": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05d4\u05d2\u05d1\u05d9\u05dc \u05d0\u05ea \u05d2\u05d9\u05e9\u05ea {email}  \u05dc\u201c{container}\u201d?", 
     "Are you sure you want to revert to the last published version of the unit? You cannot undo this action.": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d2\u05e8\u05e1\u05d4 \u05d4\u05d0\u05d7\u05e8\u05d5\u05e0\u05d4 \u05e9\u05dc \u05d9\u05d7\u05d9\u05d3\u05d4 \u05d6\u05d5, \u05e9\u05e4\u05d5\u05e8\u05e1\u05de\u05d4 ? \u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05d1\u05d8\u05dc \u05e4\u05e2\u05d5\u05dc\u05d4 \u05d6\u05d5. ", 
     "Are you sure you wish to delete this item. It cannot be reversed!\n\nAlso any content that links/refers to this item will no longer work (e.g. broken images and/or links)": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05de\u05d7\u05d5\u05e7 \u05e4\u05e8\u05d9\u05d8 \u05d6\u05d4. \u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05d9\u05d4\u05d9\u05d4 \u05dc\u05e9\u05d7\u05d6\u05e8 \u05d0\u05ea \u05d4\u05e4\u05e2\u05d5\u05dc\u05d4!\n\n\u05d1\u05e0\u05d5\u05e1\u05e3, \u05db\u05dc \u05ea\u05d5\u05db\u05df \u05e9\u05de\u05e7\u05e9\u05e8/\u05de\u05ea\u05d9\u05d9\u05d7\u05e1 \u05dc\u05e4\u05e8\u05d9\u05d8 \u05d6\u05d4 \u05dc\u05d0 \u05d9\u05e2\u05d1\u05d5\u05d3 \u05d9\u05d5\u05ea\u05e8 (\u05dc\u05d3\u05d5\u05d2\u05de\u05d4, \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05d5/\u05d0\u05d5 \u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd \u05e9\u05d1\u05d5\u05e8\u05d9\u05dd)", 
@@ -301,7 +312,6 @@
     "Change Manually": "\u05e9\u05e0\u05d4 \u05d9\u05d3\u05e0\u05d9\u05ea", 
     "Change My Email Address": "\u05e9\u05e0\u05d4 \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05d9", 
     "Change image": "\u05e9\u05e0\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4", 
-    "Change the settings for {display_name}": "\u05e9\u05e0\u05d4 \u05d0\u05ea \u05d4\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 {display_name}", 
     "Chapter Asset": "\u05e0\u05db\u05e1 \u05d4\u05e4\u05e8\u05e7", 
     "Chapter Name": "\u05e9\u05dd \u05d4\u05e4\u05e8\u05e7", 
     "Chapter information": "\u05de\u05d9\u05d3\u05e2 \u05e2\u05dc \u05d4\u05e4\u05e8\u05e7", 
@@ -330,6 +340,7 @@
     "Choose a .csv file": "\u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 CSV.", 
     "Choose a content group to associate": "\u05d1\u05d7\u05e8 \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05dc\u05e7\u05e9\u05e8", 
     "Choose mode": "\u05d1\u05d7\u05e8 \u05de\u05e6\u05d1", 
+    "Choose new file": "\u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 \u05d7\u05d3\u05e9", 
     "Choose one": "\u05d1\u05d7\u05e8 \u05d0\u05d7\u05d3", 
     "Choose your institution from the list below:": "\u05d1\u05d7\u05e8 \u05d0\u05ea \u05d4\u05de\u05d5\u05e1\u05d3 \u05e9\u05dc\u05da \u05de\u05d4\u05e8\u05e9\u05d9\u05de\u05d4 \u05e9\u05dc\u05d4\u05dc\u05df:", 
     "Circle": "\u05de\u05e2\u05d2\u05dc", 
@@ -356,6 +367,7 @@
     "Code block": "\u05d1\u05dc\u05d5\u05e7 \u05e7\u05d5\u05d3", 
     "Cohort Assignment Method": "\u05e9\u05d9\u05d8\u05ea \u05d4\u05e7\u05e6\u05d0\u05d4 \u05dc\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
     "Cohort Name": "\u05e9\u05dd \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
+    "Cohorts": "\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05dc\u05de\u05d9\u05d3\u05d4", 
     "Cohorts Disabled": "\u05d1\u05d8\u05dc \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
     "Cohorts Enabled": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05de\u05d0\u05d5\u05e4\u05e9\u05e8\u05ea", 
     "Collapse All": "\u05db\u05d5\u05d5\u05e5 \u05d4\u05db\u05dc", 
@@ -369,6 +381,7 @@
     "Commentary": "\u05d4\u05e2\u05e8\u05d5\u05ea", 
     "Common Problem Types": "\u05e1\u05d5\u05d2\u05d9 \u05d1\u05e2\u05d9\u05d5\u05ea \u05e0\u05e4\u05d5\u05e6\u05d5\u05ea", 
     "Community TA": "\u05e2\u05d5\u05d6\u05e8 \u05d4\u05d5\u05e8\u05d0\u05d4 \u05d1\u05e4\u05d5\u05e8\u05d5\u05dd", 
+    "Completed": "\u05d4\u05d5\u05e9\u05dc\u05dd", 
     "Component": "\u05e8\u05db\u05d9\u05d1", 
     "Component Location ID": "\u05de\u05d6\u05d4\u05d4 \u05de\u05d9\u05e7\u05d5\u05dd \u05e8\u05db\u05d9\u05d1", 
     "Configure": "\u05d4\u05d2\u05d3\u05e8", 
@@ -445,6 +458,7 @@
     "Deactivate": "\u05d1\u05d8\u05dc ", 
     "Decrease indent": "\u05d4\u05e7\u05d8\u05df \u05d4\u05d6\u05d7\u05d4", 
     "Default": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc", 
+    "Default (Local Time Zone)": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc (\u05d0\u05d6\u05d5\u05e8\u05d9 \u05d6\u05de\u05df \u05de\u05e7\u05d5\u05de\u05d9\u05d9\u05dd)", 
     "Default Timed Transcript": "\u05ea\u05de\u05dc\u05d9\u05dc \u05de\u05ea\u05d5\u05d6\u05de\u05df \u05db\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc", 
     "Delete": "\u05de\u05d7\u05e7", 
     "Delete \"<%= signatoryName %>\" from the list of signatories?": "\u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea \"<%= signatoryName %>\" \u05de\u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05d7\u05ea\u05d9\u05de\u05d5\u05ea?", 
@@ -459,12 +473,15 @@
     "Delete this %(item_display_name)s?": "\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4%(item_display_name)s?", 
     "Delete this asset": "\u05de\u05d7\u05e7 \u05e0\u05db\u05e1 \u05d6\u05d4", 
     "Delete this team?": "\u05dc\u05de\u05d7\u05d5\u05e7 \u05e6\u05d5\u05d5\u05ea \u05d6\u05d4?", 
+    "Delete this {xblock_type} (and prerequisite)?": "\u05d4\u05d0\u05dd \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea  {xblock_type} (and prerequisite) \u05d6\u05d4? ", 
+    "Delete this {xblock_type}?": "\u05d4\u05d0\u05dd \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea {xblock_type} \u05d6\u05d4?", 
     "Delete \u201c<%= name %>\u201d?": "\u05de\u05d7\u05e7 \u201c<%= name %>\u201d?", 
     "Deleted Content Group": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05e0\u05de\u05d7\u05e7\u05d4", 
     "Deleting": "\u05de\u05d5\u05d7\u05e7", 
     "Deleting a team is permanent and cannot be undone. All members are removed from the team, and team discussions can no longer be accessed.": "\u05de\u05d7\u05d9\u05e7\u05ea \u05e6\u05d5\u05d5\u05ea \u05d4\u05d9\u05d0 \u05e7\u05d1\u05d5\u05e2\u05d4 \u05d5\u05d0\u05d9\u05df \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05dc\u05d1\u05d8\u05dc\u05d4. \u05db\u05dc \u05d4\u05d7\u05d1\u05e8\u05d9\u05dd \u05d4\u05d5\u05e1\u05e8\u05d5 \u05de\u05d4\u05e6\u05d5\u05d5\u05ea, \u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d2\u05e9\u05ea \u05d9\u05d5\u05ea\u05e8 \u05dc\u05d3\u05d9\u05d5\u05e0\u05d9 \u05d4\u05e6\u05d5\u05d5\u05ea.", 
     "Deleting a textbook cannot be undone and once deleted any reference to it in your courseware's navigation will also be removed.": "\u05de\u05d7\u05d9\u05e7\u05ea \u05e1\u05e4\u05e8 \u05dc\u05d9\u05de\u05d5\u05d3 \u05d0\u05d9\u05e0\u05e0\u05d4 \u05d4\u05e4\u05d9\u05db\u05d4 \u05d5\u05d1\u05e8\u05d2\u05e2 \u05e9\u05ea\u05d1\u05d5\u05e6\u05e2 \u05de\u05d7\u05d9\u05e7\u05d4, \u05db\u05dc \u05d4\u05e4\u05e0\u05d9\u05d9\u05d4 \u05de\u05d4\u05dc\u05d5\u05de\u05d3\u05d4 \u05dc\u05e1\u05e4\u05e8 \u05ea\u05d9\u05de\u05d7\u05e7 \u05d2\u05dd \u05db\u05df. ", 
     "Deleting this %(item_display_name)s is permanent and cannot be undone.": "\u05de\u05d7\u05d9\u05e7\u05ea %(item_display_name)s \u05d4\u05d9\u05d0 \u05e7\u05d1\u05d5\u05e2\u05d4 \u05d5\u05d0\u05d9\u05e0\u05d4 \u05d4\u05e4\u05d9\u05db\u05d4.", 
+    "Deleting this {xblock_type} is permanent and cannot be undone.": "\u05de\u05d7\u05d9\u05e7\u05ea {xblock_type} \u05d6\u05d4 \u05d4\u05d9\u05d0 \u05e7\u05d1\u05d5\u05e2\u05d4 \u05d5\u05d0\u05d9\u05e0\u05d4 \u05d4\u05e4\u05d9\u05db\u05d4.", 
     "Deprecated": "\u05dc\u05d0  \u05de\u05d5\u05de\u05dc\u05e5 \u05dc\u05e9\u05d9\u05de\u05d5\u05e9", 
     "Description": "\u05ea\u05d9\u05d0\u05d5\u05e8", 
     "Description of the certificate": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4", 
@@ -515,7 +532,6 @@
     "Edit Membership": "\u05e2\u05e8\u05d5\u05da \u05d7\u05d1\u05e8\u05d5\u05ea", 
     "Edit Team": "\u05e2\u05e8\u05d5\u05da \u05e6\u05d5\u05d5\u05ea", 
     "Edit Your Name": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05e9\u05de\u05da", 
-    "Edit the name": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e9\u05dd", 
     "Edit this certificate?": "\u05dc\u05e2\u05e8\u05d5\u05da \u05ea\u05e2\u05d5\u05d3\u05d4 \u05d6\u05d5?", 
     "Edit your post below.": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05dc\u05d4\u05dc\u05df.", 
     "Editable": "\u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05e8\u05d9\u05db\u05d4", 
@@ -543,6 +559,7 @@
     "Enrollment Date": "\u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Enrollment Mode": "\u05de\u05e6\u05d1 \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Enrollment Opens on": "\u05d4\u05e8\u05d9\u05e9\u05d5\u05dd \u05e0\u05e4\u05ea\u05d7 \u05d1", 
+    "Enrollment Tracks": "\u05de\u05e1\u05dc\u05d5\u05dc\u05d9 \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Ensure that you can see your photo and read your name": "\u05d5\u05d3\u05d0 \u05db\u05d9 \u05e0\u05d9\u05ea\u05df \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea\u05da \u05d5\u05dc\u05e7\u05e8\u05d5\u05d0 \u05d0\u05ea \u05e9\u05de\u05da.", 
     "Enter Due Date and Time": "\u05d4\u05d6\u05df \u05ea\u05d0\u05e8\u05d9\u05da \u05e1\u05d9\u05d5\u05dd \u05d5\u05e9\u05e2\u05d4", 
     "Enter Start Date and Time": "\u05d4\u05d6\u05df \u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05ea\u05d7\u05dc\u05d4 \u05d5\u05e9\u05e2\u05d4", 
@@ -577,6 +594,7 @@
     "Error getting student list.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05e8\u05e9\u05d9\u05de\u05ea \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd.", 
     "Error getting student progress url for '<%- student_id %>'. Make sure that the student identifier is spelled correctly.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05db\u05ea\u05d5\u05d1\u05ea URL \u05e9\u05dc \u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05e2\u05d1\u05d5\u05e8 '<%- student_id %>'. \u05d5\u05d3\u05d0 \u05e9\u05de\u05d6\u05d4\u05d4 \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05de\u05d0\u05d5\u05d9\u05ea \u05db\u05d4\u05dc\u05db\u05d4.", 
     "Error getting task history for problem '<%- problem_id %>' and student '<%- student_id %>'. Make sure that the problem and student identifiers are complete and correct.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05e7\u05d1\u05dc\u05ea \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05d9\u05ea \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05d4\u05d1\u05e2\u05d9\u05d4 '<%- problem_id %>' \u05d5\u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8  '<%- student_id %>'. \u05d5\u05d3\u05d0 \u05e9\u05de\u05d6\u05d4\u05d4 \u05d4\u05d1\u05e2\u05d9\u05d4 \u05d5\u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05dd \u05de\u05dc\u05d0\u05d9\u05dd \u05d5\u05e0\u05db\u05d5\u05e0\u05d9\u05dd.", 
+    "Error importing course": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05d1\u05d5\u05d0 \u05e7\u05d5\u05e8\u05e1.", 
     "Error listing task history for this student and problem.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e8\u05d9\u05e9\u05d5\u05dd \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05ea \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d6\u05d4 \u05d5\u05d1\u05e2\u05d9\u05d4 \u05d6\u05d5.", 
     "Error posting your message.": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05e4\u05e8\u05e1\u05d5\u05dd \u05d4\u05d4\u05d5\u05d3\u05e2\u05d4 \u05e9\u05dc\u05da", 
     "Error removing user": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e1\u05e8\u05ea \u05de\u05e9\u05ea\u05de\u05e9", 
@@ -645,7 +663,6 @@
     "Free text notes": "\u05d4\u05e2\u05e8\u05d5\u05ea \u05d8\u05e7\u05e1\u05d8 \u05d7\u05d5\u05e4\u05e9\u05d9", 
     "Frequently Asked Questions": "\u05e9\u05d0\u05dc\u05d5\u05ea \u05e0\u05e4\u05d5\u05e6\u05d5\u05ea", 
     "Full Name": "\u05e9\u05dd \u05de\u05dc\u05d0", 
-    "Full Profile": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05de\u05dc\u05d0", 
     "Fullscreen": "\u05de\u05e1\u05da \u05de\u05dc\u05d0", 
     "Fully Supported": "\u05e0\u05ea\u05de\u05da \u05d1\u05de\u05dc\u05d5\u05d0\u05d5", 
     "Gender": "\u05de\u05d2\u05d3\u05e8", 
@@ -807,7 +824,6 @@
     "License Display": "\u05ea\u05e6\u05d5\u05d2\u05ea \u05e8\u05d9\u05e9\u05d9\u05d5\u05df", 
     "License Type": "\u05e1\u05d5\u05d2 \u05e8\u05d9\u05e9\u05d9\u05d5\u05df", 
     "Limit Access": "\u05d2\u05d9\u05e9\u05d4 \u05de\u05d5\u05d2\u05d1\u05dc\u05ea", 
-    "Limited Profile": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d7\u05dc\u05e7\u05d9", 
     "Link Description": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05e7\u05d9\u05e9\u05d5\u05e8", 
     "Link Your Account": "\u05e7\u05e9\u05e8 \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da", 
     "Link types should be unique.": "\u05e2\u05dc \u05e1\u05d5\u05d2\u05d9 \u05d4\u05e7\u05d9\u05e9\u05d5\u05e8 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d9\u05d7\u05d5\u05d3\u05d9\u05d9\u05dd.", 
@@ -828,6 +844,7 @@
     "Loading content": "\u05d8\u05d5\u05e2\u05df \u05ea\u05d5\u05db\u05df", 
     "Loading data...": "\u05d8\u05d5\u05e2\u05df \u05e0\u05ea\u05d5\u05e0\u05d9\u05dd...", 
     "Loading more threads": "\u05d8\u05d5\u05e2\u05df \u05e2\u05d5\u05d3 \u05e9\u05e8\u05e9\u05d5\u05e8\u05d9\u05dd", 
+    "Loading posts list": "\u05d8\u05d5\u05e2\u05df \u05e8\u05e9\u05d9\u05de\u05ea \u05e4\u05d5\u05e1\u05d8\u05d9\u05dd", 
     "Loading your courses": "\u05d8\u05d5\u05e2\u05df \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05e9\u05dc\u05da", 
     "Location in Course": "\u05de\u05d9\u05e7\u05d5\u05dd \u05d1\u05e7\u05d5\u05e8\u05e1", 
     "Lock this asset": "\u05e0\u05e2\u05dc \u05e0\u05db\u05e1 \u05d6\u05d4", 
@@ -879,6 +896,7 @@
     "New document": "\u05de\u05e1\u05de\u05da \u05d7\u05d3\u05e9", 
     "New enrollment mode:": "\u05de\u05e6\u05d1 \u05d4\u05e8\u05e9\u05de\u05d4 \u05d7\u05d3\u05e9:", 
     "New window": "\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9", 
+    "New {component_type}": "\u05d7\u05d3\u05e9 {component_type} ", 
     "Next": "\u05d4\u05d1\u05d0", 
     "Next Step: Confirm your identity": "\u05d4\u05e9\u05dc\u05d1 \u05d4\u05d1\u05d0: \u05d0\u05de\u05ea \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da", 
     "Next: %(nextStepTitle)s": "\u05d4\u05d1\u05d0:  %(nextStepTitle)s", 
@@ -891,10 +909,12 @@
     "No color": "\u05dc\u05dc\u05d0 \u05e6\u05d1\u05e2", 
     "No content-specific discussion topics exist.": "\u05dc\u05d0 \u05e7\u05d9\u05d9\u05de\u05d9\u05dd \u05e0\u05d5\u05e9\u05d0\u05d9 \u05d3\u05d9\u05d5\u05df \u05e1\u05e4\u05e6\u05d9\u05e4\u05d9\u05d9\u05dd \u05dc\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
     "No description available": "\u05d0\u05d9\u05df \u05ea\u05d9\u05d0\u05d5\u05e8 \u05d6\u05de\u05d9\u05df", 
+    "No posts matched your query.": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05e4\u05d5\u05e1\u05d8\u05d9\u05dd \u05d4\u05ea\u05d5\u05d0\u05de\u05d9\u05dd \u05d0\u05ea \u05d4\u05e9\u05d0\u05d9\u05dc\u05ea\u05d0 \u05e9\u05dc\u05da.", 
     "No prerequisite": "\u05dc\u05dc\u05d0 \u05d3\u05e8\u05d9\u05e9\u05d4 \u05de\u05d5\u05e7\u05d3\u05de\u05ea", 
     "No receipt available": "\u05d0\u05d9\u05df \u05e7\u05d1\u05dc\u05d4 \u05d6\u05de\u05d9\u05e0\u05d4", 
     "No results": "\u05d0\u05d9\u05df \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea ", 
     "No results found for \"%(query_string)s\". Please try searching again.": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \"%(query_string)s\". \u05d0\u05e0\u05d0 \u05e0\u05e1\u05d4 \u05dc\u05d7\u05e4\u05e9 \u05e9\u05d5\u05d1.", 
+    "No results found for {original_query}. Showing results for {suggested_query}.": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 {original_query}. \u05de\u05e8\u05d0\u05d4 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 {suggested_query}.", 
     "No sources": "\u05d0\u05d9\u05df \u05de\u05e7\u05d5\u05e8\u05d5\u05ea", 
     "No tasks currently running.": "\u05d0\u05d9\u05df \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05d1\u05d4\u05e8\u05e6\u05d4 \u05db\u05e8\u05d2\u05e2.", 
     "No validation is performed on policy keys or value pairs. If you are having difficulties, check your formatting.": "\u05dc\u05d0 \u05d1\u05d5\u05e6\u05e2 \u05d0\u05d9\u05de\u05d5\u05ea \u05d1\u05e0\u05d5\u05d2\u05e2 \u05dc\u05e7\u05d5\u05d5\u05d9 \u05de\u05d3\u05d9\u05e0\u05d9\u05d5\u05ea \u05d0\u05d5 \u05e6\u05de\u05d3\u05d9 \u05e2\u05e8\u05db\u05d9\u05dd. \u05d1\u05de\u05d9\u05d3\u05d4 \u05d5\u05d0\u05ea\u05d4 \u05e0\u05ea\u05e7\u05dc \u05d1\u05e7\u05e9\u05d9\u05d9\u05dd, \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05e2\u05d9\u05e6\u05d5\u05d1\u05da.", 
@@ -940,6 +960,7 @@
     "Order Details": "\u05e4\u05e8\u05d8\u05d9 \u05d4\u05d6\u05de\u05e0\u05d4", 
     "Order History": "\u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05d9\u05ea \u05d4\u05d6\u05de\u05e0\u05d5\u05ea", 
     "Order No.": "\u05de\u05e1\u05e4\u05e8 \u05d4\u05d6\u05de\u05e0\u05d4", 
+    "Order Number": "\u05de\u05e1\u05e4\u05e8 \u05d4\u05d6\u05de\u05e0\u05d4", 
     "Organization": "\u05d0\u05e8\u05d2\u05d5\u05df", 
     "Organization ": "\u05d0\u05e8\u05d2\u05d5\u05df ", 
     "Organization Name": "\u05e9\u05dd \u05d4\u05d0\u05e8\u05d2\u05d5\u05df", 
@@ -1041,9 +1062,6 @@
     "Professional Certificate for {courseName}": "\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05e7\u05e6\u05d5\u05e2\u05d9\u05ea \u05e2\u05d1\u05d5\u05e8 {courseName}", 
     "Professional Education": "\u05d4\u05e9\u05db\u05dc\u05d4 \u05de\u05e7\u05e6\u05d5\u05e2\u05d9\u05ea", 
     "Professional Education Verified Certificate": "\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d0\u05d5\u05de\u05ea\u05ea \u05de\u05e7\u05e6\u05d5\u05e2\u05d9\u05ea", 
-    "Profile": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc", 
-    "Profile Image": "\u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc", 
-    "Profile image for {username}": "\u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05e2\u05d1\u05d5\u05e8 {username} ", 
     "Promote another member to Admin to remove your admin rights": "\u05e7\u05d3\u05dd \u05d7\u05d1\u05e8 \u05d0\u05d7\u05e8 \u05dc\u05de\u05e0\u05d4\u05dc \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e1\u05d9\u05e8 \u05d0\u05ea \u05d6\u05db\u05d5\u05d9\u05d5\u05ea\u05d9\u05da \u05d4\u05e0\u05d9\u05d4\u05d5\u05dc\u05d9\u05d5\u05ea", 
     "Provisional": "\u05d6\u05de\u05e0\u05d9", 
     "Provisionally Supported": "\u05e0\u05ea\u05de\u05da \u05d1\u05d0\u05d5\u05e4\u05df \u05d6\u05de\u05e0\u05d9", 
@@ -1056,6 +1074,7 @@
     "Publishing": "\u05de\u05e4\u05e8\u05e1\u05dd", 
     "Publishing Status": "\u05de\u05e6\u05d1 \u05e4\u05e8\u05e1\u05d5\u05dd", 
     "Question": "\u05e9\u05d0\u05dc\u05d4", 
+    "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "\u05d1\u05e2\u05d6\u05e8\u05ea \u05dc\u05d7\u05e6\u05df '\u05e9\u05d0\u05dc\u05d5\u05ea' \u05ea\u05d5\u05db\u05dc \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e1\u05d5\u05d2\u05d9\u05d4 \u05de\u05e1\u05d5\u05d9\u05de\u05ea \u05d4\u05de\u05e6\u05e8\u05d9\u05db\u05d4 \u05ea\u05e9\u05d5\u05d1\u05d4. \u05d1\u05e2\u05d6\u05e8\u05ea \u05dc\u05d7\u05e6\u05df '\u05d3\u05d9\u05d5\u05e0\u05d9\u05dd' \u05ea\u05d5\u05db\u05dc \u05dc\u05d7\u05dc\u05d5\u05e7 \u05e8\u05e2\u05d9\u05d5\u05e0\u05d5\u05ea \u05d5\u05dc\u05d4\u05ea\u05d7\u05d9\u05dc \u05d1\u05e9\u05d9\u05d7\u05d5\u05ea \u05e2\u05dc \u05e0\u05d5\u05e9\u05d0\u05d9 \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05e9\u05d5\u05e0\u05d9\u05dd. (\u05d7\u05d5\u05d1\u05d4)", 
     "Queued": "\u05de\u05de\u05ea\u05d9\u05df \u05d1\u05ea\u05d5\u05e8", 
     "Read More": "\u05e7\u05e8\u05d0 \u05e2\u05d5\u05d3", 
     "Reason": "\u05e1\u05d9\u05d1\u05d4", 
@@ -1090,6 +1109,7 @@
     "Remove {role} Access": "\u05d4\u05e1\u05e8 \u05d2\u05d9\u05e9\u05ea {role}", 
     "Remove {video_name} video": "\u05d4\u05e1\u05e8 \u05d0\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5  {video_name}   ", 
     "Removing": "\u05de\u05e1\u05d9\u05e8", 
+    "Removing a video from this list does not affect course content. Any content that uses a previously uploaded video ID continues to display in the course.": "\u05d4\u05e1\u05e8\u05ea \u05e1\u05e8\u05d8\u05d5\u05df \u05d5\u05d9\u05d3\u05d0\u05d5 \u05de\u05e8\u05e9\u05d9\u05de\u05d4 \u05d6\u05d5 \u05d0\u05d9\u05e0\u05d4 \u05de\u05e9\u05e4\u05d9\u05e2\u05d4 \u05e2\u05dc \u05ea\u05d5\u05db\u05df \u05d4\u05e7\u05d5\u05e8\u05e1. \u05db\u05dc \u05ea\u05d5\u05db\u05df \u05d4\u05de\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e1\u05e4\u05e8 \u05de\u05d6\u05d4\u05d4 \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05e9\u05d4\u05d5\u05e2\u05dc\u05d4 \u05d1\u05e2\u05d1\u05e8 \u05de\u05de\u05e9\u05d9\u05da \u05dc\u05d4\u05e6\u05d9\u05d2 \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "Replace": "\u05d4\u05d7\u05dc\u05e3", 
     "Replace all": "\u05d4\u05d7\u05dc\u05e3 \u05d4\u05db\u05dc", 
     "Replace with": "\u05d4\u05d7\u05dc\u05e3 \u05d1", 
@@ -1107,6 +1127,7 @@
     "Reset Your Password": "\u05d0\u05e4\u05e1 \u05d0\u05ea \u05e1\u05d9\u05e1\u05de\u05ea\u05da", 
     "Reset attempts for all students on problem '<%- problem_id %>'?": "\u05d0\u05e4\u05e1 \u05e0\u05d9\u05e1\u05d9\u05d5\u05e0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05db\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd \u05d1\u05d1\u05e2\u05d9\u05d4  '<%- problem_id %>'? ", 
     "Reset my password": "\u05e9\u05d7\u05d6\u05e8 \u05d0\u05ea \u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05e9\u05dc\u05d9", 
+    "Responses could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05ea\u05d2\u05d5\u05d1\u05d5\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Restore enrollment code": "\u05e9\u05d7\u05d6\u05e8 \u05e7\u05d5\u05d3 \u05d4\u05e8\u05e9\u05de\u05d4", 
     "Restore last draft": "\u05e9\u05d7\u05d6\u05e8 \u05d8\u05d9\u05d5\u05d8\u05d4 \u05d0\u05d7\u05e8\u05d5\u05e0\u05d4", 
     "Retake Photo": "\u05e6\u05dc\u05dd \u05e9\u05d5\u05d1 \u05ea\u05de\u05d5\u05e0\u05d4", 
@@ -1142,6 +1163,7 @@
     "Search teams": "\u05d7\u05d9\u05e4\u05d5\u05e9 \u05e6\u05d5\u05d5\u05ea\u05d9\u05dd", 
     "Section": "\u05e4\u05e8\u05e7", 
     "Section Visibility": "\u05ea\u05e6\u05d5\u05d2\u05ea \u05e4\u05e8\u05e7", 
+    "Sections": "\u05e4\u05e8\u05e7\u05d9\u05dd", 
     "See all teams in your course, organized by topic. Join a team to collaborate with other learners who are interested in the same topic as you are.": "\u05e8\u05d0\u05d4 \u05e9\u05db\u05dc \u05d4\u05e6\u05d5\u05d5\u05ea\u05d9\u05dd \u05e9\u05d1\u05e7\u05d5\u05e8\u05e1 \u05e9\u05dc\u05da \u05de\u05d0\u05d5\u05e8\u05d2\u05e0\u05d9\u05dd \u05dc\u05e4\u05d9 \u05e0\u05d5\u05e9\u05d0. \u05d4\u05e6\u05d8\u05e8\u05e3 \u05dc\u05e6\u05d5\u05d5\u05ea \u05db\u05d3\u05d9 \u05dc\u05e9\u05ea\u05e3 \u05e4\u05e2\u05d5\u05dc\u05d4 \u05e2\u05dd \u05ea\u05dc\u05de\u05d9\u05d3\u05d9\u05dd \u05d0\u05d7\u05e8\u05d9\u05dd \u05d4\u05de\u05e2\u05d5\u05e0\u05d9\u05d9\u05e0\u05d9\u05dd \u05d1\u05d0\u05d5\u05ea\u05d5 \u05e0\u05d5\u05e9\u05d0 \u05d1\u05d5 \u05d0\u05ea\u05d4 \u05de\u05ea\u05e2\u05e0\u05d9\u05d9\u05df.", 
     "Select a Content Group": "\u05d1\u05d7\u05e8 \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df", 
     "Select a chapter": "\u05d1\u05d7\u05e8 \u05e4\u05e8\u05e7", 
@@ -1196,6 +1218,7 @@
     "Showing {currentItemRange} out of {totalItemsCount}, sorted by {sortName} descending": "\u05de\u05e6\u05d9\u05d2  {currentItemRange} \u05de\u05ea\u05d5\u05da {totalItemsCount}, \u05de\u05de\u05d5\u05d9\u05df \u05d1\u05e1\u05d3\u05e8 \u05d9\u05d5\u05e8\u05d3 \u05e9\u05dc {sortName} ", 
     "Showing {firstIndex} out of {numItems} total": "\u05de\u05e6\u05d9\u05d2 {firstIndex} \u05de\u05ea\u05d5\u05da {numItems} \u05e1\u05da \u05d4\u05db\u05dc", 
     "Showing {firstIndex}-{lastIndex} out of {numItems} total": "\u05de\u05e6\u05d9\u05d2 {firstIndex}-{lastIndex} \u05de\u05ea\u05d5\u05da {numItems} \u05e1\u05da \u05d4\u05db\u05dc", 
+    "Sign In": "\u05d4\u05ea\u05d7\u05d1\u05e8", 
     "Sign in": "\u05db\u05e0\u05d9\u05e1\u05d4", 
     "Sign in here using your email address and password, or use one of the providers listed below.": "\u05d4\u05d9\u05db\u05e0\u05e1 \u05db\u05d0\u05df \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05e9\u05dc\u05da \u05d0\u05d5 \u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d0\u05d7\u05d3 \u05de\u05d4\u05e1\u05e4\u05e7\u05d9\u05dd \u05d4\u05e8\u05e9\u05d5\u05de\u05d9\u05dd \u05d1\u05d4\u05de\u05e9\u05da.", 
     "Sign in here using your email address and password.": "\u05d4\u05d9\u05db\u05e0\u05e1 \u05db\u05d0\u05df \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05d4\u05e1\u05d9\u05e1\u05de\u05d4.", 
@@ -1241,6 +1264,9 @@
     "Student": "\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8", 
     "Student Removed from certificate white list successfully.": "\u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05d5\u05e1\u05e8 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05de\u05d4\u05e8\u05e9\u05d9\u05de\u05d4 \u05d4\u05dc\u05d1\u05e0\u05d4 \u05e9\u05dc \u05d4\u05ea\u05e2\u05d5\u05d3\u05d5\u05ea.", 
     "Student email or username": "\u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d0\u05d5 \u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8", 
+    "Student username/email field is required and can not be empty. Kindly fill in username/email and then press \"Add to Exception List\" button.": "\u05e9\u05d3\u05d4 \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05d5\u05d0 \u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05d0\u05d9\u05e8\u05d5 \u05e8\u05d9\u05e7. \u05d0\u05e0\u05d0 \u05de\u05dc\u05d0 \u05d0\u05ea \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05dc\u05d0\u05d7\u05e8 \u05de\u05db\u05df \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05d7\u05e6\u05df \"\u05d4\u05d5\u05e1\u05e3 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05d7\u05e8\u05d9\u05d2\u05d9\u05dd\".", 
+    "Student username/email field is required and can not be empty. Kindly fill in username/email and then press \"Invalidate Certificate\" button.": "\u05e9\u05d3\u05d4 \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d4\u05d5\u05d0 \u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4 \u05d5\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05d0\u05d9\u05e8\u05d5 \u05e8\u05d9\u05e7. \u05d0\u05e0\u05d0 \u05de\u05dc\u05d0 \u05d0\u05ea \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9/\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d5\u05dc\u05d0\u05d7\u05e8 \u05de\u05db\u05df \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05d7\u05e6\u05df \"\u05e4\u05e1\u05d9\u05dc\u05ea \u05ea\u05e2\u05d5\u05d3\u05d4\".", 
+    "Studio's having trouble saving your work": "\u05e1\u05d8\u05d5\u05d3\u05d9\u05d5 \u05de\u05ea\u05e7\u05e9\u05d4 \u05dc\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05e2\u05d1\u05d5\u05d3\u05ea\u05da", 
     "Studio:": "\u05e1\u05d8\u05d5\u05d3\u05d9\u05d5:", 
     "Style": "\u05e1\u05d2\u05e0\u05d5\u05df", 
     "Subject": "\u05e0\u05d5\u05e9\u05d0", 
@@ -1298,8 +1324,8 @@
     "Team name cannot have more than 255 characters.": "\u05e9\u05dd \u05d4\u05e6\u05d5\u05d5\u05ea \u05d0\u05d9\u05e0\u05d5 \u05d9\u05db\u05d5\u05dc \u05dc\u05d7\u05e8\u05d5\u05d2 \u05de-255 \u05ea\u05d5\u05d5\u05d9\u05dd.", 
     "Teams": "\u05e6\u05d5\u05d5\u05ea\u05d9\u05dd", 
     "Teams Pagination": "\u05e2\u05d9\u05de\u05d5\u05d3 \u05e6\u05d5\u05d5\u05ea\u05d9\u05dd", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u05e1\u05e4\u05e8 \u05de\u05e2\u05d8 \u05e2\u05dc \u05e2\u05e6\u05de\u05da \u05dc\u05ea\u05dc\u05de\u05d9\u05d3\u05d9\u05dd \u05d4\u05d0\u05d7\u05e8\u05d9\u05dd: \u05d4\u05d9\u05db\u05df \u05d0\u05ea\u05d4 \u05d2\u05e8, \u05de\u05d4\u05dd \u05ea\u05d7\u05d5\u05de\u05d9 \u05d4\u05e2\u05e0\u05d9\u05d9\u05df \u05e9\u05dc\u05da, \u05de\u05d3\u05d5\u05e2 \u05e0\u05e8\u05e9\u05de\u05ea \u05dc\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05d0\u05d5 \u05de\u05d4 \u05d0\u05ea\u05d4 \u05de\u05e7\u05d5\u05d5\u05d4 \u05dc\u05dc\u05de\u05d5\u05d3.", 
     "Templates": "\u05ea\u05d1\u05e0\u05d9\u05d5\u05ea", 
+    "Terms of Service and Honor Code": "\u05ea\u05e0\u05d0\u05d9 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d5\u05e7\u05d5\u05d3 \u05d0\u05ea\u05d9", 
     "Text": "\u05d8\u05e7\u05e1\u05d8", 
     "Text color": "\u05e6\u05d1\u05e2 \u05d8\u05e7\u05e1\u05d8", 
     "Text to display": "\u05d8\u05e7\u05e1\u05d8 \u05dc\u05d4\u05e6\u05d2\u05d4", 
@@ -1350,6 +1376,7 @@
     "The organization that this signatory belongs to, as it should appear on certificates.": "\u05d7\u05ea\u05d9\u05de\u05ea \u05d4\u05d0\u05e8\u05d2\u05d5\u05df, \u05db\u05e4\u05d9 \u05e9\u05d4\u05d9\u05d0 \u05d0\u05de\u05d5\u05e8\u05d4 \u05dc\u05d4\u05d5\u05e4\u05d9\u05e2 \u05d1\u05ea\u05e2\u05d5\u05d3\u05d4.", 
     "The page \"{route}\" could not be found.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05de\u05e6\u05d5\u05d0 \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \"{route}\".", 
     "The photo of your face matches the photo on your ID.": "\u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05e9\u05dc \u05e4\u05e0\u05d9\u05da \u05ea\u05d5\u05d0\u05de\u05ea \u05dc\u05ea\u05de\u05d5\u05e0\u05d4 \u05e9\u05d1\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4 \u05e9\u05dc\u05da.", 
+    "The post you selected has been deleted.": "\u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05d1\u05d7\u05e8\u05ea \u05e0\u05de\u05d7\u05e7.", 
     "The published branch version, {published}, was reset to the draft branch version, {draft}.": "\u05d2\u05e8\u05e1\u05ea \u05d4\u05de\u05d3\u05d5\u05e8 \u05e9\u05e4\u05d5\u05e8\u05e1\u05dd, {published}, \u05d0\u05d5\u05e4\u05e1\u05d4 \u05dc\u05d2\u05e8\u05e1\u05ea \u05de\u05d3\u05d5\u05e8 \u05d4\u05d8\u05d9\u05d5\u05d8\u05d4, {draft}.", 
     "The raw error message is:": "\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d4\u05d9\u05d0:", 
     "The selected content group does not exist": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05e9\u05e0\u05d1\u05d7\u05e8\u05d4 \u05d0\u05d9\u05e0\u05d4 \u05e7\u05d9\u05d9\u05de\u05ea", 
@@ -1360,6 +1387,7 @@
     "The weight of all assignments of this type as a percentage of the total grade, for example, 40. Do not include the percent symbol.": "\u05de\u05e9\u05e7\u05dc \u05db\u05dc \u05d4\u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e9\u05dc \u05e1\u05d5\u05d2 \u05d6\u05d4 \u05d4\u05d5\u05d0 \u05db\u05d0\u05d7\u05d5\u05d6 \u05de\u05e1\u05da \u05d4\u05e6\u05d9\u05d5\u05df, \u05dc\u05d3\u05d5\u05d2\u05de\u05d4, 40. \u05d0\u05dc \u05ea\u05db\u05dc\u05d5\u05dc \u05d0\u05ea \u05e1\u05de\u05dc \u05d4\u05d0\u05d7\u05d5\u05d6.", 
     "The {cohortGroupName} cohort has been created. You can manually add students to this cohort below.": "\u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3 {cohortGroupName} \u05e0\u05d5\u05e6\u05e8\u05d4. \u05d0\u05ea\u05d4 \u05d9\u05db\u05d5\u05dc \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd \u05d1\u05e6\u05d5\u05e8\u05d4 \u05d9\u05d3\u05e0\u05d9\u05ea \u05dc\u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05d6\u05d5. ", 
     "There are invalid keywords in your email. Check the following keywords and try again.": "\u05d9\u05e9\u05e0\u05df \u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9\u05d5\u05ea \u05d1\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc\u05da. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05de\u05d9\u05dc\u05d5\u05ea \u05d4\u05de\u05e4\u05ea\u05d7 \u05d4\u05d1\u05d0\u05d5\u05ea \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
+    "There has been a failure to export to XML at least one component. It is recommended that you go to the edit page and repair the error before attempting another export. Please check that all components on the page are valid and do not display any error messages.": "\u05d9\u05e6\u05d5\u05d0 \u05e9\u05dc \u05e8\u05db\u05d9\u05d1 \u05d0\u05d7\u05d3 \u05dc\u05e4\u05d7\u05d5\u05ea \u05dc-XML, \u05e0\u05db\u05e9\u05dc. \u05de\u05d5\u05de\u05dc\u05e5 \u05dc\u05d2\u05e9\u05ea \u05dc\u05e2\u05de\u05d5\u05d3 \u05d4\u05e2\u05e8\u05d9\u05db\u05d4 \u05d5\u05dc\u05ea\u05e7\u05df \u05d0\u05ea \u05d4\u05e9\u05d2\u05d9\u05d0\u05d4 \u05dc\u05e4\u05e0\u05d9 \u05d1\u05d9\u05e6\u05d5\u05e2 \u05d9\u05e6\u05d5\u05d0 \u05e0\u05d5\u05e1\u05e3. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d7\u05d5\u05e7\u05d9\u05d5\u05ea \u05db\u05dc \u05d4\u05e8\u05db\u05d9\u05d1\u05d9\u05dd \u05d1\u05e2\u05de\u05d5\u05d3 \u05d5\u05db\u05d9 \u05d4\u05dd \u05d0\u05d9\u05e0\u05dd \u05de\u05e6\u05d9\u05d2\u05d9\u05dd \u05d4\u05d5\u05d3\u05e2\u05d5\u05ea \u05e9\u05d2\u05d9\u05d0\u05d4.  ", 
     "There has been an error processing your survey.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e2\u05d9\u05d1\u05d5\u05d3 \u05d4\u05e1\u05e7\u05e8 \u05e9\u05dc\u05da.", 
     "There has been an error while exporting.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05d4\u05d9\u05d9\u05e6\u05d5\u05d0.", 
     "There has been an error with your export.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05e6\u05d5\u05d0 \u05e9\u05dc\u05da. ", 
@@ -1369,9 +1397,15 @@
     "There must be one cohort to which students can automatically be assigned.": "\u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05d9\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3 \u05d0\u05d7\u05ea \u05e9\u05d0\u05dc\u05d9\u05d4 \u05e0\u05d9\u05ea\u05df \u05dc\u05e9\u05d9\u05d9\u05da \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd \u05d1\u05d0\u05d5\u05e4\u05df \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9.", 
     "There was a problem creating the report. Select \"Create Executive Summary\" to try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05d1\u05e2\u05d9\u05d4 \u05d1\u05e2\u05ea \u05d9\u05e6\u05d9\u05e8\u05ea \u05d4\u05d3\u05d5\u05d7. \u05d1\u05d7\u05e8 \"\u05e6\u05d5\u05e8 \u05ea\u05e7\u05e6\u05d9\u05e8 \u05de\u05e0\u05d4\u05dc\u05d9\u05dd\" \u05db\u05d3\u05d9 \u05dc\u05e0\u05e1\u05d5\u05ea \u05e9\u05d5\u05d1.", 
     "There was an error changing the user's role": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e9\u05d9\u05e0\u05d5\u05d9 \u05ea\u05e4\u05e7\u05d9\u05d3 \u05d4\u05de\u05e9\u05ea\u05de\u05e9.", 
+    "There was an error during the upload process.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05ea\u05d4\u05dc\u05d9\u05da \u05d4\u05e2\u05dc\u05d0\u05ea \u05d4\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd.", 
     "There was an error obtaining email content history for this course.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05e9\u05dc \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "There was an error obtaining email task history for this course.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e7\u05d1\u05dc\u05ea \u05d4\u05d9\u05e1\u05d8\u05d5\u05e8\u05d9\u05ea \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "There was an error retrieving preview results for this catalog. Please check that your query is correct and try again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e2\u05ea \u05d0\u05b4\u05d7\u05d6\u05d5\u05e8 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05d4\u05ea\u05e6\u05d5\u05d2\u05d4 \u05d4\u05de\u05d5\u05e7\u05d3\u05de\u05ea \u05e2\u05d1\u05d5\u05e8 \u05e7\u05d8\u05dc\u05d5\u05d2 \u05d6\u05d4. \u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05e9\u05d4\u05e9\u05d0\u05d9\u05dc\u05ea\u05d0 \u05e0\u05db\u05d5\u05e0\u05d4 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
+    "There was an error while importing the new course to our database.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05d9\u05d1\u05d5\u05d0 \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05d7\u05d3\u05e9 \u05dc\u05d1\u05e1\u05d9\u05e1 \u05d4\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05e9\u05dc\u05e0\u05d5.", 
+    "There was an error while importing the new library to our database.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05de\u05d4\u05dc\u05da \u05d9\u05d1\u05d5\u05d0 \u05d4\u05e1\u05e4\u05e8\u05d9\u05d9\u05d4 \u05d4\u05d7\u05d3\u05e9\u05d4 \u05dc\u05d1\u05e1\u05d9\u05e1 \u05d4\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05e9\u05dc\u05e0\u05d5.", 
+    "There was an error while unpacking the file.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d7\u05d9\u05dc\u05d5\u05e5 \u05d4\u05e7\u05d5\u05d1\u05e5.", 
+    "There was an error while verifying the file you submitted.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d6\u05de\u05df \u05d0\u05d9\u05de\u05d5\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5 \u05e9\u05d4\u05d2\u05e9\u05ea.", 
+    "There was an error with the upload": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e2\u05dc\u05d0\u05d4", 
     "There was an error, try searching again.": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4, \u05e0\u05e1\u05d4 \u05dc\u05d7\u05e4\u05e9 \u05e9\u05d5\u05d1.", 
     "There were errors reindexing course.": "\u05e7\u05e8\u05d5 \u05e9\u05d2\u05d9\u05d0\u05d5\u05ea \u05d1\u05de\u05d9\u05d5\u05df \u05de\u05d7\u05d3\u05e9 \u05e9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1.", 
     "There's already another assignment type with this name.": "\u05d9\u05e9 \u05db\u05d1\u05e8 \u05e1\u05d5\u05d2 \u05de\u05e9\u05d9\u05de\u05d4 \u05d0\u05d7\u05e8 \u05d1\u05e2\u05dc \u05e9\u05dd \u05d6\u05d4.", 
@@ -1393,12 +1427,14 @@
     "This browser cannot play .mp4, .ogg, or .webm files.": "\u05d3\u05e4\u05d3\u05e4\u05df \u05d6\u05d4 \u05d0\u05d9\u05e0\u05d5 \u05d9\u05db\u05d5\u05dc \u05dc\u05e0\u05d2\u05df \u05e7\u05d1\u05e6\u05d9  ogg  .webm ,.mp4.", 
     "This catalog's courses:": "\u05d4\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05d1\u05e7\u05d8\u05dc\u05d5\u05d2 \u05d6\u05d4:", 
     "This certificate has already been activated and is live. Are you sure you want to continue editing?": "\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d6\u05d5  \u05d4\u05d5\u05e4\u05e2\u05dc\u05d4 \u05db\u05d1\u05e8 \u05d5\u05d4\u05d9\u05d0 \u05d1\u05de\u05e6\u05d1 \u05e4\u05e2\u05d9\u05dc. \u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05de\u05e9\u05d9\u05da \u05d1\u05e2\u05e8\u05d9\u05db\u05d4?", 
+    "This comment could not be deleted. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05de\u05d7\u05d5\u05e7 \u05d0\u05ea \u05d4\u05d4\u05e2\u05e8\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This component has validation issues.": "\u05dc\u05e8\u05db\u05d9\u05d1 \u05d6\u05d4 \u05d1\u05e2\u05d9\u05d5\u05ea \u05d0\u05d9\u05de\u05d5\u05ea.", 
     "This configuration is currently used in content experiments. If you make changes to the groups, you may need to edit those experiments.": "\u05d4\u05d2\u05d3\u05e8\u05d4 \u05d6\u05d5 \u05e0\u05de\u05e6\u05d0\u05ea \u05db\u05e2\u05ea \u05d1\u05e9\u05d9\u05de\u05d5\u05e9 \u05e0\u05d9\u05e1\u05d5\u05d9 \u05ea\u05d5\u05db\u05df. \u05d0\u05dd \u05ea\u05e9\u05e0\u05d4 \u05d0\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea, \u05d9\u05ea\u05db\u05df \u05e9\u05ea\u05e6\u05d8\u05e8\u05da \u05dc\u05d1\u05e6\u05e2 \u05e2\u05e8\u05d9\u05db\u05d4 \u05d1\u05e0\u05d9\u05e1\u05d5\u05d9\u05d9\u05dd \u05d0\u05dc\u05d5.", 
     "This content group is used in one or more units.": "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d1\u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05d6\u05d5 \u05d1\u05d9\u05d7\u05d9\u05d3\u05d4 \u05d0\u05d7\u05ea \u05d0\u05d5 \u05d9\u05d5\u05ea\u05e8. ", 
     "This course has automatic cohorting enabled for verified track learners, but cohorts are disabled. You must enable cohorts for the feature to work.": "\u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05d9\u05e9 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9 \u05e9\u05de\u05d5\u05e4\u05e2\u05dc \u05e2\u05d1\u05d5\u05e8 \u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05de\u05e1\u05dc\u05d5\u05dc \u05de\u05d0\u05d5\u05de\u05ea, \u05d0\u05da \u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05d4\u05dc\u05de\u05d9\u05d3\u05d4 \u05de\u05d5\u05e9\u05d1\u05ea\u05d9\u05dd. \u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05db\u05d3\u05d9 \u05e9\u05d4\u05ea\u05db\u05d5\u05e0\u05d4 \u05ea\u05e2\u05d1\u05d5\u05d3.", 
     "This course has automatic cohorting enabled for verified track learners, but the required cohort does not exist. You must create a manually-assigned cohort named '{verifiedCohortName}' for the feature to work.": "\u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05d9\u05e9 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9 \u05e9\u05de\u05d5\u05e4\u05e2\u05dc \u05e2\u05d1\u05d5\u05e8 \u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05de\u05e1\u05dc\u05d5\u05dc \u05de\u05d0\u05d5\u05de\u05ea, \u05d0\u05da \u05de\u05d7\u05d6\u05d5\u05e8 \u05d4\u05dc\u05de\u05d9\u05d3\u05d4 \u05d4\u05d3\u05e8\u05d5\u05e9 \u05d0\u05d9\u05e0\u05d5 \u05e7\u05d9\u05d9\u05dd. \u05e2\u05dc\u05d9\u05da \u05dc\u05d9\u05e6\u05d5\u05e8 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05e9\u05de\u05d5\u05e7\u05e6\u05d4 \u05d1\u05d0\u05d5\u05e4\u05df \u05d9\u05d3\u05e0\u05d9 \u05d4\u05de\u05db\u05d5\u05e0\u05d4 '{verifiedCohortName}' \u05db\u05d3\u05d9 \u05e9\u05d4\u05ea\u05db\u05d5\u05e0\u05d4 \u05ea\u05e2\u05d1\u05d5\u05d3.", 
     "This course uses automatic cohorting for verified track learners. You cannot disable cohorts, and you cannot rename the manual cohort named '{verifiedCohortName}'. To change the configuration for verified track cohorts, contact your edX partner manager.": "\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05de\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05d9\u05dd \u05e2\u05d1\u05d5\u05e8 \u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d1\u05de\u05e1\u05dc\u05d5\u05dc \u05de\u05d0\u05d5\u05de\u05ea. \u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05d4\u05e9\u05d1\u05d9\u05ea \u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d5\u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05e9\u05e0\u05d5\u05ea \u05d0\u05ea \u05d4\u05e9\u05dd \u05e9\u05dc \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05de\u05d9\u05d3\u05d4 \u05d9\u05d3\u05e0\u05d9 \u05d4\u05de\u05db\u05d5\u05e0\u05d4 '{verifiedCohortName}'. \u05db\u05d3\u05d9 \u05dc\u05e9\u05e0\u05d5\u05ea \u05d0\u05ea \u05d4\u05d4\u05d2\u05d3\u05e8\u05d4 \u05dc\u05de\u05d7\u05d6\u05d5\u05e8\u05d9 \u05dc\u05de\u05d9\u05d3\u05d4 \u05e2\u05dd \u05de\u05e2\u05e7\u05d1 \u05de\u05d0\u05d5\u05de\u05ea, \u05e6\u05d5\u05e8 \u05e7\u05e9\u05e8 \u05e2\u05dd \u05d4\u05de\u05e0\u05d4\u05dc \u05d4\u05e9\u05d5\u05ea\u05e3 \u05e9\u05dc\u05da \u05d1-edX.", 
+    "This discussion could not be loaded. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05d0\u05ea \u05d4\u05d3\u05d9\u05d5\u05df. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This image is for decorative purposes only and does not require a description.": "\u05ea\u05de\u05d5\u05e0\u05d4 \u05d6\u05d5 \u05e0\u05d5\u05e2\u05d3\u05d4 \u05dc\u05de\u05d8\u05e8\u05d5\u05ea \u05d3\u05e7\u05d5\u05e8\u05d8\u05d9\u05d1\u05d9\u05d5\u05ea \u05d1\u05dc\u05d1\u05d3 \u05d5\u05d0\u05d9\u05df \u05e6\u05d5\u05e8\u05da \u05d1\u05ea\u05d9\u05d0\u05d5\u05e8\u05d4.", 
     "This is the Description of the Group Configuration": "\u05d6\u05d4\u05d5 \u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05d2\u05d3\u05e8\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
     "This is the Name of the Group Configuration": "\u05d6\u05d4\u05d5 \u05e9\u05dd \u05d4\u05d2\u05d3\u05e8\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
@@ -1407,14 +1443,26 @@
     "This learner will be removed from the team, allowing another learner to take the available spot.": "\u05ea\u05dc\u05de\u05d9\u05d3 \u05d6\u05d4 \u05d9\u05d5\u05e1\u05e8 \u05de\u05d4\u05e6\u05d5\u05d5\u05ea, \u05db\u05da \u05e9\u05d9\u05ea\u05d0\u05e4\u05e9\u05e8 \u05dc\u05ea\u05dc\u05de\u05d9\u05d3 \u05d0\u05d7\u05e8 \u05dc\u05d4\u05e6\u05d8\u05e8\u05e3 \u05dc\u05de\u05e7\u05d5\u05dd \u05e9\u05d4\u05ea\u05e4\u05e0\u05d4.", 
     "This link will open in a modal window": "\u05e7\u05d9\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05d9\u05e4\u05ea\u05d7 \u05d1\u05d7\u05dc\u05d5\u05e0\u05d9\u05ea \u05e9\u05d9\u05d7\u05d4", 
     "This link will open in a new browser window/tab": "\u05e7\u05d9\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05d9\u05d9\u05e4\u05ea\u05d7 \u05d1\u05d7\u05dc\u05d5\u05df/\u05dc\u05e9\u05d5\u05e0\u05d9\u05ea \u05d3\u05e4\u05d3\u05e4\u05df \u05d7\u05d3\u05e9/\u05d4", 
+    "This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.": "\u05d9\u05d9\u05ea\u05db\u05df \u05d5\u05d3\u05d1\u05e8 \u05d6\u05d4 \u05de\u05ea\u05e8\u05d7\u05e9 \u05d1\u05e9\u05dc \u05d8\u05e2\u05d5\u05ea \u05d1\u05e9\u05e8\u05ea \u05e9\u05dc\u05e0\u05d5 \u05d0\u05d5 \u05d1\u05d7\u05d9\u05d1\u05d5\u05e8 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8. \u05e0\u05e1\u05d4 \u05dc\u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d0\u05d5 \u05d5\u05d3\u05d0 \u05e9\u05d0\u05ea\u05d4 \u05de\u05e7\u05d5\u05d5\u05df.", 
     "This page contains information about orders that you have placed with {platform_name}.": "\u05e2\u05de\u05d5\u05d3 \u05d6\u05d4 \u05de\u05db\u05d9\u05dc \u05de\u05d9\u05d3\u05e2 \u05e2\u05dc \u05d4\u05d6\u05de\u05e0\u05d5\u05ea \u05e9\u05d1\u05d9\u05e6\u05e2\u05ea \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea {platform_name}.", 
+    "This post could not be closed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e1\u05d2\u05d5\u05e8 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be flagged for abuse. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d3\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05e4\u05d5\u05e1\u05d8 \u05db\u05d1\u05dc\u05ea\u05d9 \u05d4\u05d5\u05dc\u05dd. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be pinned. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e6\u05de\u05d9\u05d3 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be reopened. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e4\u05ea\u05d5\u05d7 \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be unflagged for abuse. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05d4\u05d3\u05d9\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05e4\u05d5\u05e1\u05d8 \u05db\u05d1\u05dc\u05ea\u05d9 \u05d4\u05d5\u05dc\u05dd. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This post could not be unpinned. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05d4\u05e6\u05de\u05d3\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This post is visible only to %(group_name)s.": "\u05e4\u05d5\u05e1\u05d8 \u05d6\u05d4 \u05d2\u05dc\u05d5\u05d9 \u05e8\u05e7 \u05dc-%(group_name)s.", 
     "This post is visible to everyone.": "\u05e4\u05d5\u05e1\u05d8 \u05d6\u05d4 \u05d2\u05dc\u05d5\u05d9 \u05dc\u05db\u05d5\u05dc\u05dd.", 
     "This problem has been reset.": "\u05d4\u05d1\u05e2\u05d9\u05d4 \u05dc\u05d0 \u05d0\u05d5\u05ea\u05d7\u05dc\u05d4.", 
+    "This response could not be marked as an answer. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e1\u05de\u05df \u05d0\u05ea \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05ea\u05e9\u05d5\u05d1\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This response could not be marked as endorsed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e1\u05de\u05df \u05d0\u05ea \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05de\u05d5\u05de\u05dc\u05e6\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This response could not be unendorsed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05e1\u05d9\u05de\u05d5\u05df \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05de\u05d5\u05de\u05dc\u05e6\u05ea. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "This response could not be unmarked as an answer. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05e1\u05d9\u05de\u05d5\u05df \u05d4\u05ea\u05d2\u05d5\u05d1\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05ea\u05d5\u05e8 \u05ea\u05e9\u05d5\u05d1\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "This short name for the assignment type (for example, HW or Midterm) appears next to assignments on a learner's Progress page.": "\u05e9\u05dd \u05e7\u05e6\u05e8 \u05d6\u05d4 \u05dc\u05e1\u05d5\u05d2 \u05d4\u05de\u05e9\u05d9\u05de\u05d4 (\u05dc\u05d3\u05d5\u05d2\u05de\u05d4, \u05e9\"\u05d1 \u05d0\u05d5 \u05de\u05d1\u05d7\u05df \u05d0\u05de\u05e6\u05e2) \u05de\u05d5\u05e4\u05d9\u05e2 \u05dc\u05d9\u05d3 \u05d4\u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e9\u05d1\u05e2\u05de\u05d5\u05d3 \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05e9\u05dc \u05d4\u05dc\u05d5\u05de\u05d3.", 
     "This team does not have any members.": "\u05d0\u05d9\u05df \u05d7\u05d1\u05e8\u05d9\u05dd \u05d1\u05e6\u05d5\u05d5\u05ea \u05d6\u05d4.", 
     "This team is full.": "\u05e6\u05d5\u05d5\u05ea \u05d6\u05d4 \u05de\u05dc\u05d0.", 
     "This thread is closed.": "\u05e9\u05e8\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05e1\u05d2\u05d5\u05e8", 
+    "This vote could not be processed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d1\u05d3 \u05d0\u05ea \u05d4\u05d1\u05e7\u05e9\u05d4. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Time Allotted (HH:MM):": "\u05d6\u05de\u05df \u05e9\u05d4\u05d5\u05e7\u05e6\u05d1 (\u05e9\u05e9:\u05d3\u05d3):", 
     "Time Sent": "\u05d6\u05de\u05df \u05d4\u05e9\u05dc\u05d9\u05d7\u05d4:", 
     "Time Sent:": "\u05d6\u05de\u05df \u05d4\u05e9\u05dc\u05d9\u05d7\u05d4:", 
@@ -1466,6 +1514,7 @@
     "Ungraded": "\u05dc\u05dc\u05d0 \u05e6\u05d9\u05d5\u05df", 
     "Unit": "\u05d9\u05d7\u05d9\u05d3\u05d4", 
     "Unit Visibility": "\u05e0\u05e8\u05d0\u05d5\u05ea \u05d9\u05d7\u05d9\u05d3\u05d4", 
+    "Units": "\u05d9\u05d7\u05d9\u05d3\u05d5\u05ea", 
     "Unknown": "\u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2", 
     "Unknown Error Occurred.": "\u05d4\u05ea\u05e8\u05d7\u05e9\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2\u05d4.", 
     "Unlink This Account": "\u05d4\u05e1\u05e8 \u05d0\u05ea \u05d4\u05e7\u05d9\u05e9\u05d5\u05e8 \u05e9\u05dc \u05d7\u05e9\u05d1\u05d5\u05df \u05d6\u05d4", 
@@ -1503,7 +1552,9 @@
     "Upload an image": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4", 
     "Upload an image or capture one with your web or phone camera.": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4 \u05d0\u05d5 \u05e6\u05dc\u05dd \u05d1\u05e2\u05d6\u05e8\u05ea \u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05d0\u05d5 \u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e0\u05d9\u05d9\u05d3 \u05e9\u05d1\u05e8\u05e9\u05d5\u05ea\u05da. ", 
     "Upload completed": "\u05d4\u05e2\u05dc\u05d0\u05d4 \u05d4\u05d5\u05e9\u05dc\u05de\u05d4", 
+    "Upload completed for video {fileName}": "\u05d4\u05d4\u05e2\u05dc\u05d0\u05d4 \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5 {fileName} \u05d4\u05d5\u05e9\u05dc\u05de\u05d4", 
     "Upload failed": "\u05d4\u05e2\u05dc\u05d0\u05d4 \u05e0\u05db\u05e9\u05dc\u05d4", 
+    "Upload failed for video {fileName}": "\u05d4\u05d4\u05e2\u05dc\u05d0\u05d4 \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5 {fileName} \u05dc\u05d0 \u05d4\u05e6\u05dc\u05d9\u05d7\u05d4", 
     "Upload instructor image.": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05ea \u05de\u05d3\u05e8\u05d9\u05da.", 
     "Upload is in progress. To avoid errors, stay on this page until the process is complete.": "\u05d4\u05e2\u05dc\u05d0\u05d4 \u05de\u05ea\u05d1\u05e6\u05e2\u05ea. \u05db\u05d3\u05d9 \u05dc\u05d4\u05d9\u05de\u05e0\u05e2 \u05de\u05e9\u05d2\u05d9\u05d0\u05d5\u05ea, \u05d4\u05d9\u05e9\u05d0\u05e8 \u05d1\u05e2\u05de\u05d5\u05d3 \u05d6\u05d4 \u05e2\u05d3 \u05e9\u05d4\u05ea\u05d4\u05dc\u05d9\u05da \u05d9\u05d5\u05e9\u05dc\u05dd.", 
     "Upload signature image.": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05ea \u05d7\u05ea\u05d9\u05de\u05d4.", 
@@ -1528,10 +1579,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05e9\u05dc\u05da \u05dc\u05e6\u05dc\u05dd \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4 \u05e9\u05dc\u05da. \u05d0\u05e0\u05d5 \u05e0\u05ea\u05d0\u05d9\u05dd \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05d4\u05d6\u05d5 \u05dc\u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e0\u05d9\u05da \u05d5\u05dc\u05e9\u05dd \u05d7\u05e9\u05d1\u05d5\u05e0\u05da. ", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05e9\u05dc\u05da \u05dc\u05e6\u05dc\u05dd \u05d0\u05ea \u05e4\u05e0\u05d9\u05da. \u05d0\u05e0\u05d7\u05e0\u05d5 \u05e0\u05e9\u05d5\u05d5\u05d4 \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05dc\u05ea\u05de\u05d5\u05e0\u05ea\u05da \u05d1\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4.", 
     "Used": "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9", 
-    "Used in {count} unit": [
-      "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d1\u05d9\u05d7\u05d9\u05d3\u05d4 {count}", 
-      "\u05e0\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9 \u05d1-{count} \u05d9\u05d7\u05d9\u05d3\u05d5\u05ea"
-    ], 
     "User": "\u05de\u05e9\u05ea\u05de\u05e9", 
     "User Email": "\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e9\u05dc \u05de\u05e9\u05ea\u05de\u05e9", 
     "Username": "\u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9", 
@@ -1575,6 +1622,7 @@
       "\u05de\u05e6\u05d9\u05d2 \u05e7\u05d5\u05e8\u05e1 %s", 
       "\u05de\u05e6\u05d9\u05d2 %s \u05e7\u05d5\u05e8\u05e1\u05d9\u05dd"
     ], 
+    "Visibility": "\u05ea\u05e6\u05d5\u05d2\u05d4", 
     "Visible to": "\u05d2\u05dc\u05d5\u05d9 \u05e2\u05d1\u05d5\u05e8:", 
     "Visible to Staff Only": "\u05d2\u05dc\u05d5\u05d9 \u05dc\u05e6\u05d5\u05d5\u05ea \u05d1\u05dc\u05d1\u05d3", 
     "Visual aids": "\u05e2\u05d6\u05e8\u05d9\u05dd \u05d5\u05d9\u05d6\u05d5\u05d0\u05dc\u05d9\u05dd", 
@@ -1614,6 +1662,7 @@
     "Would you like to sign in using your %(providerName)s credentials?": "\u05d4\u05d0\u05dd \u05ea\u05e8\u05e6\u05d4 \u05dc\u05d4\u05d9\u05db\u05e0\u05e1 \u05dc\u05d7\u05e9\u05d1\u05d5\u05df \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05d4\u05e8\u05e9\u05d0\u05d5\u05ea %(providerName)s \u05e9\u05dc\u05da?", 
     "Year of Birth": "\u05e9\u05e0\u05ea \u05dc\u05d9\u05d3\u05d4", 
     "Yes, allow edits to the active Certificate": "\u05db\u05df, \u05d0\u05e4\u05e9\u05e8 \u05e2\u05e8\u05d9\u05db\u05d5\u05ea \u05d1\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05e4\u05e2\u05d9\u05dc\u05d4", 
+    "Yes, delete this {xblock_type}": "\u05db\u05df, \u05de\u05d7\u05e7 \u05d0\u05ea {xblock_type} \u05d6\u05d4", 
     "Yes, replace the edX transcript with the YouTube transcript": "\u05db\u05df, \u05d4\u05d7\u05dc\u05e3 \u05d0\u05ea \u05ea\u05de\u05dc\u05d9\u05dc edX \u05d1\u05ea\u05de\u05dc\u05d9\u05dc \u05d9\u05d5\u05d8\u05d9\u05d5\u05d1", 
     "You already belong to another team.": "\u05d0\u05ea\u05d4 \u05db\u05d1\u05e8 \u05e9\u05d9\u05d9\u05da \u05dc\u05e6\u05d5\u05d5\u05ea \u05d0\u05d7\u05e8.", 
     "You are a member of this team.": "\u05d0\u05ea\u05d4 \u05d7\u05d1\u05e8 \u05d1\u05e6\u05d5\u05d5\u05ea \u05d6\u05d4.", 
@@ -1633,6 +1682,8 @@
     "You cannot view the course as a student or beta tester before the course release date.": "\u05d0\u05d9\u05e0\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05e6\u05e4\u05d5\u05ea \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05db\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d0\u05d5 \u05de\u05e9\u05ea\u05de\u05e9 \u05d1\u05d2\u05e8\u05e1\u05ea \u05d4\u05d1\u05d8\u05d0 \u05dc\u05e4\u05e0\u05d9 \u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05d4\u05e9\u05e7\u05d4 \u05e9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1.", 
     "You changed a video URL, but did not change the timed transcript file. Do you want to use the current timed transcript or upload a new .srt transcript file?": "\u05e9\u05d9\u05e0\u05d9\u05ea \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4-URL \u05e9\u05dc \u05e1\u05e8\u05d8\u05d5\u05df \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d0\u05da \u05dc\u05d0 \u05e9\u05d9\u05e0\u05d9\u05ea \u05d0\u05ea \u05e7\u05d5\u05d1\u05e5 \u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df. \u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e7\u05d5\u05d1\u05e5 \u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05e0\u05d5\u05db\u05d7\u05d9 \u05d0\u05d5 \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e7\u05d5\u05d1\u05e5 \u05ea\u05de\u05dc\u05d9\u05dc SRT \u05d7\u05d3\u05e9?", 
     "You commented...": "\u05d4\u05d2\u05d1\u05ea...", 
+    "You could not be subscribed to this post. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e8\u05e9\u05d5\u05dd \u05d0\u05d5\u05ea\u05da \u05dc\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
+    "You could not be unsubscribed from this post. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05d4\u05e8\u05d9\u05e9\u05d5\u05dd \u05e9\u05dc\u05da \u05dc\u05e4\u05d5\u05e1\u05d8. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "You currently have no cohorts configured": "\u05dc\u05d0 \u05de\u05d5\u05d2\u05d3\u05e8\u05d5\u05ea \u05db\u05e2\u05ea \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
     "You did not select a content group": "\u05dc\u05d0 \u05d1\u05d7\u05e8\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df", 
     "You did not select any files to submit.": "\u05dc\u05d0 \u05d1\u05d7\u05e8\u05ea \u05d0\u05e3 \u05e7\u05d5\u05d1\u05e5 \u05dc\u05d4\u05d2\u05e9\u05d4.", 
@@ -1641,22 +1692,22 @@
     "You don't seem to have a webcam connected.": "\u05e0\u05e8\u05d0\u05d4 \u05db\u05d9 \u05dc\u05d0 \u05de\u05d7\u05d5\u05d1\u05e8\u05ea \u05de\u05e6\u05dc\u05de\u05ea \u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8.", 
     "You have already reported this annotation.": "\u05db\u05d1\u05e8 \u05d3\u05d9\u05d5\u05d5\u05d7\u05ea \u05e2\u05dc \u05d4\u05d4\u05e2\u05e8\u05d4 \u05d4\u05d6\u05d5.", 
     "You have already verified your ID!": "\u05d0\u05d9\u05de\u05ea\u05ea \u05db\u05d1\u05e8 \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da!", 
+    "You have been logged out of your edX account. Click Okay to log in again now. Click Cancel to stay on this page (you must log in again to save your work).": "\u05d9\u05e6\u05d0\u05ea \u05de\u05d7\u05e9\u05d1\u05d5\u05df edX \u05e9\u05dc\u05da. \u05dc\u05d7\u05e5 \u05e2\u05dc '\u05d0\u05d9\u05e9\u05d5\u05e8' \u05db\u05d3\u05d9 \u05dc\u05d4\u05d9\u05db\u05e0\u05e1 \u05e9\u05d5\u05d1 \u05db\u05e2\u05ea. \u05dc\u05d7\u05e5 \u05e2\u05dc '\u05d1\u05d9\u05d8\u05d5\u05dc' \u05db\u05d3\u05d9 \u05dc\u05d4\u05d9\u05e9\u05d0\u05e8 \u05d1\u05e2\u05de\u05d5\u05d3 (\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d9\u05db\u05e0\u05e1 \u05e9\u05d5\u05d1 \u05db\u05d3\u05d9 \u05dc\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05de\u05d4 \u05e9\u05e2\u05e9\u05d9\u05ea).", 
     "You have done a dry run of force publishing the course. Nothing has changed. Had you run it, the following course versions would have been change.": "\u05d1\u05d9\u05e6\u05e2\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4 \u05de\u05d0\u05d5\u05dc\u05e6\u05ea \u05e9\u05dc \u05e4\u05e8\u05e1\u05d5\u05dd \u05d4\u05e7\u05d5\u05e8\u05e1. \u05d3\u05d1\u05e8 \u05dc\u05d0 \u05d4\u05e9\u05ea\u05e0\u05d4. \u05d0\u05dd \u05d4\u05d9\u05d9\u05ea \u05de\u05e4\u05e2\u05d9\u05dc \u05d0\u05d5\u05ea\u05d5, \u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05d1\u05d0\u05d5\u05ea \u05d4\u05d9\u05d5 \u05de\u05e9\u05ea\u05e0\u05d5\u05ea.", 
     "You have no handouts defined": "\u05dc\u05d0 \u05d4\u05d5\u05d2\u05d3\u05e8\u05d5 \u05d3\u05e4\u05d9 \u05de\u05d9\u05d3\u05e2", 
     "You have not created any certificates yet.": "\u05dc\u05d0 \u05d9\u05e6\u05e8\u05ea \u05d0\u05e3 \u05ea\u05e2\u05d5\u05d3\u05d4 \u05e2\u05d3\u05d9\u05d9\u05df.", 
     "You have not created any content groups yet.": " \u05dc\u05d0 \u05d9\u05e6\u05e8\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05ea\u05d5\u05db\u05df \u05db\u05dc\u05e9\u05d4\u05df.", 
     "You have not created any group configurations yet.": "\u05dc\u05d0 \u05d9\u05e6\u05e8\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d4.", 
+    "You have successfully signed into %(currentProvider)s, but your %(currentProvider)s account does not have a linked %(platformName)s account. To link your accounts, sign in now using your %(platformName)s password.": "\u05e0\u05e8\u05e9\u05de\u05ea \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc-%(currentProvider)s, \u05d0\u05da \u05dc\u05d7\u05e9\u05d1\u05d5\u05df %(currentProvider)s\u05d0\u05d9\u05df \u05d7\u05e9\u05d1\u05d5\u05df %(platformName)s \u05de\u05e7\u05d5\u05e9\u05e8. \u05db\u05d3\u05d9 \u05dc\u05e7\u05e9\u05e8 \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05d5\u05ea\u05d9\u05d9\u05da, \u05d4\u05d9\u05db\u05e0\u05e1 \u05db\u05e2\u05ea \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05e1\u05d9\u05e1\u05de\u05ea %(platformName)s.", 
     "You have unsaved changes are you sure you want to navigate away?": "\u05d9\u05e9\u05e0\u05dd \u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5, \u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d0\u05ea\u05d4 \u05e8\u05d5\u05e6\u05d4 \u05dc\u05e2\u05d6\u05d5\u05d1?", 
     "You have unsaved changes. Do you really want to leave this page?": "\u05d9\u05e9\u05e0\u05dd \u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5. \u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e2\u05d6\u05d5\u05d1 \u05e2\u05de\u05d5\u05d3 \u05d6\u05d4?", 
     "You haven't added any assets to this course yet.": "\u05e2\u05d3\u05d9\u05d9\u05df \u05dc\u05d0 \u05d4\u05d5\u05e1\u05e4\u05ea \u05e0\u05db\u05e1\u05d9\u05dd \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "You haven't added any content to this course yet.": " \u05dc\u05d0 \u05d4\u05d5\u05e1\u05e4\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05ea\u05d5\u05db\u05df \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
     "You haven't added any textbooks to this course yet.": "\u05dc\u05d0 \u05d4\u05d5\u05e1\u05e4\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05e1\u05e4\u05e8\u05d9 \u05dc\u05d9\u05de\u05d5\u05d3 \u05dc\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d9\u05d5\u05ea \u05de\u05e2\u05dc \u05d2\u05d9\u05dc 13 \u05db\u05d3\u05d9 \u05dc\u05e9\u05ea\u05e3 \u05d0\u05ea \u05de\u05d9\u05d3\u05e2 \u05d4\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d4\u05de\u05dc\u05d0 \u05e9\u05dc\u05da. \u05d0\u05dd \u05d0\u05ea\u05d4 \u05de\u05e2\u05dc \u05d2\u05d9\u05dc 13, \u05d5\u05d3\u05d0 \u05e9\u05e6\u05d9\u05d9\u05e0\u05ea \u05d0\u05ea \u05e9\u05e0\u05ea \u05d4\u05dc\u05d9\u05d3\u05d4 \u05e9\u05dc\u05da \u05d1{account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d6\u05d9\u05df \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05ea\u05e7\u05d9\u05e0\u05d4 \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d7\u05d1\u05e8 \u05e6\u05d5\u05d5\u05ea \u05d7\u05d3\u05e9.", 
     "You must sign out and sign back in before your language changes take effect.": "\u05e2\u05dc\u05d9\u05da \u05dc\u05e6\u05d0\u05ea \u05de\u05d4\u05d7\u05e9\u05d1\u05d5\u05df \u05d5\u05dc\u05d4\u05db\u05e0\u05e1 \u05d7\u05d6\u05e8\u05d4 \u05e2\u05dc \u05de\u05e0\u05ea \u05e9\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9 \u05d4\u05e9\u05e4\u05d4 \u05d9\u05d9\u05db\u05e0\u05e1\u05d5 \u05dc\u05ea\u05d5\u05e7\u05e3.", 
     "You must specify a name": "\u05e2\u05dc\u05d9\u05da \u05dc\u05ea\u05ea \u05e9\u05dd", 
     "You must specify a name for the cohort": "\u05e2\u05dc\u05d9\u05da \u05dc\u05e6\u05d9\u05d9\u05df \u05e9\u05dd \u05e9\u05dc \u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05d9\u05de\u05d5\u05d3", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u05e2\u05dc\u05d9\u05da \u05dc\u05e6\u05d9\u05d9\u05df \u05d0\u05ea \u05e9\u05e0\u05ea \u05d4\u05dc\u05d9\u05d3\u05d4 \u05e9\u05dc\u05da \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05d5\u05db\u05dc \u05dc\u05d7\u05dc\u05d5\u05e7 \u05d0\u05ea \u05d4\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d4\u05de\u05dc\u05d0 \u05e9\u05dc\u05da. \u05d1\u05db\u05d3\u05d9 \u05dc\u05e6\u05d9\u05d9\u05df \u05d0\u05ea \u05e9\u05e0\u05ea \u05d4\u05dc\u05d9\u05d3\u05d4 \u05e9\u05dc\u05da \u05e2\u05d1\u05d5\u05e8 \u05dc{account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u05d0\u05ea\u05d4 \u05d6\u05e7\u05d5\u05e7 \u05dc\u05de\u05d7\u05e9\u05d1 \u05d1\u05e2\u05dc \u05de\u05e6\u05dc\u05de\u05ea \u05e8\u05e9\u05ea. \u05d1\u05e7\u05d1\u05dc\u05ea \u05d4\u05e0\u05d7\u05d9\u05d9\u05ea \u05d3\u05e4\u05d3\u05e4\u05df, \u05d5\u05d3\u05d0 \u05db\u05d9 \u05d0\u05ea\u05d4 \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05dc\u05de\u05e6\u05dc\u05de\u05d4.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u05d0\u05ea\u05d4 \u05d6\u05e7\u05d5\u05e7 \u05dc\u05e8\u05d9\u05e9\u05d9\u05d5\u05df \u05e0\u05d4\u05d9\u05d2\u05d4, \u05d3\u05e8\u05db\u05d5\u05df \u05d0\u05d5 \u05ea\u05e2\u05d5\u05d3\u05ea \u05de\u05d6\u05d4\u05d4 \u05d0\u05d7\u05e8\u05ea \u05e9\u05de\u05d5\u05e4\u05d9\u05e2\u05d9\u05dd \u05d1\u05d4 \u05e9\u05de\u05da \u05d5\u05ea\u05de\u05d5\u05e0\u05ea\u05da.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u05d0\u05ea\u05d4 \u05d6\u05e7\u05d5\u05e7 \u05dc\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d6\u05d4\u05d4 \u05e2\u05dd \u05e9\u05de\u05da \u05d5\u05e2\u05dd \u05ea\u05de\u05d5\u05e0\u05d4. \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e8\u05d9\u05e9\u05d9\u05d5\u05df \u05e0\u05d4\u05d9\u05d2\u05d4, \u05d3\u05e8\u05db\u05d5\u05df \u05d0\u05d5 \u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d6\u05d4\u05d4 \u05d0\u05d7\u05e8\u05ea \u05e9\u05d4\u05d5\u05e0\u05e4\u05e7\u05d4 \u05e2\u05dc \u05d9\u05d3\u05d9 \u05d4\u05de\u05de\u05e9\u05dc\u05d4. ", 
@@ -1677,6 +1728,7 @@
     "Your changes have been saved.": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e0\u05e9\u05de\u05e8\u05d5", 
     "Your changes will not take effect until you save your progress.": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05d1\u05d9\u05e6\u05e2\u05ea \u05dc\u05d0 \u05d9\u05db\u05e0\u05e1\u05d5 \u05dc\u05e4\u05d5\u05e2\u05dc \u05e2\u05d3 \u05e9\u05ea\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05e2\u05d1\u05d5\u05d3\u05ea\u05da.", 
     "Your changes will not take effect until you save your progress. Take care with key and value formatting, as validation is not implemented.": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05e9\u05d1\u05d9\u05e6\u05e2\u05ea \u05dc\u05d0 \u05d9\u05db\u05e0\u05e1\u05d5 \u05dc\u05ea\u05d5\u05e7\u05e3 \u05e2\u05d3 \u05e9\u05ea\u05e9\u05de\u05d5\u05e8 \u05d0\u05ea \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea\u05da. \u05e9\u05d9\u05dd \u05dc\u05d1 \u05dc\u05e2\u05d9\u05e6\u05d5\u05d1 \u05d4\u05e7\u05d5 \u05d5\u05d4\u05e2\u05e8\u05da, \u05de\u05d0\u05d7\u05e8 \u05e9\u05d4\u05d0\u05d9\u05de\u05d5\u05ea \u05d0\u05d9\u05e0\u05d5 \u05de\u05d5\u05d8\u05de\u05e2.", 
+    "Your course could not be exported to XML. There is not enough information to identify the failed component. Inspect your course to identify any problematic components and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d9\u05d9\u05e6\u05d0 \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05dc-XML. \u05d0\u05d9\u05df \u05de\u05d9\u05d3\u05e2 \u05d1\u05de\u05d9\u05d3\u05d4 \u05de\u05e1\u05e4\u05e7\u05ea \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d6\u05d4\u05d5\u05ea \u05d0\u05ea \u05d4\u05e8\u05db\u05d9\u05d1 \u05d4\u05db\u05d5\u05e9\u05dc. \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e9\u05dc\u05da \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d6\u05d4\u05d5\u05ea \u05e8\u05db\u05d9\u05d1\u05d9\u05dd \u05d1\u05e2\u05d9\u05d9\u05ea\u05d9\u05dd \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
     "Your donation could not be submitted.": "\u05d4\u05ea\u05e8\u05d5\u05de\u05d4 \u05e9\u05dc\u05da \u05dc\u05d0 \u05d9\u05db\u05dc\u05d4 \u05dc\u05d4\u05ea\u05e7\u05d1\u05dc.", 
     "Your email message was successfully queued for sending. In courses with a large number of learners, email messages to learners might take up to an hour to be sent.": "\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05e0\u05db\u05e0\u05e1\u05d4 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4 \u05dc\u05d4\u05de\u05ea\u05e0\u05d4 \u05dc\u05de\u05e9\u05dc\u05d5\u05d7. \u05d1\u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05e2\u05dd \u05de\u05e1\u05e4\u05e8 \u05d2\u05d3\u05d5\u05dc \u05e9\u05dc \u05dc\u05d5\u05de\u05d3\u05d9\u05dd, \u05d9\u05d9\u05ea\u05db\u05df \u05e9\u05d9\u05d9\u05e7\u05d7 \u05e2\u05d3 \u05e9\u05e2\u05d4 \u05e2\u05d3 \u05e9\u05d4\u05d5\u05d3\u05e2\u05d5\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05dc\u05db\u05dc \u05d4\u05dc\u05d5\u05de\u05d3\u05d9\u05dd \u05d9\u05d9\u05e9\u05dc\u05d7\u05d5.", 
     "Your entire face fits inside the frame.": "\u05e4\u05e0\u05d9\u05da \u05de\u05ea\u05d0\u05d9\u05de\u05d9\u05dd \u05dc\u05d2\u05d1\u05d5\u05dc\u05d5\u05ea \u05d4\u05de\u05e1\u05d2\u05e8\u05ea.", 
@@ -1685,13 +1737,19 @@
     "Your file could not be uploaded": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05d0\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5 \u05e9\u05dc\u05da", 
     "Your file has been deleted.": "\u05d4\u05e7\u05d5\u05d1\u05e5 \u05e9\u05dc\u05da \u05e0\u05de\u05d7\u05e7", 
     "Your file {filename} is too large (max size: {maxSize}MB).": "\u05d4\u05e7\u05d5\u05d1\u05e5 {filename} \u05d2\u05d3\u05d5\u05dc \u05de\u05d3\u05d9 (\u05d2\u05d5\u05d3\u05dc \u05de\u05e8\u05d1\u05d9: {maxSize}MB).", 
+    "Your import has failed.": "\u05d4\u05d9\u05d1\u05d5\u05d0 \u05e0\u05db\u05e9\u05dc.", 
+    "Your import is in progress; navigating away will abort it.": "\u05d4\u05d9\u05d1\u05d5\u05d0 \u05e9\u05dc\u05da \u05e0\u05de\u05e6\u05d0 \u05d1\u05ea\u05d4\u05dc\u05d9\u05da; \u05e0\u05d9\u05d5\u05d5\u05d8 \u05d4\u05d7\u05d5\u05e6\u05d4 \u05d9\u05d1\u05d8\u05dc \u05d6\u05d0\u05ea.", 
+    "Your library could not be exported to XML. There is not enough information to identify the failed component. Inspect your library to identify any problematic components and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d9\u05d9\u05e6\u05d0 \u05d0\u05ea \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea\u05da \u05dc\u05e7\u05d5\u05d1\u05e5 XML. \u05d0\u05d9\u05df \u05de\u05d9\u05d3\u05e2  \u05d1\u05de\u05d9\u05d3\u05d4 \u05de\u05e1\u05e4\u05e7\u05ea \u05dc\u05d6\u05d9\u05d4\u05d5\u05d9 \u05d4\u05e8\u05db\u05d9\u05d1 \u05d4\u05db\u05d5\u05e9\u05dc. \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea\u05da, \u05d6\u05d4\u05d4 \u05e8\u05db\u05d9\u05d1\u05d9\u05dd \u05d1\u05e2\u05d9\u05ea\u05d9\u05d9\u05dd \u05d5\u05dc\u05d0\u05d7\u05e8 \u05de\u05db\u05df \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
     "Your message cannot be blank.": "\u05d4\u05d5\u05d3\u05e2\u05ea\u05da \u05d0\u05d9\u05e0\u05d4 \u05d9\u05db\u05d5\u05dc\u05d4 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e8\u05d9\u05e7\u05d4.", 
     "Your message must have a subject.": "\u05d4\u05d5\u05d3\u05e2\u05ea\u05da \u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05db\u05d9\u05dc \u05e0\u05d5\u05e9\u05d0.", 
     "Your message must have at least one target.": "\u05d4\u05d4\u05d5\u05d3\u05e2\u05d4 \u05e9\u05dc\u05da \u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05db\u05d9\u05dc \u05d9\u05e2\u05d3 \u05d0\u05d7\u05d3 \u05dc\u05e4\u05d7\u05d5\u05ea.", 
     "Your policy changes have been saved.": "\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9 \u05de\u05d3\u05d9\u05e0\u05d9\u05d5\u05ea\u05da \u05e0\u05e9\u05de\u05e8\u05d5.", 
     "Your post will be discarded.": "\u05d4\u05e4\u05d5\u05e1\u05d8 \u05e9\u05dc\u05da \u05d9\u05d1\u05d5\u05d8\u05dc.", 
+    "Your question or idea (required)": "\u05e9\u05d0\u05dc\u05ea\u05da \u05d0\u05d5 \u05e8\u05e2\u05d9\u05d5\u05e0\u05da (\u05d7\u05d5\u05d1\u05d4)", 
+    "Your request could not be completed due to a server problem. Reload the page and try again. If the issue persists, click the Help tab to report the problem.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da \u05d1\u05d2\u05dc\u05dc \u05d1\u05e2\u05d9\u05d4 \u05d1\u05e9\u05e8\u05ea. \u05d8\u05e2\u05df \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. \u05d0\u05dd \u05d4\u05d1\u05e2\u05d9\u05d4 \u05e0\u05de\u05e9\u05db\u05ea, \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05e9\u05d5\u05e0\u05d9\u05ea '\u05e2\u05d6\u05e8\u05d4' \u05db\u05d3\u05d9 \u05dc\u05d3\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05d1\u05e2\u05d9\u05d4.", 
     "Your request could not be completed. Reload the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da. \u05d8\u05e2\u05df \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.", 
     "Your request could not be completed. Reload the page and try again. If the issue persists, click the Help tab to report the problem.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da. \u05d8\u05e2\u05df \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05d3\u05e3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. \u05d0\u05dd \u05d4\u05d1\u05e2\u05d9\u05d4 \u05e0\u05de\u05e9\u05db\u05ea, \u05dc\u05d7\u05e5 \u05e2\u05dc \u05d4\u05dc\u05e9\u05d5\u05e0\u05d9\u05ea '\u05e2\u05d6\u05e8\u05d4' \u05db\u05d3\u05d9 \u05dc\u05d3\u05d5\u05d5\u05d7 \u05e2\u05dc \u05d4\u05d1\u05e2\u05d9\u05d4.", 
+    "Your request could not be processed. Refresh the page and try again.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d1\u05d3 \u05d0\u05ea \u05d1\u05e7\u05e9\u05ea\u05da. \u05e8\u05e2\u05e0\u05df \u05d0\u05ea \u05d4\u05e2\u05de\u05d5\u05d3 \u05d5\u05e0\u05e1\u05d4 \u05e9\u05e0\u05d9\u05ea.", 
     "Your team could not be created.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d9\u05e6\u05d5\u05e8 \u05d0\u05ea \u05d4\u05e6\u05d5\u05d5\u05ea \u05e9\u05dc\u05da.", 
     "Your team could not be updated.": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d3\u05db\u05df \u05d0\u05ea \u05d4\u05e6\u05d5\u05d5\u05ea \u05e9\u05dc\u05da.", 
     "Your upload of '{file}' failed.": "\u05d4\u05e2\u05dc\u05ea \u05e7\u05d5\u05d1\u05e5 '{file}' \u05e0\u05db\u05e9\u05dc\u05d4.", 
@@ -1732,6 +1790,7 @@
     "dropped on target": "\u05e9\u05d5\u05d7\u05e8\u05e8 \u05e2\u05dc \u05d4\u05de\u05d8\u05e8\u05d4", 
     "e.g. 'Sky with clouds'. The description is helpful for users who cannot see the image.": "\u05dc\u05d3\u05d5\u05d2\u05de\u05d4 '\u05e9\u05de\u05d9\u05d9\u05dd \u05e2\u05dd \u05e2\u05e0\u05e0\u05d9\u05dd'. \u05d4\u05ea\u05d9\u05d0\u05d5\u05e8 \u05de\u05d5\u05e2\u05d9\u05dc \u05dc\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05e9\u05d0\u05d9\u05e0\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4.", 
     "e.g. 'google'": "\u05dc\u05d3\u05d5\u05d2\u05de\u05d4: 'google'", 
+    "e.g. 'http://google.com'": "\u05dc\u05de\u05e9\u05dc 'http://google.com'", 
     "e.g. johndoe@example.com, JaneDoe, joeydoe@example.com": "\u05dc\u05d3\u05d5\u05d2\u05de\u05d4 johndoe@example.com, JaneDoe, joeydoe@example.com", 
     "emphasized text": "\u05d8\u05e7\u05e1\u05d8 \u05de\u05d5\u05d3\u05d2\u05e9", 
     "endorsed %(time_ago)s": "\u05d0\u05d5\u05e9\u05e8 %(time_ago)s", 
@@ -1746,6 +1805,7 @@
     "less than a minute": "\u05e4\u05d7\u05d5\u05ea \u05de\u05d3\u05e7\u05d4", 
     "marked as answer %(time_ago)s": "\u05e1\u05d5\u05de\u05df \u05db\u05ea\u05e9\u05d5\u05d1\u05d4 %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "\u05e1\u05d5\u05de\u05df \u05db\u05ea\u05e9\u05d5\u05d1\u05d4 \u05e2\u05dc \u05d9\u05d3\u05d9 %(time_ago)s \u05e2\u05dc \u05d9\u05d3\u05d9%(user)s", 
+    "minutes": "\u05d3\u05e7\u05d5\u05ea", 
     "name": "\u05e9\u05dd", 
     "off": "\u05db\u05d1\u05d5\u05d9", 
     "on": "\u05e4\u05d5\u05e2\u05dc", 
@@ -1787,6 +1847,8 @@
     "{browse_span_start}Browse teams in other topics{span_end} or {search_span_start}search teams{span_end} in this topic. If you still can't find a team to join, {create_span_start}create a new team in this topic{span_end}.": "{browse_span_start}\u05e2\u05d9\u05d9\u05df \u05d1\u05e6\u05d5\u05d5\u05ea\u05d9\u05dd \u05d1\u05e0\u05d5\u05e9\u05d0\u05d9\u05dd \u05d0\u05d7\u05e8\u05d9\u05dd {span_end}\u05d0\u05d5 {search_span_start}\u05d7\u05e4\u05e9 \u05e6\u05d5\u05d5\u05ea\u05d9\u05dd{span_end} \u05d1\u05e0\u05d5\u05e9\u05d0 \u05d6\u05d4. \u05d0\u05dd \u05e2\u05d3\u05d9\u05d9\u05df \u05dc\u05d0 \u05d4\u05e6\u05dc\u05d7\u05ea \u05dc\u05de\u05e6\u05d5\u05d0 \u05e6\u05d5\u05d5\u05ea \u05dc\u05d4\u05e6\u05d8\u05e8\u05e3 \u05d0\u05dc\u05d9\u05d5, {create_span_start}\u05e6\u05d5\u05e8 \u05e6\u05d5\u05d5\u05ea \u05d7\u05d3\u05e9 \u05d1\u05e0\u05d5\u05e9\u05d0 \u05d6\u05d4{span_end}.", 
     "{display_name} Settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea {display_name}", 
     "{email} is already on the {container} team. Recheck the email address if you want to add a new member.": "{email} \u05db\u05d1\u05e8 \u05e0\u05de\u05e6\u05d0 \u05d1\u05e6\u05d5\u05d5\u05ea {container}. \u05d1\u05d3\u05d5\u05e7 \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05d1\u05de\u05d9\u05d3\u05d4 \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d7\u05d1\u05e8 \u05e6\u05d5\u05d5\u05ea \u05d7\u05d3\u05e9.", 
+    "{filename} exceeds maximum size of {maxFileSizeInGB} GB.": "\u05d4\u05e7\u05d5\u05d1\u05e5 {filename} \u05d7\u05d5\u05e8\u05d2 \u05de\u05d4\u05d2\u05d5\u05d3\u05dc \u05d4\u05de\u05e8\u05d1\u05d9 \u05e9\u05dc {maxFileSizeInGB} GB.", 
+    "{filename} is not in a supported file format. Supported file formats are {supportedFileFormats}.": "\u05d4\u05e4\u05d5\u05e8\u05de\u05d8 \u05e9\u05dc {filename} \u05d0\u05d9\u05e0\u05d5 \u05e0\u05ea\u05de\u05da. \u05e1\u05d5\u05d2\u05d9 \u05d4\u05e7\u05d1\u05e6\u05d9\u05dd \u05e9\u05e0\u05ea\u05de\u05db\u05d9\u05dd \u05d4\u05dd {supportedFileFormats}.", 
     "{hours}:{minutes} (current UTC time)": "{hours}:{minutes} (\u05d6\u05de\u05df \u05d0\u05d5\u05e0\u05d9\u05d1\u05e8\u05e1\u05dc\u05d9 \u05de\u05ea\u05d5\u05d0\u05dd (UTC) \u05e0\u05d5\u05db\u05d7\u05d9)", 
     "{label}: {status}": "{label}: {status}", 
     "{numResponses} other response": [
@@ -1802,7 +1864,7 @@
       "{numVotes} \u05e7\u05d5\u05dc\u05d5\u05ea"
     ], 
     "{organization}\\'s logo": "\u05d4\u05e1\u05de\u05dc \u05e9\u05dc {organization}", 
-    "{platform_name} learners can see my:": "{platform_name} \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea:", 
+    "{paragraphStart}You entered {boldStart}{email}{boldEnd}. If this email address is associated with your {platform_name} account, we will send a message with password reset instructions to this email address.{paragraphEnd}{paragraphStart}If you do not receive a password reset message, verify that you entered the correct email address, or check your spam folder.{paragraphEnd}{paragraphStart}If you need further assistance, {anchorStart}contact technical support{anchorEnd}.{paragraphEnd}": "{paragraphStart}\u05d4\u05d6\u05e0\u05ea {boldStart}{email}{boldEnd}. \u05d0\u05dd \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05d4\u05d6\u05d5 \u05e7\u05e9\u05d5\u05e8\u05d4 \u05dc\u05d7\u05e9\u05d1\u05d5\u05df {platform_name} \u05e9\u05dc\u05da, \u05e0\u05e9\u05dc\u05d7 \u05d4\u05d5\u05d3\u05e2\u05d4 \u05e2\u05dd \u05d4\u05e0\u05d7\u05d9\u05d5\u05ea \u05dc\u05d0\u05d9\u05e4\u05d5\u05e1 \u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05dc\u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05d4\u05d6\u05d5.{paragraphEnd}{paragraphStart}\u05d0\u05dd \u05dc\u05d0 \u05ea\u05e7\u05d1\u05dc \u05d4\u05d5\u05d3\u05e2\u05d4 \u05dc\u05d0\u05d9\u05e4\u05d5\u05e1 \u05e1\u05d9\u05e1\u05de\u05d4, \u05d1\u05d3\u05d5\u05e7 \u05e9\u05d4\u05d6\u05e0\u05ea \u05d0\u05ea \u05d4\u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05e0\u05db\u05d5\u05e0\u05d4 \u05d0\u05d5 \u05d1\u05d3\u05d5\u05e7 \u05d1\u05ea\u05d9\u05e7\u05d9\u05d9\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d4\u05d6\u05d1\u05dc \u05d0\u05e6\u05dc\u05da.{paragraphEnd}{paragraphStart}\u05d0\u05dd \u05d9\u05e9 \u05dc\u05da \u05e6\u05d5\u05e8\u05da \u05d1\u05e2\u05d6\u05e8\u05d4 \u05e0\u05d5\u05e1\u05e4\u05ea, {anchorStart}\u05e4\u05e0\u05d4 \u05dc\u05ea\u05de\u05d9\u05db\u05d4 \u05d4\u05d8\u05db\u05e0\u05d9\u05ea{anchorEnd}.{paragraphEnd}", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u05d0\u05d6\u05d4\u05e8\u05d4:{screen_reader_end} \u05dc\u05d0 \u05e7\u05d9\u05d9\u05de\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05ea\u05d5\u05db\u05df.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u05d0\u05d6\u05d4\u05e8\u05d4:{screen_reader_end} \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05e9\u05e0\u05d1\u05d7\u05e8\u05d4 \u05d1\u05e2\u05d1\u05e8, \u05e0\u05de\u05d7\u05e7\u05d4. \u05d1\u05d7\u05e8 \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df \u05d0\u05d7\u05e8\u05ea.", 
     "{start_strong}{total}{end_strong} words submitted in total.": "{start_strong}{total}{end_strong} \u05e1\u05da \u05db\u05dc \u05d4\u05de\u05d9\u05dc\u05d9\u05dd \u05e9\u05e0\u05e9\u05dc\u05d7\u05d5.", 
diff --git a/lms/static/js/i18n/ko-kr/djangojs.js b/lms/static/js/i18n/ko-kr/djangojs.js
index 11d7850cf8..c1dff0e1d8 100644
--- a/lms/static/js/i18n/ko-kr/djangojs.js
+++ b/lms/static/js/i18n/ko-kr/djangojs.js
@@ -55,13 +55,9 @@
     ], 
     "%s ago": "%s \uc804", 
     "%s from now": "\uc9c0\uae08\uc73c\ub85c \ubd80\ud130 %s \uc774\ud6c4", 
-    "About me": "\uc790\uae30\uc18c\uac1c", 
     "Account Settings": "\uacc4\uc815 \uc124\uc815", 
-    "Account Settings page.": "\uacc4\uc815 \uc124\uc815 \ud398\uc774\uc9c0", 
     "Add Cohort": "\ud559\uc2b5\uc9d1\ub2e8 \ucd94\uac00\ud558\uae30", 
-    "Add Country": "\uad6d\uac00 \ucd94\uac00", 
     "Add a New Cohort": "\uc2e0\uaddc \ud559\uc2b5 \uc9d1\ub2e8 \ucd94\uac00", 
-    "Add language": "\uc5b8\uc5b4 \ucd94\uac00", 
     "Add to Dictionary": "\ubaa8\uc74c\uc5d0 \ucd94\uac00\ud558\uae30", 
     "Adding the selected course to your cart": "\uc7a5\ubc14\uad6c\ub2c8\uc5d0 \uc120\ud0dd\ub41c \uac15\uc88c\ub97c \ucd94\uac00\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4.", 
     "Advanced": "\uace0\uae09", 
@@ -244,7 +240,6 @@
     "Format": "\ud615\uc2dd", 
     "Formats": "\ud615\uc2dd", 
     "Full Name": "\uc2e4\uba85", 
-    "Full Profile": "\uc804\uccb4 \ud504\ub85c\ud544", 
     "Fullscreen": "\uc804\uccb4 \ud654\uba74", 
     "Gender": "\uc131 ", 
     "General": "\uc77c\ubc18", 
@@ -313,7 +308,6 @@
     "Left": "\uc67c\ucabd \uc815\ub82c", 
     "Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd\uc73c\ub85c", 
     "Less": "\uc801\uac8c", 
-    "Limited Profile": "\uc81c\ud55c\uc801 \ud504\ub85c\ud544", 
     "Linking": "\uc5f0\uacb0\ud558\uae30", 
     "Links are generated on demand and expire within 5 minutes due to the sensitive nature of student information.": "\uc694\uccad\uc5d0 \uc758\ud574 \uc0dd\uc131\ub41c \ub9c1\ud06c\ub294 \ud559\uc2b5\uc790 \uc815\ubcf4 \ubcf4\ud638\ub97c \uc704\ud574  5\ubd84 \ub0b4\uc5d0 \uc18c\uba78\ub429\ub2c8\ub2e4.", 
     "List item": "\ubb38\ub2e8\ubc88\ud638", 
@@ -402,8 +396,6 @@
     "Print": "\ud504\ub9b0\ud2b8", 
     "Professional Education": "\uc804\ubb38 \uad50\uc721 \uacfc\uc815", 
     "Professional Education Verified Certificate": "\uc804\ubb38 \uacfc\uc815 \uc774\uc218\uc99d", 
-    "Profile Image": "\ud504\ub85c\ud544 \uc774\ubbf8\uc9c0", 
-    "Profile image for {username}": "{username}\uc758 \ud504\ub85c\ud544 \uc774\ubbf8\uc9c0", 
     "Public": "\uacf5\uac1c", 
     "Reason field should not be left blank.": "\uc774\uc720\ub97c \uc785\ub825\ud558\ub294 \ud544\ub4dc\ub294 \ube44\uc6cc\ub458 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.", 
     "Recent Activity": "\ucd5c\uadfc \ud65c\ub3d9", 
@@ -505,7 +497,6 @@
     "Task Type": "\uc791\uc5c5 \uc720\ud615", 
     "Task inputs": "\uc791\uc5c5 \uc785\ub825", 
     "Teams": "\ud300", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\ub2e4\ub978 \ud559\uc2b5\uc790\ub4e4\uc5d0\uac8c \uac04\ub2e8\ud558\uac8c \ub098\ub97c \uc18c\uac1c\ud569\ub2c8\ub2e4. \uad00\uc2ec\uc0ac, \uc218\uac15 \uc774\uc720 \ub610\ub294 \ud559\uc2b5 \ubaa9\ud45c \uac19\uc740 \uac83\uc744 \uc4f0\uba74 \ub429\ub2c8\ub2e4. ", 
     "Templates": "\ud15c\ud50c\ub9bf", 
     "Text": "Text", 
     "Text color": "\uae00\uc790\uc0c9", 
@@ -606,11 +597,9 @@
     "You don't seem to have a webcam connected.": "\uc6f9\ucea0\uc774 \uc5f0\uacb0\ub418\uc9c0 \uc54a\uc740 \uac83 \uac19\uc2b5\ub2c8\ub2e4.", 
     "You have already reported this annotation.": "\uc774 \uc8fc\uc11d\uc740 \uc774\ubbf8 \uc2e0\uace0\ub418\uc5c8\uc2b5\ub2c8\ub2e4.", 
     "You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ub418\uc9c0 \uc54a\uc740 \ubcc0\uacbd\uc0ac\ud56d\uc774 \uc788\uc2b5\ub2c8\ub2e4. \uacc4\uc18d \ud0d0\uc0c9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\uc804\uccb4 \ud504\ub85c\ud544\uc744 \uacf5\uc720\ud558\ub824\uba74 13\uc138 \uc774\uc0c1\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. 13\uc138 \uc774\uc0c1\uc774\ub77c\uba74,  {account_settings_page_link}\uc5d0\uc11c \ucd9c\uc0dd\uc5f0\ub3c4\ub97c \uc785\ub825\ud558\uc138\uc694.", 
     "You must sign out and sign back in before your language changes take effect.": "\uc5b8\uc5b4\uac00 \ubc14\ub00c\uc5b4\uc84c\ub294\uc9c0 \ud655\uc778\ud558\uae30 \uc704\ud574 \ub85c\uadf8\uc544\uc6c3 \ud558\uace0 \ub2e4\uc2dc \ub85c\uadf8\uc778 \ud558\uc138\uc694.", 
     "You must specify a name": "\uc774\ub984\uc744 \uba85\uc2dc\ud574\uc57c \ud569\ub2c8\ub2e4.", 
     "You must specify a name for the cohort": "\ud559\uc2b5 \uc9d1\ub2e8\uc758 \uc774\ub984\uc744 \uc785\ub825\ud574\uc57c \ud569\ub2c8\ub2e4.", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\uadc0\ud558\uc758 \uc804\uccb4 \ud504\ub85c\ud544\uc744 \uacf5\uc720\ud558\uae30 \uc804\uc5d0 \ucd9c\uc0dd\uc5f0\ub3c4\ub97c \uc785\ub825\ud574\uc57c \ud569\ub2c8\ub2e4. \ucd9c\uc0dd\uc5f0\ub3c4\ub97c \uc9c0\uc815\ud558\ub824\uba74  {account_settings_page_link}\ub85c \uac00\uba74 \ub429\ub2c8\ub2e4.  ", 
     "You've made some changes": "\uc218\uc815 \uc644\ub8cc", 
     "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc800\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc9c1\uc811 \uc561\uc138\uc2a4\ub97c \uc9c0\uc6d0\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.  \ub300\uc2e0 \ub2e8\ucd95\ud0a4 Ctrl+X/C/V \ub97c \uc774\uc6a9\ud558\uc138\uc694.", 
     "Your changes have been saved.": "\ubcc0\uacbd\uc0ac\ud56d\uc774 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.", 
@@ -647,7 +636,6 @@
     "name": "\uc774\ub984", 
     "strong text": "\uac15\ud558\uac8c", 
     "team count": "\ud300 \uc778\uc6d0 \uc218", 
-    "{platform_name} learners can see my:": "{platform_name} \ud559\uc2b5\uc790\uac00 \ub098\uc5d0 \ub300\ud574 \ubcfc \uc218 \uc788\ub294 \uac83\uc740 :", 
     "\u2026": "\u2026"
   };
 
diff --git a/lms/static/js/i18n/pt-br/djangojs.js b/lms/static/js/i18n/pt-br/djangojs.js
index dc72fad620..1b12fd9b2f 100644
--- a/lms/static/js/i18n/pt-br/djangojs.js
+++ b/lms/static/js/i18n/pt-br/djangojs.js
@@ -97,10 +97,8 @@
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 
     "Abbreviation": "Abrevia\u00e7\u00e3o", 
     "About You": "Sobre Voc\u00ea", 
-    "About me": "Sobre mim", 
     "Account Not Activated": "Conta n\u00e3o ativada", 
     "Account Settings": "Configura\u00e7\u00f5es da Conta", 
-    "Account Settings page.": "P\u00e1gina de Configura\u00e7\u00f5es da conta.", 
     "Action": "A\u00e7\u00e3o", 
     "Actions": "A\u00e7\u00f5es", 
     "Activate": "Ativar", 
@@ -110,7 +108,6 @@
     "Add Additional Signatory": "Adicionar signat\u00e1rio adicional", 
     "Add Cohort": "Adicionar Grupo", 
     "Add Component:": "Adicionar componente:", 
-    "Add Country": "Adicionar pa\u00eds", 
     "Add New Component": "Adicionar Novo Componente", 
     "Add URLs for additional versions": "Adicionar URLs para vers\u00f5es adicionais", 
     "Add a Chapter": "Adicionar um Cap\u00edtulo", 
@@ -118,7 +115,6 @@
     "Add a Response": "Adicionar resposta", 
     "Add a comment": "Adicionar coment\u00e1rio", 
     "Add another group": "Adicionar outro grupo", 
-    "Add language": "Adicionar idioma", 
     "Add notes about this learner": "Adicionar coment\u00e1rios sobre esse aluno", 
     "Add to Dictionary": "Adicionar ao Dicion\u00e1rio", 
     "Add to Exception List": "Adicionar a Lista de Exce\u00e7\u00e3o", 
@@ -439,7 +435,6 @@
     "Edit Membership": "Editar assinatura.", 
     "Edit Team": "Editar equipe", 
     "Edit Your Name": "Edite o seu nome", 
-    "Edit the name": "Editar nome", 
     "Edit this certificate?": "Gostaria de editar este certificado?", 
     "Editable": "Edit\u00e1vel", 
     "Editing comment": "Editando coment\u00e1rios", 
@@ -541,7 +536,6 @@
     "Formats": "Formatos", 
     "Frequently Asked Questions": "Perguntas frequentes", 
     "Full Name": "Nome completo", 
-    "Full Profile": "Perfil completo", 
     "Fullscreen": "Tela cheia", 
     "Gender": "Sexo", 
     "General": "Geral", 
@@ -681,7 +675,6 @@
     "Library User": "Usu\u00e1rio da Biblioteca", 
     "License Display": "Exibi\u00e7\u00e3o de Licen\u00e7a", 
     "License Type": "Tipo de licen\u00e7a", 
-    "Limited Profile": "Perfil limitado", 
     "Link types should be unique.": "Tipos de link devem ser exclusivos.", 
     "Linking": "Vinculando", 
     "Links are generated on demand and expire within 5 minutes due to the sensitive nature of student information.": "Os links s\u00e3o gerados a pedido e expiram em 5 minutos devido \u00e0 natureza delicada das informa\u00e7\u00f5es do aluno.", 
@@ -869,8 +862,6 @@
     "Proctored exams are timed and they record video of each learner taking the exam. The videos are then reviewed to ensure that learners follow all examination rules.": "Exames supervisionados s\u00e3o cronometrados e eles gravam um v\u00eddeo de cada aluno fazendo a prova. Os v\u00eddeos s\u00e3o ent\u00e3o revisados para garantir que os alunos sigam as regras do exame.", 
     "Professional Education": "Educa\u00e7\u00e3o Profissional", 
     "Professional Education Verified Certificate": "Certificado verificado de profissional de educa\u00e7\u00e3o", 
-    "Profile Image": "Imagem do perfil", 
-    "Profile image for {username}": "Imagem do perfil de {username}", 
     "Promote another member to Admin to remove your admin rights": "Promova outro membro a Administrador para remover seus direitos de administrador", 
     "Public": "P\u00fablico", 
     "Publish": "Publicar", 
@@ -1072,7 +1063,6 @@
     "Team member profiles": "Perfis dos Membros da Equipe", 
     "Team name cannot have more than 255 characters.": "O nome da equipe n\u00e3o pode exceder 255 caracteres.", 
     "Teams": "Equipes", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "Conte um pouco sobre voc\u00ea para outros estudantes do edX: onde voc\u00ea mora, quais s\u00e3o seus interesses, porqu\u00ea voc\u00ea est\u00e1 fazendo um curso no edX ou o que voc\u00ea espera aprender.", 
     "Templates": "Modelos", 
     "Text": "Texto", 
     "Text color": "Cor do texto", 
@@ -1347,12 +1337,10 @@
     "You haven't added any assets to this course yet.": "Voc\u00ea n\u00e3o adicionou nenhum ativo a este curso ainda", 
     "You haven't added any content to this course yet.": "Voc\u00ea ainda n\u00e3o adicionou nenhum conte\u00fado a este curso.", 
     "You haven't added any textbooks to this course yet.": "Voc\u00ea ainda n\u00e3o adicionou nenhum livro-texto a este curso.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "Voc\u00ea deve ter mais de 13 anos para compartilhar seu perfil completo. Se voc\u00ea tem mais de 13 anos, tenha certeza que voc\u00ea especificou o ano do seu nascimento na {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "Voc\u00ea deve escrever um endere\u00e7o de e-mail v\u00e1lido para adicionar um novo membro do grupo", 
     "You must sign out and sign back in before your language changes take effect.": "Voc\u00ea deve sair e entrar antes que as mudan\u00e7as de idioma tenham efeito.", 
     "You must specify a name": "Voc\u00ea deve especificar um nome ", 
     "You must specify a name for the cohort": "Voc\u00ea deve especificar um nome para o grupo", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "Voc\u00ea deve especificar seu ano de nascimento antes de compartilhar seu perfil completo. Para especificar seu ano de anivers\u00e1rio, v\u00e1 para {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "Voc\u00ea precisa de um computador com uma c\u00e2mera. Ao abrir o aviso, certifique-se de permitir o acesso a sua c\u00e2mera.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "Voc\u00ea precisa de uma carteira de habilita\u00e7\u00e3o, passaporte ou outra identifica\u00e7\u00e3o emitida pelo governo que possua o seu nome e foto.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "Voc\u00ea precisa de um documento com o seu nome e foto. Uma carteira de motorista, passaporte ou outro documento emitido pelo governo s\u00e3o aceit\u00e1veis.", 
@@ -1459,7 +1447,6 @@
     "with %(section_or_subsection)s": "com %(section_or_subsection)s", 
     "{browse_span_start}Browse teams in other topics{span_end} or {search_span_start}search teams{span_end} in this topic. If you still can't find a team to join, {create_span_start}create a new team in this topic{span_end}.": "{browse_span_start}D\u00ea uma olhada nas equipes de outros t\u00f3picos{span_end} ou {search_span_start}busque equipes{span_end} neste t\u00f3pico. Caso voc\u00ea ainda n\u00e3o tenha encontrado nenhuma, {create_span_start}crie uma nova equipe neste t\u00f3pico{span_end}.", 
     "{email} is already on the {container} team. Recheck the email address if you want to add a new member.": "{email} j\u00e1 est\u00e1 no grupo {container}. Verifique novamente o endere\u00e7o de email se voc\u00ea quiser adicionar um novo membro.", 
-    "{platform_name} learners can see my:": "Estudantes do {platform_name} podem visualizar meu:", 
     "\u2026": "\u2026"
   };
 
diff --git a/lms/static/js/i18n/rtl/djangojs.js b/lms/static/js/i18n/rtl/djangojs.js
index 32c362ff95..70203b24ee 100644
--- a/lms/static/js/i18n/rtl/djangojs.js
+++ b/lms/static/js/i18n/rtl/djangojs.js
@@ -1451,6 +1451,7 @@
     "Thanks for returning to verify your ID in: {courseName}": "\u0641\u0627\u0634\u0631\u0646\u0633 \u0628\u062e\u0642 \u0642\u062b\u0641\u0639\u0642\u0631\u0647\u0631\u0644 \u0641\u062e \u062f\u062b\u0642\u0647\u0628\u063a \u063a\u062e\u0639\u0642 \u0647\u064a \u0647\u0631: {courseName}", 
     "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0641\u0627\u062b \u0639\u0642\u0645 \u063a\u062e\u0639 \u062b\u0631\u0641\u062b\u0642\u062b\u064a \u0633\u062b\u062b\u0648\u0633 \u0641\u062e \u0632\u062b \u0634\u0631 \u062b\u0648\u0634\u0647\u0645 \u0634\u064a\u064a\u0642\u062b\u0633\u0633. \u064a\u062e \u063a\u062e\u0639 \u0635\u0634\u0631\u0641 \u0641\u062e \u0634\u064a\u064a \u0641\u0627\u062b \u0642\u062b\u0636\u0639\u0647\u0642\u062b\u064a \u0648\u0634\u0647\u0645\u0641\u062e: \u062d\u0642\u062b\u0628\u0647\u0637?", 
     "The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "\u0641\u0627\u062b \u0639\u0642\u0645 \u063a\u062e\u0639 \u062b\u0631\u0641\u062b\u0642\u062b\u064a \u0633\u062b\u062b\u0648\u0633 \u0641\u062e \u0632\u062b \u0634\u0631 \u062b\u0637\u0641\u062b\u0642\u0631\u0634\u0645 \u0645\u0647\u0631\u0646. \u064a\u062e \u063a\u062e\u0639 \u0635\u0634\u0631\u0641 \u0641\u062e \u0634\u064a\u064a \u0641\u0627\u062b \u0642\u062b\u0636\u0639\u0647\u0642\u062b\u064a \u0627\u0641\u0641\u062d:// \u062d\u0642\u062b\u0628\u0647\u0637?", 
+    "The certificate available date must be later than the enrollment start date.": "\u0641\u0627\u062b \u0630\u062b\u0642\u0641\u0647\u0628\u0647\u0630\u0634\u0641\u062b \u0634\u062f\u0634\u0647\u0645\u0634\u0632\u0645\u062b \u064a\u0634\u0641\u062b \u0648\u0639\u0633\u0641 \u0632\u062b \u0645\u0634\u0641\u062b\u0642 \u0641\u0627\u0634\u0631 \u0641\u0627\u062b \u062b\u0631\u0642\u062e\u0645\u0645\u0648\u062b\u0631\u0641 \u0633\u0641\u0634\u0642\u0641 \u064a\u0634\u0641\u062b.", 
     "The certificate for this learner has been re-validated and the system is re-running the grade for this learner.": "\u0641\u0627\u062b \u0630\u062b\u0642\u0641\u0647\u0628\u0647\u0630\u0634\u0641\u062b \u0628\u062e\u0642 \u0641\u0627\u0647\u0633 \u0645\u062b\u0634\u0642\u0631\u062b\u0642 \u0627\u0634\u0633 \u0632\u062b\u062b\u0631 \u0642\u062b-\u062f\u0634\u0645\u0647\u064a\u0634\u0641\u062b\u064a \u0634\u0631\u064a \u0641\u0627\u062b \u0633\u063a\u0633\u0641\u062b\u0648 \u0647\u0633 \u0642\u062b-\u0642\u0639\u0631\u0631\u0647\u0631\u0644 \u0641\u0627\u062b \u0644\u0642\u0634\u064a\u062b \u0628\u062e\u0642 \u0641\u0627\u0647\u0633 \u0645\u062b\u0634\u0642\u0631\u062b\u0642.", 
     "The cohort cannot be added": "\u0641\u0627\u062b \u0630\u062e\u0627\u062e\u0642\u0641 \u0630\u0634\u0631\u0631\u062e\u0641 \u0632\u062b \u0634\u064a\u064a\u062b\u064a", 
     "The cohort cannot be saved": "\u0641\u0627\u062b \u0630\u062e\u0627\u062e\u0642\u0641 \u0630\u0634\u0631\u0631\u062e\u0641 \u0632\u062b \u0633\u0634\u062f\u062b\u064a", 
@@ -1586,6 +1587,7 @@
     "This team does not have any members.": "\u0641\u0627\u0647\u0633 \u0641\u062b\u0634\u0648 \u064a\u062e\u062b\u0633 \u0631\u062e\u0641 \u0627\u0634\u062f\u062b \u0634\u0631\u063a \u0648\u062b\u0648\u0632\u062b\u0642\u0633.", 
     "This team is full.": "\u0641\u0627\u0647\u0633 \u0641\u062b\u0634\u0648 \u0647\u0633 \u0628\u0639\u0645\u0645.", 
     "This thread is closed.": "\u0641\u0627\u0647\u0633 \u0641\u0627\u0642\u062b\u0634\u064a \u0647\u0633 \u0630\u0645\u062e\u0633\u062b\u064a.", 
+    "This unit has validation issues.": "\u0641\u0627\u0647\u0633 \u0639\u0631\u0647\u0641 \u0627\u0634\u0633 \u062f\u0634\u0645\u0647\u064a\u0634\u0641\u0647\u062e\u0631 \u0647\u0633\u0633\u0639\u062b\u0633.", 
     "This vote could not be processed. Refresh the page and try again.": "\u0641\u0627\u0647\u0633 \u062f\u062e\u0641\u062b \u0630\u062e\u0639\u0645\u064a \u0631\u062e\u0641 \u0632\u062b \u062d\u0642\u062e\u0630\u062b\u0633\u0633\u062b\u064a. \u0642\u062b\u0628\u0642\u062b\u0633\u0627 \u0641\u0627\u062b \u062d\u0634\u0644\u062b \u0634\u0631\u064a \u0641\u0642\u063a \u0634\u0644\u0634\u0647\u0631.", 
     "This {parentCategory} has no {childCategory}": "\u0641\u0627\u0647\u0633 {parentCategory} \u0627\u0634\u0633 \u0631\u062e {childCategory}", 
     "Thumbnail": "\u0641\u0627\u0639\u0648\u0632\u0631\u0634\u0647\u0645", 
diff --git a/lms/static/js/i18n/ru/djangojs.js b/lms/static/js/i18n/ru/djangojs.js
index 7510f75b44..b5705051ef 100644
--- a/lms/static/js/i18n/ru/djangojs.js
+++ b/lms/static/js/i18n/ru/djangojs.js
@@ -131,15 +131,10 @@
     "A valid email address is required": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441", 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ": "\u0410\u0411\u0412\u0413\u0414\u0415\u0416\u0417\u0418\u041a\u041b\u041c\u041d\u041e\u041f\u0420\u0421\u0422\u0423\u0424\u0425\u0426\u0427\u0428\u0429\u042d\u042e\u042f", 
     "Abbreviation": "\u0410\u0431\u0431\u0440\u0435\u0432\u0438\u0430\u0442\u0443\u0440\u0430", 
-    "About Me": "\u041e\u0431\u043e \u043c\u043d\u0435", 
     "About You": "\u041e \u0432\u0430\u0441", 
-    "About me": "\u041e \u0441\u0435\u0431\u0435", 
-    "Accomplishments": "\u0414\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f", 
-    "Accomplishments Pagination": "\u041f\u043e\u0441\u0442\u0440\u0430\u043d\u0438\u0447\u043d\u043e\u0435 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u0439", 
     "Account Information": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e\u0431 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438", 
     "Account Not Activated": "\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u043d\u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430", 
     "Account Settings": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438", 
-    "Account Settings page.": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438.", 
     "Action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435", 
     "Action required: Enter a valid date.": "\u0422\u0440\u0435\u0431\u0443\u0435\u043c\u043e\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435: \u0432\u0432\u0435\u0441\u0442\u0438 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0443\u044e \u0434\u0430\u0442\u0443", 
     "Actions": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f", 
@@ -151,7 +146,6 @@
     "Add Additional Signatory": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043b\u044f, \u043f\u043e\u0434\u043f\u0438\u0441\u0430\u0432\u0448\u0435\u0433\u043e \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442", 
     "Add Cohort": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443", 
     "Add Component:": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442:", 
-    "Add Country": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0443", 
     "Add New Component": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442", 
     "Add URLs for additional versions": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0438 \u043d\u0430 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438", 
     "Add a Chapter": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u043b\u0430\u0432\u0443", 
@@ -161,7 +155,6 @@
     "Add a learning outcome here": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u044f \u0437\u0434\u0435\u0441\u044c", 
     "Add a response:": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043e\u0442\u0432\u0435\u0442:", 
     "Add another group": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0440\u0443\u0433\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443", 
-    "Add language": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u044f\u0437\u044b\u043a", 
     "Add notes about this learner": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0437\u0430\u043c\u0435\u0442\u043a\u0438 \u043e\u0431 \u044d\u0442\u043e\u043c \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0435", 
     "Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043b\u043e\u0432\u0430\u0440\u044c", 
     "Add to Exception List": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439", 
@@ -307,7 +300,6 @@
     "Change Manually": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0440\u0443\u0447\u043d\u0443\u044e", 
     "Change My Email Address": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0430\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b", 
     "Change image": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435", 
-    "Change the settings for {display_name}": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0434\u043b\u044f {display_name}", 
     "Chapter Asset": "\u0410\u043a\u0442\u0438\u0432 \u0433\u043b\u0430\u0432\u044b", 
     "Chapter Name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0433\u043b\u0430\u0432\u044b", 
     "Chapter information": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0433\u043b\u0430\u0432\u0435", 
@@ -522,7 +514,6 @@
     "Edit Membership": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u043e\u0441\u0442\u0430\u0432", 
     "Edit Team": "\u0412\u043d\u0435\u0441\u0442\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432 \u043a\u043e\u043c\u0430\u043d\u0434\u0443", 
     "Edit Your Name": "\u041e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u043c\u044f", 
-    "Edit the name": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435", 
     "Edit this certificate?": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442?", 
     "Editable": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0443\u0435\u043c\u043e", 
     "Editing comment": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u044f", 
@@ -639,7 +630,6 @@
     "Free text notes": "\u0417\u0430\u043c\u0435\u0442\u043a\u0438", 
     "Frequently Asked Questions": "\u0427\u0430\u0441\u0442\u043e \u0437\u0430\u0434\u0430\u0432\u0430\u0435\u043c\u044b\u0435 \u0432\u043e\u043f\u0440\u043e\u0441\u044b", 
     "Full Name": "\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f", 
-    "Full Profile": "\u041f\u043e\u043b\u043d\u044b\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c", 
     "Fullscreen": "\u0412\u043e \u0432\u0435\u0441\u044c \u044d\u043a\u0440\u0430\u043d", 
     "Fully Supported": "\u041f\u043e\u043b\u043d\u043e\u0441\u0442\u044c\u044e \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f", 
     "Gender": "\u041f\u043e\u043b", 
@@ -799,7 +789,6 @@
     "License Display": "\u041f\u043e\u043a\u0430\u0437 \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438", 
     "License Type": "\u0422\u0438\u043f \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438", 
     "Limit Access": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f", 
-    "Limited Profile": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u044b\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c", 
     "Link Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438", 
     "Link Your Account": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0441\u0432\u043e\u044e \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c", 
     "Link types should be unique.": "\u0421\u0441\u044b\u043b\u043a\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0439.", 
@@ -1029,9 +1018,6 @@
     "Professional Certificate for {courseName}": "\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 \u043e \u043f\u043e\u0432\u044b\u0448\u0435\u043d\u0438\u0438 \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 {courseName}", 
     "Professional Education": "\u041f\u0440\u043e\u0444\u0435\u0441\u0441\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0435 \u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435", 
     "Professional Education Verified Certificate": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 \u043e \u043f\u043e\u0432\u044b\u0448\u0435\u043d\u0438\u0438 \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438", 
-    "Profile": "\u041f\u0440\u043e\u0444\u0438\u043b\u044c", 
-    "Profile Image": "\u0424\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u044f", 
-    "Profile image for {username}": "\u0424\u043e\u0442\u043e {username}", 
     "Promote another member to Admin to remove your admin rights": "\u041f\u0435\u0440\u0435\u0434\u0430\u0439\u0442\u0435 \u043f\u0440\u0430\u0432\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u0434\u0440\u0443\u0433\u043e\u043c\u0443 \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0443, \u0447\u0442\u043e\u0431\u044b \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0435 \u043f\u0440\u0430\u0432\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430", 
     "Provisional": "\u0427\u0430\u0441\u0442\u0438\u0447\u043d\u043e \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f", 
     "Provisionally Supported": "\u0427\u0430\u0441\u0442\u0438\u0447\u043d\u043e \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f", 
@@ -1271,7 +1257,6 @@
     "Team name cannot have more than 255 characters.": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u0431\u043e\u043b\u0435\u0435 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432.", 
     "Teams": "\u041a\u043e\u043c\u0430\u043d\u0434\u044b", 
     "Teams Pagination": "\u041a\u043e\u043c\u0430\u043d\u0434\u043d\u0430\u044f \u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u0420\u0430\u0441\u0441\u043a\u0430\u0436\u0438\u0442\u0435 \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u044f\u043c \u043d\u0435\u043c\u043d\u043e\u0433\u043e \u043e \u0441\u0435\u0431\u0435: \u0433\u0434\u0435 \u0432\u044b \u0436\u0438\u0432\u0451\u0442\u0435, \u0447\u0435\u043c \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u0443\u0435\u0442\u0435\u0441\u044c, \u0434\u043b\u044f \u0447\u0435\u0433\u043e \u0432\u044b \u043f\u0440\u043e\u0445\u043e\u0434\u0438\u0442\u0435 \u043a\u0443\u0440\u0441\u044b \u0438 \u0447\u0435\u043c\u0443 \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u043d\u0430\u0443\u0447\u0438\u0442\u044c\u0441\u044f.", 
     "Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b", 
     "Text": "\u0422\u0435\u043a\u0441\u0442", 
     "Text color": "\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430", 
@@ -1498,12 +1483,6 @@
     "Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.": "\u041f\u043e\u043b\u044c\u0437\u0443\u044f\u0441\u044c \u0432\u0435\u0431-\u043a\u0430\u043c\u0435\u0440\u043e\u0439, \u0441\u0434\u0435\u043b\u0430\u0439\u0442\u0435 \u0441\u043d\u0438\u043c\u043e\u043a \u0441\u0432\u043e\u0435\u0433\u043e \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u044f \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u0438.  \u041c\u044b \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u0438\u043c \u044d\u0442\u043e\u0442 \u0441\u043d\u0438\u043c\u043e\u043a \u0441\u043e \u0441\u043d\u0438\u043c\u043a\u043e\u043c \u0432\u0430\u0448\u0435\u0433\u043e \u043b\u0438\u0446\u0430 \u0438 \u0438\u043c\u0435\u043d\u0435\u043c \u0432 \u0432\u0430\u0448\u0435\u0439 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438.", 
     "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID.": "\u041f\u043e\u043b\u044c\u0437\u0443\u044f\u0441\u044c \u0432\u0435\u0431-\u043a\u0430\u043c\u0435\u0440\u043e\u0439, \u0441\u0434\u0435\u043b\u0430\u0439\u0442\u0435 \u0441\u043d\u0438\u043c\u043e\u043a \u0441\u0432\u043e\u0435\u0433\u043e \u043b\u0438\u0446\u0430.  \u041c\u044b \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u0438\u043c \u044d\u0442\u043e\u0442 \u0441\u043d\u0438\u043c\u043e\u043a \u0441 \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439 \u0432 \u0432\u0430\u0448\u0435\u043c \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u0438 \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u0438.", 
     "Used": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u043e", 
-    "Used in {count} unit": [
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0435", 
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0430\u0445", 
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0430\u0445", 
-      "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432 {count} \u0431\u043b\u043e\u043a\u0430\u0445"
-    ], 
     "User": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c", 
     "User Email": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f", 
     "Username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f", 
@@ -1617,12 +1596,10 @@
     "You haven't added any assets to this course yet.": "\u0412\u044b \u043d\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043b\u0438 \u043d\u0438\u043a\u0430\u043a\u0438\u0445 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u043e\u0432 \u043a \u044d\u0442\u043e\u043c\u0443 \u043a\u0443\u0440\u0441\u0443.", 
     "You haven't added any content to this course yet.": "\u0412\u044b \u0435\u0449\u0451 \u043d\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043b\u0438 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b \u043a\u0443\u0440\u0441\u0430.", 
     "You haven't added any textbooks to this course yet.": "\u0412\u044b \u0435\u0449\u0451 \u043d\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043b\u0438 \u043d\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u0443\u0447\u0435\u0431\u043d\u0438\u043a\u0430 \u043a \u044d\u0442\u043e\u043c\u0443 \u043a\u0443\u0440\u0441\u0443.", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "\u0414\u043b\u044f \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u0432\u0430\u043c \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435 13 \u043b\u0435\u0442. \u0415\u0441\u043b\u0438 \u0432\u044b \u0441\u0442\u0430\u0440\u0448\u0435 13 \u043b\u0435\u0442, \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044c\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0432\u044b \u0443\u043a\u0430\u0437\u0430\u043b\u0438 \u0433\u043e\u0434 \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f \u043d\u0430 {account_settings_page_link}", 
     "You must enter a valid email address in order to add a new team member": "\u0427\u0442\u043e\u0431\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u043e\u0433\u043e \u0447\u043b\u0435\u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u044b, \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0432\u0432\u0435\u0441\u0442\u0438 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441", 
     "You must sign out and sign back in before your language changes take effect.": "\u0427\u0442\u043e\u0431\u044b \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u044f\u0437\u044b\u043a\u0430 \u0432\u0441\u0442\u0443\u043f\u0438\u043b\u043e \u0432 \u0441\u0438\u043b\u0443, \u0432\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u0439\u0442\u0438 \u0438 \u0441\u043d\u043e\u0432\u0430 \u0432\u043e\u0439\u0442\u0438 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.", 
     "You must specify a name": "\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043c\u044f", 
     "You must specify a name for the cohort": "\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u043d\u0430\u0437\u0432\u0430\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u0414\u043b\u044f \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u0432\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0433\u043e\u0434 \u0432\u0430\u0448\u0435\u0433\u043e \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f \u043d\u0430 {account_settings_page_link}", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u0412\u0430\u043c \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440 \u0441 \u0432\u0435\u0431-\u043a\u0430\u043c\u0435\u0440\u043e\u0439. \u041a\u043e\u0433\u0434\u0430 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0438\u0442 \u0441\u0434\u0435\u043b\u0430\u0442\u044c \u0444\u043e\u0442\u043e, \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0432\u044b \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u043b\u0438 \u0435\u043c\u0443 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043a\u0430\u043c\u0435\u0440\u0435.", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u0412\u0430\u043c \u0442\u0440\u0435\u0431\u0443\u044e\u0442\u0441\u044f \u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u043f\u0440\u0430\u0432\u0430, \u043f\u0430\u0441\u043f\u043e\u0440\u0442 \u0438\u043b\u0438 \u0438\u043d\u043e\u0439 \u0433\u043e\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0435\u0441\u0442\u044c \u0432\u0430\u0448\u0435 \u0438\u043c\u044f \u0438 \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u044f.", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u0412\u0430\u043c \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u0435 \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u0438 \u0441 \u0432\u0430\u0448\u0438\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u0438 \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439.  \u041f\u043e\u0434\u043e\u0439\u0434\u0451\u0442 \u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435 \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438\u0435, \u043f\u0430\u0441\u043f\u043e\u0440\u0442 \u0438\u043b\u0438 \u0434\u0440\u0443\u0433\u043e\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 \u0433\u043e\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e \u043e\u0431\u0440\u0430\u0437\u0446\u0430.", 
@@ -1766,7 +1743,6 @@
       "{numVotes} \u0433\u043e\u043b\u043e\u0441\u043e\u0432"
     ], 
     "{organization}\\'s logo": "\u043b\u043e\u0433\u043e\u0442\u0438\u043f {organization}", 
-    "{platform_name} learners can see my:": "\u0421\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0438 {platform_name} \u0432\u0438\u0434\u044f\u0442 \u043c\u043e\u0439:", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435:{screen_reader_end} \u043d\u0435\u0442 \u0433\u0440\u0443\u043f\u043f \u043f\u043e \u0438\u0437\u0443\u0447\u0430\u0435\u043c\u043e\u043c\u0443 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u0443.", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435:{screen_reader_end} \u0440\u0430\u043d\u0435\u0435 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u0430\u044f \u0433\u0440\u0443\u043f\u043f\u0430 \u043f\u043e \u0438\u0437\u0443\u0447\u0430\u0435\u043c\u043e\u043c\u0443 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u0443 \u0443\u0434\u0430\u043b\u0435\u043d\u0430. \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443.", 
     "{totalItems} total": "{totalItems} \u0438\u0442\u043e\u0433", 
diff --git a/lms/static/js/i18n/zh-cn/djangojs.js b/lms/static/js/i18n/zh-cn/djangojs.js
index 587528e2b3..5eaa9b66ff 100644
--- a/lms/static/js/i18n/zh-cn/djangojs.js
+++ b/lms/static/js/i18n/zh-cn/djangojs.js
@@ -83,26 +83,19 @@
     "A name that identifies your team (maximum 255 characters).": "\u56e2\u961f\u540d\u79f0 (\u4e0d\u957f\u4e8e255\u4e2a\u5b57\u7b26)", 
     "A short description of the team to help other learners understand the goals or direction of the team (maximum 300 characters).": "\u7b80\u77ed\u7684\u56e2\u961f\u63cf\u8ff0\uff0c\u4ee5\u5e2e\u52a9\u5176\u4ed6\u5b66\u4e60\u8005\u4e86\u89e3\u6b64\u56e2\u961f\u7684\u76ee\u6807\u4e0e\u65b9\u5411 (\u6700\u5927\u4e3a300\u4e2a\u5b57\u7b26\u957f\u5ea6)", 
     "A valid email address is required": "\u9700\u8981\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740", 
-    "About Me": "\u4e2a\u4eba\u8d44\u6599", 
     "About You": "\u5173\u4e8e\u60a8", 
-    "About me": "\u4e2a\u4eba\u7b80\u4ecb", 
-    "Accomplishments": "\u6210\u7ee9", 
-    "Accomplishments Pagination": "\u6210\u7ee9\u5206\u9875", 
     "Account Information": "\u5e10\u6237\u4fe1\u606f", 
     "Account Not Activated": "\u8d26\u6237\u672a\u6fc0\u6d3b", 
     "Account Settings": "\u8d26\u6237\u8bbe\u7f6e", 
-    "Account Settings page.": "\u8d26\u6237\u8bbe\u7f6e\u9875\u9762\u3002", 
     "Action": "\u64cd\u4f5c", 
     "Actions": "\u64cd\u4f5c", 
     "Activate Your Account": "\u6fc0\u6d3b\u4f60\u7684\u8d26\u6237", 
     "Activating a link in this group will skip to the corresponding point in the video.": "\u6fc0\u6d3b\u672c\u7ec4\u4e2d\u7684\u94fe\u63a5\u5c06\u8df3\u8f6c\u81f3\u89c6\u9891\u4e2d\u76f8\u5e94\u7684\u5730\u65b9\u3002", 
     "Add Cohort": "\u6dfb\u52a0\u7fa4\u7ec4", 
-    "Add Country": "\u6dfb\u52a0\u56fd\u5bb6", 
     "Add a New Cohort": "\u6dfb\u52a0\u65b0\u7fa4\u7ec4", 
     "Add a Response": "\u6dfb\u52a0\u56de\u590d", 
     "Add a comment": "\u6dfb\u52a0\u8bc4\u8bba", 
     "Add a response:": "\u6dfb\u52a0\u4e00\u6761\u56de\u590d\uff1a", 
-    "Add language": "\u6dfb\u52a0\u8bed\u8a00", 
     "Add notes about this learner": "\u6dfb\u52a0\u5173\u4e8e\u6b64\u5b66\u5458\u7684\u5907\u6ce8", 
     "Add to Dictionary": "\u52a0\u5165\u5230\u5b57\u5178", 
     "Add to Exception List": "\u6dfb\u52a0\u5230\u7279\u6b8a\u5904\u7406\u5217\u8868", 
@@ -469,7 +462,6 @@
     "Formats": "\u683c\u5f0f", 
     "Frequently Asked Questions": "\u5e38\u89c1\u95ee\u9898", 
     "Full Name": "\u5168\u540d", 
-    "Full Profile": "\u5168\u90e8\u8d44\u6599", 
     "Fullscreen": "\u5168\u5c4f", 
     "Gender": "\u6027\u522b", 
     "General": "\u4e00\u822c", 
@@ -592,7 +584,6 @@
     "Legal name": "\u6cd5\u5b9a\u59d3\u540d", 
     "Less": "\u6536\u8d77", 
     "Library User": "\u77e5\u8bc6\u5e93\u7528\u6237", 
-    "Limited Profile": "\u90e8\u5206\u8d44\u6599", 
     "Link Description": "\u94fe\u63a5\u7684\u63cf\u8ff0", 
     "Link Your Account": "\u5173\u8054\u60a8\u7684\u8d26\u6237", 
     "Link types should be unique.": "\u94fe\u63a5\u7c7b\u578b\u5e94\u5f53\u552f\u4e00\u3002", 
@@ -760,9 +751,6 @@
     "Professional Certificate for {courseName}": "{courseName} \u7684\u4e13\u4e1a\u8bc1\u4e66", 
     "Professional Education": "\u4e13\u4e1a\u6559\u80b2", 
     "Professional Education Verified Certificate": "\u4e13\u4e1a\u6559\u80b2\u8ba4\u8bc1\u8bc1\u4e66", 
-    "Profile": "\u7528\u6237\u8d44\u6599", 
-    "Profile Image": "\u8d44\u6599\u7167\u7247", 
-    "Profile image for {username}": "{username} \u7684\u5934\u50cf", 
     "Public": "\u516c\u5f00", 
     "Publish": "\u53d1\u5e03", 
     "Publishing": "\u6b63\u5728\u53d1\u5e03", 
@@ -948,7 +936,6 @@
     "Team name cannot have more than 255 characters.": "\u56e2\u961f\u540d\u79f0\u4e0d\u80fd\u8d85\u8fc7 255 \u4e2a\u5b57\u7b26", 
     "Teams": "\u56e2\u961f", 
     "Teams Pagination": "\u56e2\u961f\u5206\u9875", 
-    "Tell other learners a little about yourself: where you live, what your interests are, why you're taking courses, or what you hope to learn.": "\u5411\u5176\u4ed6\u7528\u6237\u7b80\u5355\u4ecb\u7ecd\u4e0b\u4f60\u81ea\u5df1\uff1a\u5982\u5c45\u4f4f\u5730\u3001\u5174\u8da3\u7231\u597d\u3001\u4e3a\u4ec0\u4e48\u9009\u62e9\u8fd9\u4e9b\u8bfe\u7a0b\uff0c\u53ca\u4f60\u5e0c\u671b\u5b66\u4e60\u54ea\u65b9\u9762\u7684\u77e5\u8bc6", 
     "Templates": "\u6a21\u677f", 
     "Text": "\u6587\u672c", 
     "Text color": "\u6587\u672c\u989c\u8272", 
@@ -1190,12 +1177,10 @@
     "You have not created any group configurations yet.": "\u60a8\u8fd8\u6ca1\u6709\u521b\u5efa\u4efb\u4f55\u7ec4\u914d\u7f6e\u3002", 
     "You have unsaved changes are you sure you want to navigate away?": "\u6709\u672a\u4fdd\u5b58\u7684\u66f4\u6539\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\u5417\uff1f", 
     "You have unsaved changes. Do you really want to leave this page?": "\u60a8\u5c1a\u6709\u672a\u4fdd\u5b58\u7684\u4fee\u6539\uff0c\u786e\u5b9a\u8981\u79bb\u6b64\u9875\u9762\u5417\uff1f", 
-    "You must be over 13 to share a full profile. If you are over 13, make sure that you have specified a birth year on the {account_settings_page_link}": "13\u5c81\u4ee5\u4e0a\u7684\u7528\u6237\u624d\u80fd\u5206\u4eab\u5b8c\u6574\u8d44\u6599\u3002\u5982\u679c\u60a8\u572813\u5c81\u4ee5\u4e0a\uff0c\u8bf7\u786e\u8ba4\u5df2\u5728 {account_settings_page_link} \u9875\u9762\u4e2d\u586b\u5199\u4e86\u51fa\u751f\u5e74\u4efd\u3002", 
     "You must enter a valid email address in order to add a new team member": "\u60a8\u5fc5\u987b\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u4ee5\u4fbf\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u56e2\u961f\u6210\u5458", 
     "You must sign out and sign back in before your language changes take effect.": "\u8bed\u8a00\u8bbe\u7f6e\u5c06\u5728\u60a8\u91cd\u65b0\u767b\u5f55\u540e\u751f\u6548", 
     "You must specify a name": "\u60a8\u5fc5\u987b\u6307\u5b9a\u4e00\u4e2a\u540d\u79f0", 
     "You must specify a name for the cohort": "\u60a8\u5fc5\u987b\u4e3a\u8be5\u7fa4\u7ec4\u547d\u540d\u3002", 
-    "You must specify your birth year before you can share your full profile. To specify your birth year, go to the {account_settings_page_link}": "\u60a8\u5fc5\u987b\u586b\u5199\u51fa\u751f\u5e74\u4efd\u624d\u80fd\u5206\u4eab\u5b8c\u6574\u8d44\u6599\u3002\u70b9\u51fb {account_settings_page_link} \u586b\u5199", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u60a8\u9700\u8981\u4e00\u4e2a\u5177\u6709\u6444\u50cf\u5934\u7684\u7535\u8111\u3002\u5f53\u60a8\u6536\u5230\u6d4f\u89c8\u5668\u5f39\u7a97\u65f6\uff0c\u786e\u4fdd\u5b83\u6709\u6743\u9650\u4f7f\u7528\u6444\u50cf\u5934\u3002", 
     "You need a driver's license, passport, or other government-issued ID that has your name and photo.": "\u60a8\u9700\u8981\u9a7e\u7167\u3001\u62a4\u7167\u6216\u8005\u5176\u4ed6\u7531\u653f\u5e9c\u7b7e\u53d1\u7684\u5e26\u6709\u60a8\u59d3\u540d\u548c\u7167\u7247\u7684\u8eab\u4efd\u8bc1\u4ef6\u3002", 
     "You need an ID with your name and photo. A driver's license, passport, or other government-issued IDs are all acceptable.": "\u60a8\u9700\u8981\u4e00\u4efd\u5e26\u6709\u60a8\u59d3\u540d\u548c\u7167\u7247\u7684\u8eab\u4efd\u8bc1\u4ef6\uff0c\u6211\u4eec\u53ef\u4ee5\u63a5\u53d7\u9a7e\u7167\u3001\u62a4\u7167\u4ee5\u53ca\u5176\u4ed6\u7531\u653f\u5e9c\u7b7e\u53d1\u7684\u8eab\u4efd\u8bc1\u4ef6\u3002", 
@@ -1291,7 +1276,6 @@
     "{browse_span_start}Browse teams in other topics{span_end} or {search_span_start}search teams{span_end} in this topic. If you still can't find a team to join, {create_span_start}create a new team in this topic{span_end}.": "{browse_span_start} \u7528\u5176\u4ed6\u6807\u9898\u6d4f\u89c8\u56e2\u961f {span_end} \u6216 {search_span_start} \u641c\u7d22\u56e2\u961f{span_end} \u65bc\u6b64\u6807\u9898\u3002 \u5982\u679c\u4f60\u4ecd\u7136\u65e0\u6cd5\u627e\u5230\u56e2\u961f\u6765\u52a0\u5165\uff0c {create_span_start} \u5728\u6b64\u6807\u9898\u65b0\u521b\u4e00\u4e2a\u56e2\u961f{span_end}\u3002", 
     "{email} is already on the {container} team. Recheck the email address if you want to add a new member.": "{email}\u5df2\u5728{container}\u56e2\u961f\u4e2d\u3002\u5982\u679c\u60a8\u60f3\u6dfb\u52a0\u65b0\u6210\u5458\uff0c\u8bf7\u518d\u6b21\u68c0\u67e5\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002", 
     "{organization}\\'s logo": "{organization}\\'s \u7684\u6807\u8bc6", 
-    "{platform_name} learners can see my:": "\u5bf9{platform_name}\u7528\u6237\u53ef\u89c1\uff1a", 
     "{screen_reader_start}Warning:{screen_reader_end} No content groups exist.": "{screen_reader_start}\u8b66\u544a\uff1a{screen_reader_end}\u4e0d\u5b58\u5728\u5185\u5bb9\u7ec4\u3002", 
     "{screen_reader_start}Warning:{screen_reader_end} The previously selected content group was deleted. Select another content group.": "{screen_reader_start}\u8b66\u544a\uff1a{screen_reader_end}\u4e4b\u524d\u9009\u62e9\u7684\u5185\u5bb9\u7ec4\u5df2\u88ab\u5220\u9664\u3002\u8bf7\u9009\u62e9\u53e6\u4e00\u4e2a\u5185\u5bb9\u7ec4\u3002", 
     "\u2026": "\u2026"
diff --git a/lms/static/js/instructor_dashboard/data_download.js b/lms/static/js/instructor_dashboard/data_download.js
index bd4e62b4d6..32636a76a4 100644
--- a/lms/static/js/instructor_dashboard/data_download.js
+++ b/lms/static/js/instructor_dashboard/data_download.js
@@ -122,16 +122,18 @@
             });
             this.$proctored_exam_csv_btn.click(function() {
                 var url = dataDownloadObj.$proctored_exam_csv_btn.data('endpoint');
+                var errorMessage = gettext('Error generating proctored exam results. Please try again.');
                 return $.ajax({
                     type: 'POST',
                     dataType: 'json',
                     url: url,
-                    error: function() {
+                    error: function(error) {
+                        if (error.responseText) {
+                            errorMessage = JSON.parse(error.responseText);
+                        }
                         dataDownloadObj.clear_display();
-                        dataDownloadObj.$reports_request_response_error.text(
-                            gettext('Error generating proctored exam results. Please try again.')
-                        );
-                        return $('.msg-error').css({
+                        dataDownloadObj.$reports_request_response_error.text(errorMessage);
+                        return dataDownloadObj.$reports_request_response_error.css({
                             display: 'block'
                         });
                     },
@@ -146,16 +148,18 @@
             });
             this.$survey_results_csv_btn.click(function() {
                 var url = dataDownloadObj.$survey_results_csv_btn.data('endpoint');
+                var errorMessage = gettext('Error generating survey results. Please try again.');
                 return $.ajax({
                     type: 'POST',
                     dataType: 'json',
                     url: url,
-                    error: function() {
+                    error: function(error) {
+                        if (error.responseText) {
+                            errorMessage = JSON.parse(error.responseText);
+                        }
                         dataDownloadObj.clear_display();
-                        dataDownloadObj.$reports_request_response_error.text(
-                            gettext('Error generating survey results. Please try again.')
-                        );
-                        return $('.msg-error').css({
+                        dataDownloadObj.$reports_request_response_error.text(errorMessage);
+                        return dataDownloadObj.$reports_request_response_error.css({
                             display: 'block'
                         });
                     },
@@ -170,16 +174,18 @@
             });
             this.$list_studs_csv_btn.click(function() {
                 var url = dataDownloadObj.$list_studs_csv_btn.data('endpoint') + '/csv';
+                var errorMessage = gettext('Error generating student profile information. Please try again.');
                 dataDownloadObj.clear_display();
                 return $.ajax({
                     type: 'POST',
                     dataType: 'json',
                     url: url,
-                    error: function() {
-                        dataDownloadObj.$reports_request_response_error.text(
-                            gettext('Error generating student profile information. Please try again.')
-                        );
-                        return $('.msg-error').css({
+                    error: function(error) {
+                        if (error.responseText) {
+                            errorMessage = JSON.parse(error.responseText);
+                        }
+                        dataDownloadObj.$reports_request_response_error.text(errorMessage);
+                        return dataDownloadObj.$reports_request_response_error.css({
                             display: 'block'
                         });
                     },
@@ -201,9 +207,13 @@
                     url: url,
                     error: function() {
                         dataDownloadObj.clear_display();
-                        return dataDownloadObj.$download_request_response_error.text(
+                        dataDownloadObj.$download_request_response_error.text(
                             gettext('Error getting student list.')
                         );
+                        return dataDownloadObj.$download_request_response_error.css({
+                            display: 'block'
+                        });
+
                     },
                     success: function(data) {
                         var $tablePlaceholder, columns, feature, gridData, options;
@@ -251,7 +261,7 @@
                         dataDownloadObj.$reports_request_response_error.text(
                             JSON.parse(error.responseText)
                         );
-                        return $('.msg-error').css({
+                        return dataDownloadObj.$reports_request_response_error.css({
                             display: 'block'
                         });
                     },
@@ -265,16 +275,18 @@
             });
             this.$list_may_enroll_csv_btn.click(function() {
                 var url = dataDownloadObj.$list_may_enroll_csv_btn.data('endpoint');
+                var errorMessage = gettext('Error generating list of students who may enroll. Please try again.');
                 dataDownloadObj.clear_display();
                 return $.ajax({
                     type: 'POST',
                     dataType: 'json',
                     url: url,
-                    error: function() {
-                        dataDownloadObj.$reports_request_response_error.text(
-                            gettext('Error generating list of students who may enroll. Please try again.')
-                        );
-                        return $('.msg-error').css({
+                    error: function(error) {
+                        if (error.responseText) {
+                            errorMessage = JSON.parse(error.responseText);
+                        }
+                        dataDownloadObj.$reports_request_response_error.text(errorMessage);
+                        return dataDownloadObj.$reports_request_response_error.css({
                             display: 'block'
                         });
                     },
@@ -294,9 +306,12 @@
                     url: url,
                     error: function() {
                         dataDownloadObj.clear_display();
-                        return dataDownloadObj.$download_request_response_error.text(
+                        dataDownloadObj.$download_request_response_error.text(
                             gettext('Error retrieving grading configuration.')
                         );
+                        return dataDownloadObj.$download_request_response_error.css({
+                            display: 'block'
+                        });
                     },
                     success: function(data) {
                         dataDownloadObj.clear_display();
@@ -307,29 +322,27 @@
             });
             this.$async_report_btn.click(function(e) {
                 var url = $(e.target).data('endpoint');
+                var errorMessage = '';
                 dataDownloadObj.clear_display();
                 return $.ajax({
                     type: 'POST',
                     dataType: 'json',
                     url: url,
-                    error: statusAjaxError(function() {
-                        if (e.target.name === 'calculate-grades-csv') {
-                            dataDownloadObj.$grades_request_response_error.text(
-                                gettext('Error generating grades. Please try again.')
-                            );
+                    error: function(error) {
+                        if (error.responseText) {
+                            errorMessage = JSON.parse(error.responseText);
+                        } else if (e.target.name === 'calculate-grades-csv') {
+                            errorMessage = gettext('Error generating grades. Please try again.');
                         } else if (e.target.name === 'problem-grade-report') {
-                            dataDownloadObj.$grades_request_response_error.text(
-                                gettext('Error generating problem grade report. Please try again.')
-                            );
+                            errorMessage = gettext('Error generating problem grade report. Please try again.');
                         } else if (e.target.name === 'export-ora2-data') {
-                            dataDownloadObj.$grades_request_response_error.text(
-                                gettext('Error generating ORA data report. Please try again.')
-                            );
+                            errorMessage = gettext('Error generating ORA data report. Please try again.');
                         }
-                        return $('.msg-error').css({
+                        dataDownloadObj.$reports_request_response_error.text(errorMessage);
+                        return dataDownloadObj.$reports_request_response_error.css({
                             display: 'block'
                         });
-                    }),
+                    },
                     success: function(data) {
                         dataDownloadObj.$reports_request_response.text(data.status);
                         return $('.msg-confirm').css({
diff --git a/lms/static/js/instructor_dashboard/membership.js b/lms/static/js/instructor_dashboard/membership.js
index 45870df249..5d40391bd1 100644
--- a/lms/static/js/instructor_dashboard/membership.js
+++ b/lms/static/js/instructor_dashboard/membership.js
@@ -598,6 +598,7 @@ such that the value can be defined later than this assignment (file load order).
             this.$reason_field = this.$container.find("textarea[name='reason-field']");
             this.$checkbox_autoenroll = this.$container.find("input[name='auto-enroll']");
             this.$checkbox_emailstudents = this.$container.find("input[name='email-students']");
+            this.checkbox_emailstudents_initialstate = this.$checkbox_emailstudents.is(':checked');
             this.$task_response = this.$container.find('.request-response');
             this.$request_response_error = this.$container.find('.request-response-error');
             this.$enrollment_button.click(function(event) {
@@ -634,7 +635,7 @@ such that the value can be defined later than this assignment (file load order).
         batchEnrollment.prototype.clear_input = function() {
             this.$identifier_input.val('');
             this.$reason_field.val('');
-            this.$checkbox_emailstudents.attr('checked', true);
+            this.$checkbox_emailstudents.attr('checked', this.checkbox_emailstudents_initialstate);
             return this.$checkbox_autoenroll.attr('checked', true);
         };
 
diff --git a/lms/static/js/spec/staff_debug_actions_spec.js b/lms/static/js/spec/staff_debug_actions_spec.js
index f6a45fc5c7..53dd08c0f9 100644
--- a/lms/static/js/spec/staff_debug_actions_spec.js
+++ b/lms/static/js/spec/staff_debug_actions_spec.js
@@ -96,7 +96,7 @@ define([
                         error_msg: 'Failed to reset attempts for user.'
                     };
                     StaffDebug.doInstructorDashAction(action);
-                    AjaxHelpers.respondWithError(requests);
+                    AjaxHelpers.respondWithTextError(requests);
                     expect($('#idash_msg').text()).toBe('Failed to reset attempts for user. ');
                     $('#result_' + locationName).remove();
                 });
diff --git a/lms/static/js/spec/student_account/register_spec.js b/lms/static/js/spec/student_account/register_spec.js
index d035155ac7..b50e82c8f8 100644
--- a/lms/static/js/spec/student_account/register_spec.js
+++ b/lms/static/js/spec/student_account/register_spec.js
@@ -30,6 +30,17 @@
                         confirm_email: 'xsy@edx.org',
                         honor_code: true
                     },
+                    $email = null,
+                    $name = null,
+                    $username = null,
+                    $password = null,
+                    $levelOfEducation = null,
+                    $gender = null,
+                    $yearOfBirth = null,
+                    $mailingAddress = null,
+                    $goals = null,
+                    $confirmEmail = null,
+                    $honorCode = null,
                     THIRD_PARTY_AUTH = {
                         currentProvider: null,
                         providers: [
@@ -49,9 +60,26 @@
                             }
                         ]
                     },
+                    VALIDATION_DECISIONS_POSITIVE = {
+                        validation_decisions: {
+                            email: '',
+                            username: '',
+                            password: '',
+                            confirm_email: ''
+                        }
+                    },
+                    VALIDATION_DECISIONS_NEGATIVE = {
+                        validation_decisions: {
+                            email: 'Error.',
+                            username: 'Error.',
+                            password: 'Error.',
+                            confirm_email: 'Error'
+                        }
+                    },
                     FORM_DESCRIPTION = {
                         method: 'post',
                         submit_url: '/user_api/v1/account/registration/',
+                        validation_url: '/api/user/v1/validation/registration',
                         fields: [
                             {
                                 placeholder: 'username@domain.com',
@@ -110,10 +138,10 @@
                                 defaultValue: '',
                                 type: 'select',
                                 options: [
-                                {value: '', name: '--'},
-                                {value: 'p', name: 'Doctorate'},
-                                {value: 'm', name: "Master's or professional degree"},
-                                {value: 'b', name: "Bachelor's degree"}
+                                    {value: '', name: '--'},
+                                    {value: 'p', name: 'Doctorate'},
+                                    {value: 'm', name: "Master's or professional degree"},
+                                    {value: 'b', name: "Bachelor's degree"}
                                 ],
                                 required: false,
                                 instructions: 'Select your education level.',
@@ -126,10 +154,10 @@
                                 defaultValue: '',
                                 type: 'select',
                                 options: [
-                                {value: '', name: '--'},
-                                {value: 'm', name: 'Male'},
-                                {value: 'f', name: 'Female'},
-                                {value: 'o', name: 'Other'}
+                                    {value: '', name: '--'},
+                                    {value: 'm', name: 'Male'},
+                                    {value: 'f', name: 'Female'},
+                                    {value: 'o', name: 'Other'}
                                 ],
                                 required: false,
                                 instructions: 'Select your gender.',
@@ -142,10 +170,10 @@
                                 defaultValue: '',
                                 type: 'select',
                                 options: [
-                                {value: '', name: '--'},
-                                {value: 1900, name: '1900'},
-                                {value: 1950, name: '1950'},
-                                {value: 2014, name: '2014'}
+                                    {value: '', name: '--'},
+                                    {value: 1900, name: '1900'},
+                                    {value: 1950, name: '1950'},
+                                    {value: 2014, name: '2014'}
                                 ],
                                 required: false,
                                 instructions: 'Select your year of birth.',
@@ -185,7 +213,6 @@
                             }
                         ]
                     };
-
                 var createRegisterView = function(that) {
                 // Initialize the register model
                     model = new RegisterModel({}, {
@@ -209,6 +236,43 @@
                     view.on('auth-complete', function() {
                         authComplete = true;
                     });
+
+                // Target each form field.
+                    $email = $('#register-email');
+                    $confirmEmail = $('#register-confirm_email');
+                    $name = $('#register-name');
+                    $username = $('#register-username');
+                    $password = $('#register-password');
+                    $levelOfEducation = $('#register-level_of_education');
+                    $gender = $('#register-gender');
+                    $yearOfBirth = $('#register-year_of_birth');
+                    $mailingAddress = $('#register-mailing_address');
+                    $goals = $('#register-goals');
+                    $honorCode = $('#register-honor_code');
+                };
+
+                var fillData = function() {
+                    $email.val(USER_DATA.email);
+                    $confirmEmail.val(USER_DATA.email);
+                    $name.val(USER_DATA.name);
+                    $username.val(USER_DATA.username);
+                    $password.val(USER_DATA.password);
+                    $levelOfEducation.val(USER_DATA.level_of_education);
+                    $gender.val(USER_DATA.gender);
+                    $yearOfBirth.val(USER_DATA.year_of_birth);
+                    $mailingAddress.val(USER_DATA.mailing_address);
+                    $goals.val(USER_DATA.goals);
+                // Check the honor code checkbox
+                    $honorCode.prop('checked', USER_DATA.honor_code);
+                };
+
+                var liveValidate = function($el, validationSuccess) {
+                    $el.focus();
+                    if (!_.isUndefined(validationSuccess) && !validationSuccess) {
+                        model.trigger('validation', $el, VALIDATION_DECISIONS_NEGATIVE);
+                    } else {
+                        model.trigger('validation', $el, VALIDATION_DECISIONS_POSITIVE);
+                    }
                 };
 
                 var submitForm = function(validationSuccess) {
@@ -216,19 +280,7 @@
                     var clickEvent = $.Event('click');
 
                 // Simulate manual entry of registration form data
-                    $('#register-email').val(USER_DATA.email);
-                    $('#register-confirm_email').val(USER_DATA.email);
-                    $('#register-name').val(USER_DATA.name);
-                    $('#register-username').val(USER_DATA.username);
-                    $('#register-password').val(USER_DATA.password);
-                    $('#register-level_of_education').val(USER_DATA.level_of_education);
-                    $('#register-gender').val(USER_DATA.gender);
-                    $('#register-year_of_birth').val(USER_DATA.year_of_birth);
-                    $('#register-mailing_address').val(USER_DATA.mailing_address);
-                    $('#register-goals').val(USER_DATA.goals);
-
-                // Check the honor code checkbox
-                    $('#register-honor_code').prop('checked', USER_DATA.honor_code);
+                    fillData();
 
                 // If validationSuccess isn't passed, we avoid
                 // spying on `view.validate` twice
@@ -238,6 +290,10 @@
                             isValid: validationSuccess,
                             message: 'Submission was validated.'
                         });
+                    // Successful validation means there's no need to use AJAX calls from liveValidate,
+                        if (validationSuccess) {
+                            spyOn(view, 'liveValidate').and.callFake(function() {});
+                        }
                     }
 
                 // Submit the email address
@@ -284,6 +340,7 @@
                         if (param === '?course_id') {
                             return encodeURIComponent(COURSE_ID);
                         }
+                        return null;
                     });
 
                 // Attempt to register
@@ -308,17 +365,17 @@
                     expect($('.button-oa2-facebook')).toBeVisible();
                 });
 
-                it('validates registration form fields', function() {
+                it('validates registration form fields on form submission', function() {
                     createRegisterView(this);
 
                 // Submit the form, with successful validation
                     submitForm(true);
 
                 // Verify that validation of form fields occurred
-                    expect(view.validate).toHaveBeenCalledWith($('#register-email')[0]);
-                    expect(view.validate).toHaveBeenCalledWith($('#register-name')[0]);
-                    expect(view.validate).toHaveBeenCalledWith($('#register-username')[0]);
-                    expect(view.validate).toHaveBeenCalledWith($('#register-password')[0]);
+                    expect(view.validate).toHaveBeenCalledWith($email[0]);
+                    expect(view.validate).toHaveBeenCalledWith($name[0]);
+                    expect(view.validate).toHaveBeenCalledWith($username[0]);
+                    expect(view.validate).toHaveBeenCalledWith($password[0]);
 
                 // Verify that no submission errors are visible
                     expect(view.$formFeedback.find('.' + view.formErrorsJsHook).length).toEqual(0);
@@ -327,7 +384,34 @@
                     expect(view.$submitButton).toHaveAttr('disabled');
                 });
 
-                it('displays registration form validation errors', function() {
+                it('live validates registration form fields', function() {
+                    var requiredValidationFields = [$email, $confirmEmail, $username, $password],
+                        i,
+                        $el;
+                    createRegisterView(this);
+
+                    for (i = 0; i < requiredValidationFields.length; ++i) {
+                        $el = requiredValidationFields[i];
+
+                    // Perform successful live validations.
+                        liveValidate($el);
+
+                    // Confirm success.
+                        expect($el).toHaveClass('success');
+
+                    // Confirm that since we've blurred from each input, required text doesn't show.
+                        expect(view.getRequiredTextLabel($el)).toHaveClass('hidden');
+
+                    // Confirm fa-check shows.
+                        expect(view.getIcon($el)).toHaveClass('fa-check');
+                        expect(view.getIcon($el)).toBeVisible();
+
+                    // Confirm the error tip is empty.
+                        expect(view.getErrorTip($el).val().length).toBe(0);
+                    }
+                });
+
+                it('displays registration form validation errors on form submission', function() {
                     createRegisterView(this);
 
                 // Submit the form, with failed validation
@@ -343,7 +427,34 @@
                     expect(view.$submitButton).not.toHaveAttr('disabled');
                 });
 
-                it('displays an error if the server returns an error while registering', function() {
+                it('displays live registration form validation errors', function() {
+                    var requiredValidationFields = [$email, $confirmEmail, $username, $password],
+                        i,
+                        $el;
+                    createRegisterView(this);
+
+                    for (i = 0; i < requiredValidationFields.length; ++i) {
+                        $el = requiredValidationFields[i];
+
+                    // Perform invalid live validations.
+                        liveValidate($el, false);
+
+                    // Confirm error.
+                        expect($el).toHaveClass('error');
+
+                    // Confirm that since we've blurred from each input, required text still shows for errors.
+                        expect(view.getRequiredTextLabel($el)).not.toHaveClass('hidden');
+
+                    // Confirm fa-times shows.
+                        expect(view.getIcon($el)).toHaveClass('fa-exclamation');
+                        expect(view.getIcon($el)).toBeVisible();
+
+                    // Confirm the error tip shows an error message.
+                        expect(view.getErrorTip($el).val()).not.toBeEmpty();
+                    }
+                });
+
+                it('displays an error on form submission if the server returns an error', function() {
                     createRegisterView(this);
 
                 // Submit the form, with successful validation
diff --git a/lms/static/js/staff_debug_actions.js b/lms/static/js/staff_debug_actions.js
index caf4b67750..d242e7f49c 100644
--- a/lms/static/js/staff_debug_actions.js
+++ b/lms/static/js/staff_debug_actions.js
@@ -54,12 +54,12 @@ var StaffDebug = (function() {
                 try {
                     responseJSON = $.parseJSON(request.responseText);
                 } catch (e) {
-                    responseJSON = {error: gettext('Unknown Error Occurred.')};
+                    responseJSON = 'Unknown Error Occurred.';
                 }
                 var text = _.template('{error_msg} {error}', {interpolate: /\{(.+?)\}/g})(
                     {
                         error_msg: action.error_msg,
-                        error: responseJSON.error
+                        error: gettext(responseJSON)
                     }
             );
                 var html = _.template('<p id="idash_msg" class="error">{text}</p>', {interpolate: /\{(.+?)\}/g})(
diff --git a/lms/static/js/student_account/tos_modal.js b/lms/static/js/student_account/tos_modal.js
index d4982833c5..b1c9ad0571 100644
--- a/lms/static/js/student_account/tos_modal.js
+++ b/lms/static/js/student_account/tos_modal.js
@@ -79,6 +79,7 @@
     var buildIframe = function(link, modalSelector, contentSelector, tosLinkSelector) {
         // Create an iframe with contents from the link and set its height to match the content area
         return $('<iframe>', {
+            title: 'Terms of Service and Honor Code',
             src: link.href,
             load: function() {
                 var $iframeHead = $(this).contents().find('head'),
diff --git a/lms/static/js/student_account/views/FormView.js b/lms/static/js/student_account/views/FormView.js
index a458a12da8..412ecf6b10 100644
--- a/lms/static/js/student_account/views/FormView.js
+++ b/lms/static/js/student_account/views/FormView.js
@@ -6,43 +6,30 @@
         'backbone',
         'common/js/utils/edx.utils.validate',
         'edx-ui-toolkit/js/utils/html-utils',
+        'edx-ui-toolkit/js/utils/string-utils',
         'text!templates/student_account/form_errors.underscore'
-    ],
-        function($, _, Backbone, EdxUtilsValidate, HtmlUtils, formErrorsTpl) {
+    ], function($, _, Backbone, EdxUtilsValidate, HtmlUtils, StringUtils, formErrorsTpl) {
             return Backbone.View.extend({
                 tagName: 'form',
-
                 el: '',
-
                 tpl: '',
-
                 fieldTpl: '#form_field-tpl',
-
                 formErrorsTpl: formErrorsTpl,
-
                 formErrorsJsHook: 'js-form-errors',
-
                 defaultFormErrorsTitle: gettext('An error occurred.'),
-
                 events: {},
-
                 errors: [],
-
                 formType: '',
-
                 $form: {},
-
                 fields: [],
-
+                liveValidationFields: [],
             // String to append to required label fields
                 requiredStr: '',
-
             /*
-            Translators: This string is appended to optional field labels on the student login, registration, and
-            profile forms.
+                Translators: This string is appended to optional field labels on the student login, registration, and
+                profile forms.
             */
                 optionalStr: gettext('(optional)'),
-
                 submitButton: '',
 
                 initialize: function(data) {
@@ -157,7 +144,7 @@
                         $label,
                         key = '',
                         errors = [],
-                        test = {};
+                        validation = {};
 
                     for (i = 0; i < len; i++) {
                         $el = $(elements[i]);
@@ -171,13 +158,13 @@
                         }
 
                         if (key) {
-                            test = this.validate(elements[i]);
-                            if (test.isValid) {
+                            validation = this.validate(elements[i]);
+                            if (validation.isValid) {
                                 obj[key] = $el.attr('type') === 'checkbox' ? $el.is(':checked') : $el.val();
                                 $el.removeClass('error');
                                 $label.removeClass('error');
                             } else {
-                                errors.push(test.message);
+                                errors.push(validation.message);
                                 $el.addClass('error');
                                 $label.addClass('error');
                             }
@@ -190,8 +177,15 @@
                 },
 
                 saveError: function(error) {
-                    this.errors = ['<li>' + error.responseText + '</li>'];
+                    this.errors = [
+                        StringUtils.interpolate(
+                            '<li>{error}</li>', {
+                                error: error.responseText
+                            }
+                        )
+                    ];
                     this.renderErrors(this.defaultFormErrorsTitle, this.errors);
+                    this.scrollToFormFeedback();
                     this.toggleDisableButton(false);
                 },
 
@@ -200,7 +194,6 @@
              */
                 renderErrors: function(title, errorMessages) {
                     this.clearFormErrors();
-
                     this.renderFormFeedback(this.formErrorsTpl, {
                         jsHook: this.formErrorsJsHook,
                         title: title,
@@ -211,14 +204,6 @@
                 renderFormFeedback: function(template, context) {
                     var tpl = HtmlUtils.template(template);
                     HtmlUtils.prepend(this.$formFeedback, tpl(context));
-
-                // Scroll to feedback container
-                    $('html,body').animate({
-                        scrollTop: this.$formFeedback.offset().top
-                    }, 'slow');
-
-                // Focus on the feedback container to ensure screen readers see the messages.
-                    this.$formFeedback.focus();
                 },
 
             /* Allows extended views to add non-form attributes
@@ -244,6 +229,7 @@
                         this.clearFormErrors();
                     } else {
                         this.renderErrors(this.defaultFormErrorsTitle, this.errors);
+                        this.scrollToFormFeedback();
                         this.toggleDisableButton(false);
                     }
 
@@ -257,6 +243,10 @@
                     return true;
                 },
 
+                resetValidationVariables: function() {
+                    return true;
+                },
+
                 clearFormErrors: function() {
                     var query = '.' + this.formErrorsJsHook;
                     this.clearFormFeedbackItems(query);
@@ -283,8 +273,44 @@
                     }
                 },
 
+                scrollToFormFeedback: function() {
+                    var self = this;
+                // Scroll to feedback container
+                    $('html,body').animate({
+                        scrollTop: this.$formFeedback.offset().top
+                    }, 'slow', function() {
+                        self.resetValidationVariables();
+                    });
+
+                // Focus on the feedback container to ensure screen readers see the messages.
+                    this.$formFeedback.focus();
+                },
+
                 validate: function($el) {
                     return EdxUtilsValidate.validate($el);
+                },
+
+                liveValidate: function($el, url, dataType, data, method, model) {
+                    $.ajax({
+                        url: url,
+                        dataType: dataType,
+                        data: data,
+                        method: method,
+                        success: function(response) {
+                            model.trigger('validation', $el, response);
+                        }
+                    });
+                },
+
+                inLiveValidationFields: function($el) {
+                    var i,
+                        name = $el.attr('name') || false;
+                    for (i = 0; i < this.liveValidationFields.length; ++i) {
+                        if (this.liveValidationFields[i] === name) {
+                            return true;
+                        }
+                    }
+                    return false;
                 }
             });
         });
diff --git a/lms/static/js/student_account/views/RegisterView.js b/lms/static/js/student_account/views/RegisterView.js
index 6c05d4a3e0..fb789aec37 100644
--- a/lms/static/js/student_account/views/RegisterView.js
+++ b/lms/static/js/student_account/views/RegisterView.js
@@ -4,29 +4,48 @@
         'jquery',
         'underscore',
         'gettext',
+        'edx-ui-toolkit/js/utils/string-utils',
         'js/student_account/views/FormView',
         'text!templates/student_account/form_status.underscore'
     ],
-        function($, _, gettext, FormView, formStatusTpl) {
+        function(
+            $, _, gettext,
+            StringUtils,
+            FormView,
+            formStatusTpl
+        ) {
             return FormView.extend({
                 el: '#register-form',
-
                 tpl: '#register-tpl',
-
+                validationUrl: '/api/user/v1/validation/registration',
                 events: {
                     'click .js-register': 'submitForm',
-                    'click .login-provider': 'thirdPartyAuth'
+                    'click .login-provider': 'thirdPartyAuth',
+                    'click input[required][type="checkbox"]': 'liveValidateHandler',
+                    'blur input[required], textarea[required], select[required]': 'liveValidateHandler',
+                    'focus input[required], textarea[required], select[required]': 'handleRequiredInputFocus'
                 },
-
+                liveValidationFields: [
+                    'name',
+                    'username',
+                    'password',
+                    'email',
+                    'confirm_email',
+                    'country',
+                    'honor_code',
+                    'terms_of_service'
+                ],
                 formType: 'register',
-
                 formStatusTpl: formStatusTpl,
-
                 authWarningJsHook: 'js-auth-warning',
-
                 defaultFormErrorsTitle: gettext('We couldn\'t create your account.'),
-
                 submitButton: '.js-register',
+                positiveValidationIcon: 'fa-check',
+                negativeValidationIcon: 'fa-exclamation',
+                successfulValidationDisplaySeconds: 3,
+            // These are reset to true on form submission.
+                positiveValidationEnabled: true,
+                negativeValidationEnabled: true,
 
                 preRender: function(data) {
                     this.providers = data.thirdPartyAuth.providers || [];
@@ -39,8 +58,11 @@
                     this.autoSubmit = data.thirdPartyAuth.autoSubmitRegForm;
                     this.hideAuthWarnings = data.hideAuthWarnings;
                     this.autoRegisterWelcomeMessage = data.thirdPartyAuth.autoRegisterWelcomeMessage || '';
+                    this.registerFormSubmitButtonText =
+                        data.thirdPartyAuth.registerFormSubmitButtonText || _('Create Account');
 
                     this.listenTo(this.model, 'sync', this.saveSuccess);
+                    this.listenTo(this.model, 'validation', this.renderLiveValidations);
                 },
 
                 render: function(html) {
@@ -57,7 +79,8 @@
                             providers: this.providers,
                             hasSecondaryProviders: this.hasSecondaryProviders,
                             platformName: this.platformName,
-                            autoRegisterWelcomeMessage: this.autoRegisterWelcomeMessage
+                            autoRegisterWelcomeMessage: this.autoRegisterWelcomeMessage,
+                            registerFormSubmitButtonText: this.registerFormSubmitButtonText
                         }
                     }));
 
@@ -79,6 +102,144 @@
                     return this;
                 },
 
+                hideRequiredMessageExceptOnError: function($el) {
+                    // We only handle blur if not in an error state.
+                    if (!$el.hasClass('error')) {
+                        this.hideRequiredMessage($el);
+                    }
+                },
+
+                hideRequiredMessage: function($el) {
+                    this.doOnInputLabel($el, function($label) {
+                        $label.addClass('hidden');
+                    });
+                },
+
+                doOnInputLabel: function($el, action) {
+                    var $label = this.getRequiredTextLabel($el);
+                    action($label);
+                },
+
+                handleRequiredInputFocus: function(event) {
+                    var $el = $(event.currentTarget);
+                    // Avoid rendering for required checkboxes.
+                    if ($el.attr('type') !== 'checkbox') {
+                        this.renderRequiredMessage($el);
+                    }
+                    if ($el.hasClass('error')) {
+                        this.doOnInputLabel($el, function($label) {
+                            $label.addClass('error');
+                        });
+                    }
+                },
+
+                renderRequiredMessage: function($el) {
+                    this.doOnInputLabel($el, function($label) {
+                        $label.removeClass('hidden').text(gettext('(required)'));
+                    });
+                },
+
+                getRequiredTextLabel: function($el) {
+                    return $('#' + $el.attr('id') + '-required-label');
+                },
+
+                renderLiveValidations: function($el, decisions) {
+                    var $label = this.getLabel($el),
+                        $requiredTextLabel = this.getRequiredTextLabel($el),
+                        $icon = this.getIcon($el),
+                        $errorTip = this.getErrorTip($el),
+                        name = $el.attr('name'),
+                        type = $el.attr('type'),
+                        isCheckbox = type === 'checkbox',
+                        hasError = decisions.validation_decisions[name] !== '',
+                        error = isCheckbox ? '' : decisions.validation_decisions[name];
+
+                    if (hasError && this.negativeValidationEnabled) {
+                        this.renderLiveValidationError($el, $label, $requiredTextLabel, $icon, $errorTip, error);
+                    } else if (this.positiveValidationEnabled) {
+                        this.renderLiveValidationSuccess($el, $label, $requiredTextLabel, $icon, $errorTip);
+                    }
+                },
+
+                getLabel: function($el) {
+                    return this.$form.find('label[for=' + $el.attr('id') + ']');
+                },
+
+                getIcon: function($el) {
+                    return $('#' + $el.attr('id') + '-validation-icon');
+                },
+
+                getErrorTip: function($el) {
+                    return $('#' + $el.attr('id') + '-validation-error-msg');
+                },
+
+                getFieldTimeout: function($el) {
+                    return $('#' + $el.attr('id')).attr('timeout-id') || null;
+                },
+
+                setFieldTimeout: function($el, time, action) {
+                    $el.attr('timeout-id', setTimeout(action, time));
+                },
+
+                clearFieldTimeout: function($el) {
+                    var timeout = this.getFieldTimeout($el);
+                    if (timeout) {
+                        clearTimeout(this.getFieldTimeout($el));
+                        $el.removeAttr('timeout-id');
+                    }
+                },
+
+                renderLiveValidationError: function($el, $label, $req, $icon, $tip, error) {
+                    this.removeLiveValidationIndicators(
+                        $el, $label, $req, $icon,
+                        'success', this.positiveValidationIcon
+                    );
+                    this.addLiveValidationIndicators(
+                        $el, $label, $req, $icon, $tip,
+                        'error', this.negativeValidationIcon, error
+                    );
+                    this.renderRequiredMessage($el);
+                },
+
+                renderLiveValidationSuccess: function($el, $label, $req, $icon, $tip) {
+                    var self = this,
+                        validationFadeTime = this.successfulValidationDisplaySeconds * 1000;
+                    this.removeLiveValidationIndicators(
+                        $el, $label, $req, $icon,
+                        'error', this.negativeValidationIcon
+                    );
+                    this.addLiveValidationIndicators(
+                        $el, $label, $req, $icon, $tip,
+                        'success', this.positiveValidationIcon, ''
+                    );
+                    this.hideRequiredMessage($el);
+
+                    // Hide success indicators after some time.
+                    this.clearFieldTimeout($el);
+                    this.setFieldTimeout($el, validationFadeTime, function() {
+                        self.removeLiveValidationIndicators(
+                            $el, $label, $req, $icon,
+                            'success', self.positiveValidationIcon
+                        );
+                        self.clearFieldTimeout($el);
+                    });
+                },
+
+                addLiveValidationIndicators: function($el, $label, $req, $icon, $tip, indicator, icon, msg) {
+                    $el.addClass(indicator);
+                    $label.addClass(indicator);
+                    $req.addClass(indicator);
+                    $icon.addClass(indicator + ' ' + icon);
+                    $tip.text(msg);
+                },
+
+                removeLiveValidationIndicators: function($el, $label, $req, $icon, indicator, icon) {
+                    $el.removeClass(indicator);
+                    $label.removeClass(indicator);
+                    $req.removeClass(indicator);
+                    $icon.removeClass(indicator + ' ' + icon);
+                },
+
                 thirdPartyAuth: function(event) {
                     var providerUrl = $(event.currentTarget).data('provider-url') || '';
 
@@ -100,12 +261,17 @@
                             function(errorList) {
                                 return _.map(
                                     errorList,
-                                    function(errorItem) { return '<li>' + errorItem.user_message + '</li>'; }
+                                    function(errorItem) {
+                                        return StringUtils.interpolate('<li>{error}</li>', {
+                                            error: errorItem.user_message
+                                        });
+                                    }
                                 );
                             }
                         )
                     );
                     this.renderErrors(this.defaultFormErrorsTitle, this.errors);
+                    this.scrollToFormFeedback();
                     this.toggleDisableButton(false);
                 },
 
@@ -116,6 +282,11 @@
                     }
                 },
 
+                resetValidationVariables: function() {
+                    this.positiveValidationEnabled = true;
+                    this.negativeValidationEnabled = true;
+                },
+
                 renderAuthWarning: function() {
                     var msgPart1 = gettext('You\'ve successfully signed into %(currentProvider)s.'),
                         msgPart2 = gettext(
@@ -132,35 +303,100 @@
                     });
                 },
 
-                getFormData: function() {
-                    var obj = FormView.prototype.getFormData.apply(this, arguments),
-                        $form = this.$form,
-                        $label,
-                        $emailElement,
-                        $confirmEmailElement,
-                        email = '',
-                        confirmEmail = '';
+                submitForm: function(event) { // eslint-disable-line no-unused-vars
+                    var elements = this.$form[0].elements,
+                        $el,
+                        i;
 
-                    $emailElement = $form.find('input[name=email]');
-                    $confirmEmailElement = $form.find('input[name=confirm_email]');
+                // As per requirements, disable positive validation for submission.
+                    this.positiveValidationEnabled = false;
 
-                    if ($confirmEmailElement.length) {
-                        email = $emailElement.val();
-                        confirmEmail = $confirmEmailElement.val();
-                        $label = $form.find('label[for=' + $confirmEmailElement.attr('id') + ']');
+                    for (i = 0; i < elements.length; i++) {
+                        $el = $(elements[i]);
 
-                        if (confirmEmail !== '' && email !== confirmEmail) {
-                            this.errors.push('<li>' + $confirmEmailElement.data('errormsg-required') + '</li>');
-                            $confirmEmailElement.addClass('error');
-                            $label.addClass('error');
-                        } else if (confirmEmail !== '') {
-                            obj.confirm_email = confirmEmail;
-                            $confirmEmailElement.removeClass('error');
-                            $label.removeClass('error');
+                        // Simulate live validation.
+                        if ($el.attr('required')) {
+                            $el.blur();
                         }
                     }
 
+                    FormView.prototype.submitForm.apply(this, arguments);
+                },
+
+                getFormData: function() {
+                    var obj = FormView.prototype.getFormData.apply(this, arguments),
+                        $emailElement = this.$form.find('input[name=email]'),
+                        $confirmEmail = this.$form.find('input[name=confirm_email]');
+
+                    if ($confirmEmail.length) {
+                        if (!$confirmEmail.val() || ($emailElement.val() !== $confirmEmail.val())) {
+                            this.errors.push(StringUtils.interpolate('<li>{error}</li>', {
+                                error: $confirmEmail.data('errormsg-required')
+                            }));
+                        }
+                        obj.confirm_email = $confirmEmail.val();
+                    }
+
                     return obj;
+                },
+
+                liveValidateHandler: function(event) {
+                    var $el = $(event.currentTarget);
+                    // Until we get a back-end that can handle all available
+                    // registration fields, we do some generic validation here.
+                    if (this.inLiveValidationFields($el)) {
+                        if ($el.attr('type') === 'checkbox') {
+                            this.liveValidateCheckbox($el);
+                        } else {
+                            this.liveValidate($el);
+                        }
+                    } else {
+                        this.genericLiveValidateHandler($el);
+                    }
+                    // On blur, we do exactly as the function name says, no matter which input.
+                    this.hideRequiredMessageExceptOnError($el);
+                },
+
+                liveValidate: function($el) {
+                    var data = {},
+                        field,
+                        i;
+                    for (i = 0; i < this.liveValidationFields.length; ++i) {
+                        field = this.liveValidationFields[i];
+                        data[field] = $('#register-' + field).val();
+                    }
+                    FormView.prototype.liveValidate(
+                        $el, this.validationUrl, 'json', data, 'POST', this.model
+                    );
+                },
+
+                liveValidateCheckbox: function($checkbox) {
+                    var validationDecisions = {validation_decisions: {}},
+                        decisions = validationDecisions.validation_decisions,
+                        name = $checkbox.attr('name'),
+                        checked = $checkbox.is(':checked'),
+                        error = $checkbox.data('errormsg-required');
+                    decisions[name] = checked ? '' : error;
+                    this.renderLiveValidations($checkbox, validationDecisions);
+                },
+
+                genericLiveValidateHandler: function($el) {
+                    var elementType = $el.attr('type');
+                    if (elementType === 'checkbox') {
+                    // We are already validating checkboxes in a generic way.
+                        this.liveValidateCheckbox($el);
+                    } else {
+                        this.genericLiveValidate($el);
+                    }
+                },
+
+                genericLiveValidate: function($el) {
+                    var validationDecisions = {validation_decisions: {}},
+                        decisions = validationDecisions.validation_decisions,
+                        name = $el.attr('name'),
+                        error = $el.data('errormsg-required');
+                    decisions[name] = $el.val() ? '' : error;
+                    this.renderLiveValidations($el, validationDecisions);
                 }
             });
         });
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index 01b219b616..24df4065eb 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -19,7 +19,6 @@ html.video-fullscreen {
   @extend %ui-print-excluded;
 
   margin: ($baseline/2) ($baseline/4) 0 0;
-  overflow: hidden;
 
   &.studio-view {
     margin: 0;
diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss
index 1e1e014096..c25cc8ea1e 100644
--- a/lms/static/sass/multicourse/_course_about.scss
+++ b/lms/static/sass/multicourse/_course_about.scss
@@ -244,7 +244,6 @@
       &.studio-view {
         position: relative;
         margin: ($baseline/2) 0 0 0;
-        overflow: hidden;
       }
 
       .instructor-info-action {
diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss
index 0872ccd786..a2472668b8 100644
--- a/lms/static/sass/views/_login-register.scss
+++ b/lms/static/sass/views/_login-register.scss
@@ -296,10 +296,6 @@
                 display: inline;
             }
 
-            &.error {
-                color: $red;
-            }
-
             &[for="register-data_sharing_consent"],
             &[for="register-honor_code"],
             &[for="register-terms_of_service"] {
@@ -365,7 +361,22 @@
             }
 
             &.error {
-                border-color: $error-color;
+                border-color: $red;
+            }
+
+            &.success {
+                border-color: $success-color-hover;
+            }
+        }
+
+        textarea,
+        select {
+            &.error {
+                outline-color: $red;
+            }
+
+            &.success {
+                outline-color: $success-color-hover;
             }
         }
 
@@ -384,9 +395,16 @@
             &:active, &:focus {
                 outline: auto;
             }
+        }
 
+        span,
+        label {
             &.error {
-                outline-color: $error-color;
+                color: $red;
+            }
+
+            &.success {
+                color: $success-color-hover;
             }
         }
 
@@ -394,6 +412,7 @@
             @extend %t-copy-sub1;
             color: $uxpl-gray-base;
         }
+
         .tip {
             display: block;
         }
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index a8b992a86f..97088e942d 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -169,18 +169,18 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_
                           share_text = _("I'm taking {course_name} online with edX.org. Check it out!").format(course_name=course_overview.display_name_with_default)
                           query_params = urllib.urlencode((('u', facebook_share_url), ('quote', share_text.encode('utf-8')),))
                           facebook_url = 'https://www.facebook.com/sharer/sharer.php?{query}'.format(query=query_params)
+                          share_msg = _("Share {course_name} on Facebook").format(course_name=course_overview.display_name_with_default)
                         %>
                         <a
                           data-tooltip="${_('Share on Facebook')}"
+                          data-trigger="focus hover"
                           class="action action-facebook"
-                          aria-haspopup="true"
-                          aria-expanded="false"
                           href="${facebook_url}"
                           target="_blank"
                           title="${_('Share on Facebook')}"
                           data-course-id="${course_overview.id}"
                           onclick="window.open('${facebook_url}', '${share_window_name}', '${share_window_config}'); return false;">
-                          <span class="sr">${_('Facebook')}</span>
+                          <span class="sr">${share_msg}</span>
                           <span class="fa fa-facebook" aria-hidden="true"></span>
                         </a>
                     % endif
@@ -190,18 +190,18 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_
                           default_share_text = _("I'm taking {course_name} online with @edxonline. Check it out!").format(course_name=course_overview.display_name_with_default)
                           share_text = urllib.quote_plus(share_settings.get('DASHBOARD_TWITTER_TEXT', default_share_text.encode('utf-8')))
                           twitter_url = 'https://twitter.com/intent/tweet?text=' + share_text + '%20' + urllib.quote_plus(twitter_share_url)
+                          share_msg = _("Share {course_name} on Twitter").format(course_name=course_overview.display_name_with_default)
                         %>
                         <a
                           data-tooltip="${_('Share on Twitter')}"
+                          data-trigger="focus hover"
                           class="action action-twitter"
-                          aria-haspopup="true"
-                          aria-expanded="false"
                           href="${twitter_url}"
                           target="_blank"
                           title="${_('Share on Twitter')}"
                           data-course-id="${course_overview.id}"
                           onclick="window.open('${twitter_url}', '${share_window_name}', '${share_window_config}'); return false;">
-                          <span class="sr">${_('Twitter')}</span>
+                          <span class="sr">${share_msg}</span>
                           <span class="fa fa-twitter" aria-hidden="true"></span>
                         </a>
                     % endif
diff --git a/lms/templates/main.html b/lms/templates/main.html
index e25c17cc8c..de5e62a941 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -104,6 +104,7 @@ from pipeline_mako import render_require_js_path_overrides
   <%block name="head_extra"/>
 
   <%include file="/courseware/experiments.html"/>
+  <%include file="user_metadata.html"/>
   <%static:optional_include_mako file="head-extra.html" is_theming_enabled="True" />
 
   <%include file="widgets/optimizely.html" />
diff --git a/lms/templates/student_account/form_field.underscore b/lms/templates/student_account/form_field.underscore
index 93ab3fa216..05b3692b3b 100644
--- a/lms/templates/student_account/form_field.underscore
+++ b/lms/templates/student_account/form_field.underscore
@@ -1,9 +1,17 @@
-<div class="form-field <%=type%>-<%= name %>">
+<div class="form-field <%- type %>-<%- name %>">
     <% if ( type !== 'checkbox' ) { %>
-        <label for="<%= form %>-<%= name %>">
-            <span class="label-text"><%= label %></span>
-            <% if ( required && requiredStr && (type !== 'hidden') ) { %><span class="label-required"><%= requiredStr %></span><% } %>
-            <% if ( !required && optionalStr && (type !== 'hidden') ) { %><span class="label-optional"><%= optionalStr %></span><% } %>
+        <label for="<%- form %>-<%- name %>">
+            <span class="label-text"><%- label %></span>
+            <% if ( required && type !== 'hidden' ) { %>
+                <span id="<%- form %>-<%- name %>-required-label"
+                    class="label-required <% if ( !requiredStr ) { %>hidden<% } %>">
+                    <% if ( requiredStr ) { %><%- requiredStr %><% }%>
+                </span>
+                <span class="icon fa" id="<%- form %>-<%- name %>-validation-icon" aria-hidden="true"></span>
+            <% } %>
+            <% if ( !required && optionalStr && (type !== 'hidden') ) { %>
+                <span class="label-optional" id="<%- form %>-<%- name %>-optional-label"><%- optionalStr %></span>
+            <% } %>
         </label>
         <% if (supplementalLink && supplementalText) { %>
             <div class="supplemental-link">
@@ -13,50 +21,59 @@
     <% } %>
 
     <% if ( type === 'select' ) { %>
-        <select id="<%= form %>-<%= name %>"
-            name="<%= name %>"
+        <select id="<%- form %>-<%- name %>"
+            name="<%- name %>"
             class="input-inline"
             <% if ( instructions ) { %>
-            aria-describedby="<%= form %>-<%= name %>-desc"
+            aria-describedby="<%- form %>-<%- name %>-desc <%- form %>-<%- name %>-validation-error"
             <% } %>
             <% if ( typeof errorMessages !== 'undefined' ) {
                 _.each(errorMessages, function( msg, type ) {%>
-                    data-errormsg-<%= type %>="<%= msg %>"
+                    data-errormsg-<%- type %>="<%- msg %>"
             <%  });
             } %>
-            <% if ( required ) { %> aria-required="true" required<% } %>>
-        <% _.each(options, function(el) { %>
-            <option value="<%= el.value%>"<% if ( el.default ) { %> data-isdefault="true" selected<% } %>><%= el.name %></option>
-        <% }); %>
+            <% if ( required ) { %> aria-required="true" required<% } %>
+        >
+            <% _.each(options, function(el) { %>
+                <option value="<%- el.value%>"<% if ( el.default ) { %> data-isdefault="true" selected<% } %>><%- el.name %></option>
+            <% }); %>
         </select>
-        <% if ( instructions ) { %> <span class="tip tip-input" id="<%= form %>-<%= name %>-desc"><%= instructions %></span><% } %>
+        <span id="<%- form %>-<%- name %>-validation-error" class="tip error" aria-live="assertive">
+            <span class="sr-only">ERROR: </span>
+            <span id="<%- form %>-<%- name %>-validation-error-msg"></span>
+        </span>
+        <% if ( instructions ) { %> <span class="tip tip-input" id="<%- form %>-<%- name %>-desc"><%- instructions %></span><% } %>
         <% if (supplementalLink && supplementalText) { %>
             <div class="supplemental-link">
                 <a href="<%- supplementalLink %>" target="_blank"><%- supplementalText %></a>
             </div>
         <% } %>
     <% } else if ( type === 'textarea' ) { %>
-        <textarea id="<%= form %>-<%= name %>"
-            type="<%= type %>"
-            name="<%= name %>"
+        <textarea id="<%- form %>-<%- name %>"
+            type="<%- type %>"
+            name="<%- name %>"
             class="input-block"
             <% if ( instructions ) { %>
-            aria-describedby="<%= form %>-<%= name %>-desc"
+            aria-describedby="<%- form %>-<%- name %>-desc <%- form %>-<%- name %>-validation-error"
             <% } %>
-            <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %>
-            <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %>
+            <% if ( restrictions.min_length ) { %> minlength="<%- restrictions.min_length %>"<% } %>
+            <% if ( restrictions.max_length ) { %> maxlength="<%- restrictions.max_length %>"<% } %>
             <% if ( typeof errorMessages !== 'undefined' ) {
                 _.each(errorMessages, function( msg, type ) {%>
-                    data-errormsg-<%= type %>="<%= msg %>"
+                    data-errormsg-<%- type %>="<%- msg %>"
             <%  });
             } %>
-            <% if ( required ) { %> aria-required="true" required<% } %> ></textarea>
-            <% if ( instructions ) { %> <span class="tip tip-input" id="<%= form %>-<%= name %>-desc"><%= instructions %></span><% } %>
-            <% if (supplementalLink && supplementalText) { %>
-                <div class="supplemental-link">
-                    <a href="<%- supplementalLink %>" target="_blank"><%- supplementalText %></a>
-                </div>
-            <% } %>
+            <% if ( required ) { %> aria-required="true" required<% } %>></textarea>
+        <span id="<%- form %>-<%- name %>-validation-error" class="tip error" aria-live="assertive">
+            <span class="sr-only">ERROR: </span>
+            <span id="<%- form %>-<%- name %>-validation-error-msg"></span>
+        </span>
+        <% if ( instructions ) { %> <span class="tip tip-input" id="<%- form %>-<%- name %>-desc"><%- instructions %></span><% } %>
+        <% if (supplementalLink && supplementalText) { %>
+            <div class="supplemental-link">
+                <a href="<%- supplementalLink %>" target="_blank"><%- supplementalText %></a>
+            </div>
+        <% } %>
     <% } else { %>
         <% if ( type === 'checkbox' ) { %>
             <% if (supplementalLink && supplementalText) { %>
@@ -65,30 +82,44 @@
                 </div>
             <% } %>
         <% } %>
-        <input id="<%= form %>-<%= name %>"
-           type="<%= type %>"
-           name="<%= name %>"
+        <input id="<%- form %>-<%- name %>"
+           type="<%- type %>"
+           name="<%- name %>"
            class="input-block <% if ( type === 'checkbox' ) { %>checkbox<% } %>"
-            <% if ( instructions ) { %> aria-describedby="<%= form %>-<%= name %>-desc" <% } %>
-            <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %>
-            <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %>
+            <% if ( instructions ) { %>
+            aria-describedby="<%- form %>-<%- name %>-desc <%- form %>-<%- name %>-validation-error"
+            <% } %>
+            <% if ( restrictions.min_length ) { %> minlength="<%- restrictions.min_length %>"<% } %>
+            <% if ( restrictions.max_length ) { %> maxlength="<%- restrictions.max_length %>"<% } %>
             <% if ( required ) { %> required<% } %>
             <% if ( typeof errorMessages !== 'undefined' ) {
                 _.each(errorMessages, function( msg, type ) {%>
-                    data-errormsg-<%= type %>="<%= msg %>"
+                    data-errormsg-<%- type %>="<%- msg %>"
             <%  });
             } %>
-            <% if ( placeholder ) { %> placeholder="<%= placeholder %>"<% } %>
+            <% if ( placeholder ) { %> placeholder="<%- placeholder %>"<% } %>
             value="<%- defaultValue %>"
         />
         <% if ( type === 'checkbox' ) { %>
-            <label for="<%= form %>-<%= name %>">
-                <span class="label-text"><%= label %></span>
-                <% if ( required && requiredStr ) { %><span class="label-required"><%= requiredStr %></span><% } %>
-                <% if ( !required && optionalStr ) { %><span class="label-optional"><%= optionalStr %></span><% } %>
+            <label for="<%- form %>-<%- name %>">
+                <span class="label-text"><%- label %></span>
+                <% if ( required && type !== 'hidden' ) { %>
+                    <span id="<%- form %>-<%- name %>-required-label"
+                        class="label-required <% if ( !requiredStr ) { %>hidden<% } %>">
+                        <% if ( requiredStr ) { %><%- requiredStr %><% }%>
+                    </span>
+                    <span class="icon fa" id="<%- form %>-<%- name %>-validation-icon" aria-hidden="true"></span>
+                <% } %>
+                <% if ( !required && optionalStr ) { %>
+                    <span class="label-optional" id="<%- form %>-<%- name %>-optional-label"><%- optionalStr %></span>
+                <% } %>
             </label>
         <% } %>
-        <% if ( instructions ) { %> <span class="tip tip-input" id="<%= form %>-<%= name %>-desc"><%= instructions %></span><% } %>
+        <span id="<%- form %>-<%- name %>-validation-error" class="tip error" aria-live="assertive">
+            <span class="sr-only">ERROR: </span>
+            <span id="<%- form %>-<%- name %>-validation-error-msg"></span>
+        </span>
+        <% if ( instructions ) { %> <span class="tip tip-input" id="<%- form %>-<%- name %>-desc"><%- instructions %></span><% } %>
     <% } %>
 
     <% if( form === 'login' && name === 'password' ) { %>
diff --git a/lms/templates/student_account/register.underscore b/lms/templates/student_account/register.underscore
index bd0016afea..0de50b845a 100644
--- a/lms/templates/student_account/register.underscore
+++ b/lms/templates/student_account/register.underscore
@@ -51,5 +51,7 @@
 
     <%= context.fields %>
 
-    <button type="submit" class="action action-primary action-update js-register register-button"><%- gettext("Create account") %></button>
+    <button type="submit" class="action action-primary action-update js-register register-button">
+    	<% if ( context.registerFormSubmitButtonText ) { %><%- context.registerFormSubmitButtonText %><% } else { %><%- gettext("Create Account") %><% } %>
+    </button>
 </form>
diff --git a/lms/templates/user_metadata.html b/lms/templates/user_metadata.html
new file mode 100644
index 0000000000..4ff06c31d2
--- /dev/null
+++ b/lms/templates/user_metadata.html
@@ -0,0 +1,56 @@
+<%page expression_filter="h"/>
+<%!
+from openedx.core.djangolib.js_utils import dump_js_escaped_json
+from eventtracking import tracker
+from opaque_keys.edx.keys import CourseKey
+%>
+<%
+user_metadata = {
+    key: context.get(key)
+    for key in (
+        'username',
+        'user_id',
+        'course_id',
+        'enrollment_mode',
+        'upgrade_link',
+        'upgrade_price',
+        'pacing_type',
+    )
+}
+
+if user:
+    user_metadata['username'] = user.username
+    user_metadata['user_id'] = user.id
+
+for datekey in (
+        'schedule_start',
+        'enrollment_time',
+        'course_start',
+        'course_end',
+        'upgrade_deadline'
+):
+    user_metadata[datekey] = (
+        context.get(datekey).isoformat() if context.get(datekey) else None
+    )
+
+course_key = context.get('course_key')
+if course and not course_key:
+    course_key = course.id
+
+if course_key:
+    if isinstance(course_key, CourseKey):
+        user_metadata['course_key_fields'] = {
+            'org': course_key.org,
+            'course': course_key.course,
+            'run': course_key.run,
+        }
+
+        if not course_id:
+            user_metadata['course_id'] = unicode(course_key)
+    elif isinstance(course_key, basestring):
+        user_metadata['course_id'] = course_key
+
+%>
+<script type="application/json" id="user-metadata">
+    ${user_metadata | n, dump_js_escaped_json}
+</script>
diff --git a/lms/templates/wiki/plugins/attachments/index.html b/lms/templates/wiki/plugins/attachments/index.html
index 0ce870adf7..7abdf3049b 100644
--- a/lms/templates/wiki/plugins/attachments/index.html
+++ b/lms/templates/wiki/plugins/attachments/index.html
@@ -87,7 +87,7 @@
               <td class="attachment-actions">
                 {% if attachment|can_write:user %}
                   {% if not attachment.current_revision.deleted %}
-                    {% if attachment.article = article %}
+                {% if 'attachment.article = article' %}
                       <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-danger">{% trans "Delete" %}</a>
                     {% else %}
                       <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Detach" %}</a>
diff --git a/lms/urls.py b/lms/urls.py
index 86c68ef411..05e0707b27 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -6,6 +6,7 @@ from config_models.views import ConfigurationModelCurrentAPIView
 from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
+from django.contrib.admin import autodiscover as django_autodiscover
 from django.views.generic.base import RedirectView
 from ratelimitbackend import admin
 
@@ -20,9 +21,8 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 from openedx.features.enterprise_support.api import enterprise_enabled
 
 
-# Uncomment the next two lines to enable the admin:
 if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
-    admin.autodiscover()
+    django_autodiscover()
 
 # Use urlpatterns formatted as within the Django docs with first parameter "stuck" to the open parenthesis
 urlpatterns = (
diff --git a/openedx/core/djangoapps/bookmarks/tests/factories.py b/openedx/core/djangoapps/bookmarks/tests/factories.py
index 069a03648b..682b6fa07d 100644
--- a/openedx/core/djangoapps/bookmarks/tests/factories.py
+++ b/openedx/core/djangoapps/bookmarks/tests/factories.py
@@ -7,10 +7,10 @@ from factory.django import DjangoModelFactory
 from functools import partial
 
 from student.tests.factories import UserFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from ..models import Bookmark, XBlockCache
 
-COURSE_KEY = SlashSeparatedCourseKey(u'edX', u'test_course', u'test')
+COURSE_KEY = CourseLocator(u'edX', u'test_course', u'test')
 LOCATION = partial(COURSE_KEY.make_usage_key, u'problem')
 
 
diff --git a/lms/djangoapps/certificates/config/__init__.py b/openedx/core/djangoapps/certificates/__init__.py
similarity index 100%
rename from lms/djangoapps/certificates/config/__init__.py
rename to openedx/core/djangoapps/certificates/__init__.py
diff --git a/openedx/core/djangoapps/certificates/config/__init__.py b/openedx/core/djangoapps/certificates/config/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lms/djangoapps/certificates/config/waffle.py b/openedx/core/djangoapps/certificates/config/waffle.py
similarity index 100%
rename from lms/djangoapps/certificates/config/waffle.py
rename to openedx/core/djangoapps/certificates/config/waffle.py
diff --git a/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py b/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py
index e62f3f2423..147025c793 100644
--- a/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py
+++ b/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py
@@ -23,7 +23,7 @@ log = logging.getLogger(__name__)
 class Command(BaseCommand):
     """
     Example usage:
-        $ ./manage.py lms generate_course_blocks --all --settings=devstack
+        $ ./manage.py lms generate_course_blocks --all_courses --settings=devstack
         $ ./manage.py lms generate_course_blocks 'edX/DemoX/Demo_Course' --settings=devstack
     """
     args = u'<course_id course_id ...>'
diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py b/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py
index 9bf02783f2..ce45c9d76e 100644
--- a/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py
+++ b/openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py
@@ -33,7 +33,13 @@ class Command(BaseCommand):
             action='store_true',
             dest='all',
             default=False,
-            help='Generate course overview for all courses.',
+            help=u'Generate course overview for all courses.',
+        )
+        parser.add_argument(
+            '--force_update',
+            action='store_true',
+            default=False,
+            help=u'Force update course overviews for the requested courses.',
         )
 
     def handle(self, *args, **options):
@@ -48,4 +54,4 @@ class Command(BaseCommand):
             except InvalidKeyError:
                 raise CommandError('Invalid key specified.')
 
-        CourseOverview.get_select_courses(course_keys)
+        CourseOverview.get_select_courses(course_keys, force_update=options.get('force_update'))
diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py
index 27b582cf4c..737c42516c 100644
--- a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py
+++ b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py
@@ -58,6 +58,23 @@ class TestGenerateCourseOverview(ModuleStoreTestCase):
         self._assert_courses_in_overview(self.course_key_1)
         self._assert_courses_not_in_overview(self.course_key_2)
 
+    def test_generate_force_update(self):
+        self.command.handle(all=True)
+
+        # update each course
+        updated_course_name = u'test_generate_course_overview.course_edit'
+        for course_key in (self.course_key_1, self.course_key_2):
+            course = self.store.get_course(course_key)
+            course.display_name = updated_course_name
+            self.store.update_item(course, self.user.id)
+
+        # force_update course_key_1, but not course_key_2
+        self.command.handle(unicode(self.course_key_1), all=False, force_update=True)
+        self.command.handle(unicode(self.course_key_2), all=False, force_update=False)
+
+        self.assertEquals(CourseOverview.get_from_id(self.course_key_1).display_name, updated_course_name)
+        self.assertNotEquals(CourseOverview.get_from_id(self.course_key_2).display_name, updated_course_name)
+
     def test_invalid_key(self):
         """
         Test that CommandError is raised for invalid key.
diff --git a/openedx/core/djangoapps/content/course_overviews/models.py b/openedx/core/djangoapps/content/course_overviews/models.py
index 2a757b4706..4978214950 100644
--- a/openedx/core/djangoapps/content/course_overviews/models.py
+++ b/openedx/core/djangoapps/content/course_overviews/models.py
@@ -487,18 +487,27 @@ class CourseOverview(TimeStampedModel):
         return json.loads(self._pre_requisite_courses_json)
 
     @classmethod
-    def get_select_courses(cls, course_keys):
+    def get_select_courses(cls, course_keys, force_update=False):
         """
         Returns CourseOverview objects for the given course_keys.
+
+        Arguments:
+            course_keys (list[CourseKey]): Identifies for which courses to
+                return CourseOverview objects.
+            force_update (boolean): Optional parameter that indicates
+                whether the requested CourseOverview objects should be
+                forcefully updated (i.e., re-synched with the modulestore).
         """
         course_overviews = []
 
         log.info('Generating course overview for %d courses.', len(course_keys))
         log.debug('Generating course overview(s) for the following courses: %s', course_keys)
 
+        action = CourseOverview.load_from_module_store if force_update else CourseOverview.get_from_id
+
         for course_key in course_keys:
             try:
-                course_overviews.append(CourseOverview.get_from_id(course_key))
+                course_overviews.append(action(course_key))
             except Exception as ex:  # pylint: disable=broad-except
                 log.exception(
                     'An error occurred while generating course overview for %s: %s',
diff --git a/openedx/core/djangoapps/content/course_structures/admin.py b/openedx/core/djangoapps/content/course_structures/admin.py
index cdf31c58e8..d2b7c41e31 100644
--- a/openedx/core/djangoapps/content/course_structures/admin.py
+++ b/openedx/core/djangoapps/content/course_structures/admin.py
@@ -1,7 +1,7 @@
 """
 Django Admin model registry for Course Structures sub-application
 """
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from .models import CourseStructure
 
diff --git a/openedx/core/djangoapps/course_groups/tests/helpers.py b/openedx/core/djangoapps/course_groups/tests/helpers.py
index 216ba458ff..2f38a2eed5 100644
--- a/openedx/core/djangoapps/course_groups/tests/helpers.py
+++ b/openedx/core/djangoapps/course_groups/tests/helpers.py
@@ -8,7 +8,7 @@ from django_comment_common.models import CourseDiscussionSettings
 from django_comment_common.utils import set_course_discussion_settings
 from factory import Sequence, post_generation
 from factory.django import DjangoModelFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
 
@@ -24,7 +24,7 @@ class CohortFactory(DjangoModelFactory):
         model = CourseUserGroup
 
     name = Sequence("cohort{}".format)
-    course_id = SlashSeparatedCourseKey("dummy", "dummy", "dummy")
+    course_id = CourseLocator("dummy", "dummy", "dummy")
     group_type = CourseUserGroup.COHORT
 
     @post_generation
@@ -57,7 +57,7 @@ class CourseCohortSettingsFactory(DjangoModelFactory):
         model = CourseCohortsSettings
 
     is_cohorted = False
-    course_id = SlashSeparatedCourseKey("dummy", "dummy", "dummy")
+    course_id = CourseLocator("dummy", "dummy", "dummy")
     cohorted_discussions = json.dumps([])
     # pylint: disable=invalid-name
     always_cohort_inline_discussions = False
diff --git a/openedx/core/djangoapps/course_groups/tests/test_cohorts.py b/openedx/core/djangoapps/course_groups/tests/test_cohorts.py
index da477bd50b..65a2c1c717 100644
--- a/openedx/core/djangoapps/course_groups/tests/test_cohorts.py
+++ b/openedx/core/djangoapps/course_groups/tests/test_cohorts.py
@@ -11,7 +11,7 @@ from django.contrib.auth.models import User
 from django.db import IntegrityError
 from django.http import Http404
 from django.test import TestCase
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from student.models import CourseEnrollment
 from student.tests.factories import UserFactory
 from xmodule.modulestore.django import modulestore
@@ -32,7 +32,7 @@ class TestCohortSignals(TestCase):
 
     def setUp(self):
         super(TestCohortSignals, self).setUp()
-        self.course_key = SlashSeparatedCourseKey("dummy", "dummy", "dummy")
+        self.course_key = CourseLocator("dummy", "dummy", "dummy")
 
     def test_cohort_added(self, mock_tracker):
         # Add cohort
@@ -164,7 +164,7 @@ class TestCohorts(ModuleStoreTestCase):
         self.assertTrue(cohorts.is_course_cohorted(course.id))
 
         # Make sure we get a Http404 if there's no course
-        fake_key = SlashSeparatedCourseKey('a', 'b', 'c')
+        fake_key = CourseLocator('a', 'b', 'c')
         self.assertRaises(Http404, lambda: cohorts.is_course_cohorted(fake_key))
 
     def test_get_cohort_id(self):
@@ -184,7 +184,7 @@ class TestCohorts(ModuleStoreTestCase):
 
         self.assertRaises(
             Http404,
-            lambda: cohorts.get_cohort_id(user, SlashSeparatedCourseKey("course", "does_not", "exist"))
+            lambda: cohorts.get_cohort_id(user, CourseLocator("course", "does_not", "exist"))
         )
 
     def test_assignment_type(self):
@@ -545,7 +545,7 @@ class TestCohorts(ModuleStoreTestCase):
 
         self.assertRaises(
             CourseUserGroup.DoesNotExist,
-            lambda: cohorts.get_cohort_by_name(SlashSeparatedCourseKey("course", "does_not", "exist"), cohort)
+            lambda: cohorts.get_cohort_by_name(CourseLocator("course", "does_not", "exist"), cohort)
         )
 
     def test_get_cohort_by_id(self):
@@ -584,7 +584,7 @@ class TestCohorts(ModuleStoreTestCase):
             ValueError,
             lambda: cohorts.add_cohort(course.id, "My Cohort", assignment_type)
         )
-        does_not_exist_course_key = SlashSeparatedCourseKey("course", "does_not", "exist")
+        does_not_exist_course_key = CourseLocator("course", "does_not", "exist")
         self.assertRaises(
             ValueError,
             lambda: cohorts.add_cohort(does_not_exist_course_key, "My Cohort", assignment_type)
diff --git a/openedx/core/djangoapps/course_groups/tests/test_views.py b/openedx/core/djangoapps/course_groups/tests/test_views.py
index a4f8dab92d..978b87fe10 100644
--- a/openedx/core/djangoapps/course_groups/tests/test_views.py
+++ b/openedx/core/djangoapps/course_groups/tests/test_views.py
@@ -13,7 +13,7 @@ from django.http import Http404
 from django.test.client import RequestFactory
 from django_comment_common.models import CourseDiscussionSettings
 from django_comment_common.utils import get_course_discussion_settings
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 from student.models import CourseEnrollment
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -1101,7 +1101,7 @@ class AddUsersToCohortTestCase(CohortViewsTestCase):
         """
         users = [UserFactory(username="user{0}".format(i)) for i in range(3)]
         usernames = [user.username for user in users]
-        wrong_course_key = SlashSeparatedCourseKey("some", "arbitrary", "course")
+        wrong_course_key = CourseLocator("some", "arbitrary", "course")
         wrong_course_cohort = CohortFactory(name="wrong_cohort", course_id=wrong_course_key, users=[])
         self.request_add_users_to_cohort(
             ",".join(usernames),
diff --git a/openedx/core/djangoapps/credit/admin.py b/openedx/core/djangoapps/credit/admin.py
index d16d89c972..e1c500bd4b 100644
--- a/openedx/core/djangoapps/credit/admin.py
+++ b/openedx/core/djangoapps/credit/admin.py
@@ -1,7 +1,7 @@
 """
 Django admin page for credit eligibility
 """
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from openedx.core.djangoapps.credit.models import (
     CreditConfig,
diff --git a/openedx/core/djangoapps/external_auth/admin.py b/openedx/core/djangoapps/external_auth/admin.py
index 0ee4997e02..ee93c76a55 100644
--- a/openedx/core/djangoapps/external_auth/admin.py
+++ b/openedx/core/djangoapps/external_auth/admin.py
@@ -2,7 +2,7 @@
 django admin pages for courseware model
 '''
 
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from openedx.core.djangoapps.external_auth.models import ExternalAuthMap
 
diff --git a/openedx/core/djangoapps/models/course_details.py b/openedx/core/djangoapps/models/course_details.py
index 2102033a73..dee667849a 100644
--- a/openedx/core/djangoapps/models/course_details.py
+++ b/openedx/core/djangoapps/models/course_details.py
@@ -106,6 +106,7 @@ class CourseDetails(object):
         course_details = cls(course_key.org, course_key.course, course_key.run)
         course_details.start_date = course_descriptor.start
         course_details.end_date = course_descriptor.end
+        course_details.certificate_available_date = course_descriptor.certificate_available_date
         course_details.enrollment_start = course_descriptor.enrollment_start
         course_details.enrollment_end = course_descriptor.enrollment_end
         course_details.pre_requisite_courses = course_descriptor.pre_requisite_courses
@@ -233,6 +234,15 @@ class CourseDetails(object):
             dirty = True
             descriptor.enrollment_end = converted
 
+        if 'certificate_available_date' in jsondict:
+            converted = date.from_json(jsondict['certificate_available_date'])
+        else:
+            converted = None
+
+        if converted != descriptor.certificate_available_date:
+            dirty = True
+            descriptor.certificate_available_date = converted
+
         if 'course_image_name' in jsondict and jsondict['course_image_name'] != descriptor.course_image:
             descriptor.course_image = jsondict['course_image_name']
             dirty = True
diff --git a/openedx/core/djangoapps/models/tests/test_course_details.py b/openedx/core/djangoapps/models/tests/test_course_details.py
index 17cb3455f1..74ad8eb8b2 100644
--- a/openedx/core/djangoapps/models/tests/test_course_details.py
+++ b/openedx/core/djangoapps/models/tests/test_course_details.py
@@ -39,6 +39,10 @@ class CourseDetailsTestCase(ModuleStoreTestCase):
         self.assertIsNone(
             details.enrollment_end, "enrollment_end date somehow initialized " + str(details.enrollment_end)
         )
+        self.assertIsNone(
+            details.certificate_available_date,
+            "certificate_available_date date somehow initialized " + str(details.certificate_available_date)
+        )
         self.assertIsNone(details.syllabus, "syllabus somehow initialized" + str(details.syllabus))
         self.assertIsNone(details.intro_video, "intro_video somehow initialized" + str(details.intro_video))
         self.assertIsNone(details.effort, "effort somehow initialized" + str(details.effort))
@@ -90,6 +94,13 @@ class CourseDetailsTestCase(ModuleStoreTestCase):
                 CourseDetails.update_from_json(self.course.id, jsondetails.__dict__, self.user).end_date,
                 jsondetails.end_date
             )
+            jsondetails.certificate_available_date = datetime.datetime(2010, 10, 1, 0, tzinfo=UTC())
+            self.assertEqual(
+                CourseDetails.update_from_json(
+                    self.course.id, jsondetails.__dict__, self.user
+                ).certificate_available_date,
+                jsondetails.certificate_available_date
+            )
             jsondetails.course_image_name = "an_image.jpg"
             self.assertEqual(
                 CourseDetails.update_from_json(self.course.id, jsondetails.__dict__, self.user).course_image_name,
diff --git a/openedx/core/djangoapps/schedules/__init__.py b/openedx/core/djangoapps/schedules/__init__.py
new file mode 100644
index 0000000000..1813393f87
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'openedx.core.djangoapps.schedules.apps.SchedulesConfig'
diff --git a/openedx/core/djangoapps/schedules/admin.py b/openedx/core/djangoapps/schedules/admin.py
new file mode 100644
index 0000000000..dc4cabb732
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/admin.py
@@ -0,0 +1,27 @@
+from django.contrib import admin
+from django.utils.translation import ugettext_lazy as _
+
+from . import models
+
+
+@admin.register(models.Schedule)
+class ScheduleAdmin(admin.ModelAdmin):
+    list_display = ('username', 'course_id', 'active', 'start', 'upgrade_deadline')
+    raw_id_fields = ('enrollment',)
+    readonly_fields = ('modified',)
+    search_fields = ('enrollment__user__username', 'enrollment__course_id',)
+
+    def username(self, obj):
+        return obj.enrollment.user.username
+
+    username.short_description = _('Username')
+
+    def course_id(self, obj):
+        return obj.enrollment.course_id
+
+    course_id.short_description = _('Course ID')
+
+    def get_queryset(self, request):
+        qs = super(ScheduleAdmin, self).get_queryset(request)
+        qs = qs.select_related('enrollment', 'enrollment__user')
+        return qs
diff --git a/openedx/core/djangoapps/schedules/apps.py b/openedx/core/djangoapps/schedules/apps.py
new file mode 100644
index 0000000000..87f6f1321c
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/apps.py
@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class SchedulesConfig(AppConfig):
+    name = 'openedx.core.djangoapps.schedules'
+    verbose_name = _('Schedules')
+
+    def ready(self):
+        # noinspection PyUnresolvedReferences
+        from . import signals  # pylint: disable=unused-variable
diff --git a/openedx/core/djangoapps/schedules/migrations/0001_initial.py b/openedx/core/djangoapps/schedules/migrations/0001_initial.py
new file mode 100644
index 0000000000..61de8d7a32
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/migrations/0001_initial.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django_extensions.db.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('student', '0010_auto_20170207_0458'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Schedule',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
+                ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
+                ('active', models.BooleanField(default=True, help_text='Indicates if this schedule is actively used')),
+                ('start', models.DateTimeField(help_text='Date this schedule went into effect')),
+                ('upgrade_deadline', models.DateTimeField(help_text='Deadline by which the learner must upgrade to a verified seat', null=True, blank=True)),
+                ('enrollment', models.OneToOneField(to='student.CourseEnrollment')),
+            ],
+            options={
+                'verbose_name': 'Schedule',
+                'verbose_name_plural': 'Schedules',
+            },
+        ),
+    ]
diff --git a/openedx/core/djangoapps/schedules/migrations/__init__.py b/openedx/core/djangoapps/schedules/migrations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/djangoapps/schedules/models.py b/openedx/core/djangoapps/schedules/models.py
new file mode 100644
index 0000000000..682b025d0e
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/models.py
@@ -0,0 +1,18 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django_extensions.db.models import TimeStampedModel
+
+
+class Schedule(TimeStampedModel):
+    enrollment = models.OneToOneField('student.CourseEnrollment', null=False)
+    active = models.BooleanField(default=True, help_text=_('Indicates if this schedule is actively used'))
+    start = models.DateTimeField(help_text=_('Date this schedule went into effect'))
+    upgrade_deadline = models.DateTimeField(
+        blank=True,
+        null=True,
+        help_text=_('Deadline by which the learner must upgrade to a verified seat')
+    )
+
+    class Meta(object):
+        verbose_name = _('Schedule')
+        verbose_name_plural = _('Schedules')
diff --git a/openedx/core/djangoapps/schedules/signals.py b/openedx/core/djangoapps/schedules/signals.py
new file mode 100644
index 0000000000..13b139a5f1
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/signals.py
@@ -0,0 +1,70 @@
+import datetime
+import logging
+
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+from django.utils import timezone
+
+from course_modes.models import CourseMode
+from courseware.models import DynamicUpgradeDeadlineConfiguration, CourseDynamicUpgradeDeadlineConfiguration
+from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace
+from student.models import CourseEnrollment
+from .models import Schedule
+
+log = logging.getLogger(__name__)
+
+
+def _get_upgrade_deadline(enrollment):
+    """ Returns the upgrade deadline for the given enrollment.
+
+    The deadline is determined based on the following data (in priority order):
+        1. Course run-specific deadline configuration (CourseDynamicUpgradeDeadlineConfiguration)
+        2. Global deadline configuration (DynamicUpgradeDeadlineConfiguration)
+        3. Verified course mode expiration
+    """
+    course_key = enrollment.course_id
+    upgrade_deadline = None
+
+    try:
+        verified_mode = CourseMode.verified_mode_for_course(course_key)
+        if verified_mode:
+            upgrade_deadline = verified_mode.expiration_datetime
+    except CourseMode.DoesNotExist:
+        pass
+
+    global_config = DynamicUpgradeDeadlineConfiguration.current()
+    if global_config.enabled:
+        delta = global_config.deadline_days
+
+        # Check if the given course has opted out of the feature
+        course_config = CourseDynamicUpgradeDeadlineConfiguration.current(course_key)
+        if course_config.enabled:
+            if course_config.opt_out:
+                return upgrade_deadline
+
+            delta = course_config.deadline_days
+
+        course_overview = CourseOverview.get_from_id(course_key)
+
+        # This represents the first date at which the learner can access the content. This will be the latter of
+        # either the enrollment date or the course's start date.
+        content_availability_date = max(enrollment.created, course_overview.start)
+        cav_based_deadline = content_availability_date + datetime.timedelta(days=delta)
+
+        # If the deadline from above is None, make sure we have a value for comparison
+        upgrade_deadline = upgrade_deadline or datetime.date.max
+
+        # The content availability-based deadline should never occur after the verified mode's
+        # expiration date, if one is set.
+        upgrade_deadline = min(upgrade_deadline, cav_based_deadline)
+
+    return upgrade_deadline
+
+
+@receiver(post_save, sender=CourseEnrollment, dispatch_uid='create_schedule_for_enrollment')
+def create_schedule(sender, **kwargs):
+    if WaffleSwitchNamespace('schedules').is_enabled('enable-create-schedule-receiver') and kwargs['created']:
+        enrollment = kwargs['instance']
+        upgrade_deadline = _get_upgrade_deadline(enrollment)
+        Schedule.objects.create(enrollment=enrollment, start=timezone.now(), upgrade_deadline=upgrade_deadline)
diff --git a/openedx/core/djangoapps/schedules/tests/__init__.py b/openedx/core/djangoapps/schedules/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/djangoapps/schedules/tests/factories.py b/openedx/core/djangoapps/schedules/tests/factories.py
new file mode 100644
index 0000000000..796a35ce5c
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/tests/factories.py
@@ -0,0 +1,12 @@
+import factory
+import pytz
+
+from openedx.core.djangoapps.schedules import models
+
+
+class ScheduleFactory(factory.DjangoModelFactory):
+    class Meta(object):
+        model = models.Schedule
+
+    start = factory.Faker('future_datetime', tzinfo=pytz.UTC)
+    upgrade_deadline = factory.Faker('future_datetime', tzinfo=pytz.UTC)
diff --git a/openedx/core/djangoapps/schedules/tests/test_signals.py b/openedx/core/djangoapps/schedules/tests/test_signals.py
new file mode 100644
index 0000000000..5661c73385
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/tests/test_signals.py
@@ -0,0 +1,24 @@
+from django.test import TestCase
+
+from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace
+from openedx.core.djangolib.testing.utils import skip_unless_lms
+from student.tests.factories import CourseEnrollmentFactory
+from ..models import Schedule
+
+
+@skip_unless_lms
+class CreateScheduleTests(TestCase):
+    def test_create_schedule(self):
+        """ A schedule should be created for every new enrollment if the switch is active. """
+
+        SWITCH_NAME = 'enable-create-schedule-receiver'
+        switch_namesapce = WaffleSwitchNamespace('schedules')
+
+        with switch_namesapce.override(SWITCH_NAME, True):
+            enrollment = CourseEnrollmentFactory()
+            self.assertIsNotNone(enrollment.schedule)
+
+        with switch_namesapce.override(SWITCH_NAME, False):
+            enrollment = CourseEnrollmentFactory()
+            with self.assertRaises(Schedule.DoesNotExist):
+                enrollment.schedule
diff --git a/openedx/core/djangoapps/user_api/accounts/__init__.py b/openedx/core/djangoapps/user_api/accounts/__init__.py
index 5441d168ff..1a1b68fd2f 100644
--- a/openedx/core/djangoapps/user_api/accounts/__init__.py
+++ b/openedx/core/djangoapps/user_api/accounts/__init__.py
@@ -2,6 +2,9 @@
 Account constants
 """
 
+from django.utils.translation import ugettext as _
+
+
 # The minimum and maximum length for the name ("full name") account field
 NAME_MIN_LENGTH = 2
 NAME_MAX_LENGTH = 255
@@ -25,3 +28,63 @@ ALL_USERS_VISIBILITY = 'all_users'
 
 # Indicates the user's preference that all their account information be private.
 PRIVATE_VISIBILITY = 'private'
+
+# Translators: This message is shown when the Unicode usernames are NOT allowed.
+# It is shown to users who attempt to create a new account using invalid characters
+# in the username.
+USERNAME_INVALID_CHARS_ASCII = _(
+    u"Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-)."
+)
+
+# Translators: This message is shown only when the Unicode usernames are allowed.
+# It is shown to users who attempt to create a new account using invalid characters
+# in the username.
+USERNAME_INVALID_CHARS_UNICODE = _(
+    u"Usernames can only contain letters, numerals, and @/./+/-/_ characters."
+)
+
+# Translators: This message is shown to users who attempt to create a new account using
+# an invalid email format.
+EMAIL_INVALID_MSG = _(u'"{email}" is not a valid email address.')
+
+# Translators: This message is shown to users who attempt to create a new
+# account using an username/email associated with an existing account.
+EMAIL_CONFLICT_MSG = _(
+    u"It looks like {email_address} belongs to an existing account. "
+    u"Try again with a different email address."
+)
+USERNAME_CONFLICT_MSG = _(
+    u"It looks like {username} belongs to an existing account. "
+    u"Try again with a different username."
+)
+
+# Translators: This message is shown to users who enter a username/email/password
+# with an inappropriate length (too short or too long).
+USERNAME_BAD_LENGTH_MSG = _(u"Username must be between {min} and {max} characters long.").format(
+    min=USERNAME_MIN_LENGTH, max=USERNAME_MAX_LENGTH
+)
+EMAIL_BAD_LENGTH_MSG = _(u"Enter a valid email address that contains at least {min} characters.").format(
+    min=EMAIL_MIN_LENGTH
+)
+PASSWORD_EMPTY_MSG = _(u"Please enter a password.")
+PASSWORD_BAD_MIN_LENGTH_MSG = _(u"Password is not long enough.")
+PASSWORD_BAD_MAX_LENGTH_MSG = _(u"Password cannot be longer than {max} character.").format(max=PASSWORD_MAX_LENGTH)
+
+# These strings are normally not user-facing.
+USERNAME_BAD_TYPE_MSG = u"Username must be a string."
+EMAIL_BAD_TYPE_MSG = u"Email must be a string."
+PASSWORD_BAD_TYPE_MSG = u"Password must be a string."
+
+# Translators: This message is shown to users who enter a password matching
+# the username they enter(ed).
+PASSWORD_CANT_EQUAL_USERNAME_MSG = _(u"Password cannot be the same as the username.")
+
+# Translators: These messages are shown to users who do not enter information
+# into the required field or enter it incorrectly.
+REQUIRED_FIELD_NAME_MSG = _(u"Please enter your Full Name.")
+REQUIRED_FIELD_CONFIRM_EMAIL_MSG = _(u"The email addresses do not match.")
+REQUIRED_FIELD_COUNTRY_MSG = _(u"Please select your Country.")
+REQUIRED_FIELD_CITY_MSG = _(u"Please enter your City.")
+REQUIRED_FIELD_GOALS_MSG = _(u"Please tell us your goals.")
+REQUIRED_FIELD_LEVEL_OF_EDUCATION_MSG = _(u"Please select your highest level of education completed.")
+REQUIRED_FIELD_MAILING_ADDRESS_MSG = _(u"Please enter your mailing address.")
diff --git a/openedx/core/djangoapps/user_api/accounts/api.py b/openedx/core/djangoapps/user_api/accounts/api.py
index 8fc3fcad65..264106e4dd 100644
--- a/openedx/core/djangoapps/user_api/accounts/api.py
+++ b/openedx/core/djangoapps/user_api/accounts/api.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Programmatic integration point for User API Accounts sub-application
 """
@@ -19,30 +20,19 @@ from util.model_utils import emit_setting_changed_event
 
 from openedx.core.lib.api.view_utils import add_serializer_errors
 
-from ..errors import (
-    AccountUpdateError, AccountValidationError, AccountUsernameInvalid, AccountPasswordInvalid,
-    AccountEmailInvalid, AccountUserAlreadyExists,
-    UserAPIInternalError, UserAPIRequestError, UserNotFound, UserNotAuthorized
-)
-from ..forms import PasswordResetFormNoActive
-from ..helpers import intercept_errors
-
-from . import (
-    EMAIL_MIN_LENGTH, EMAIL_MAX_LENGTH, PASSWORD_MIN_LENGTH, PASSWORD_MAX_LENGTH,
-    USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH
-)
 from .serializers import (
     AccountLegacyProfileSerializer, AccountUserSerializer,
     UserReadOnlySerializer, _visible_fields  # pylint: disable=invalid-name
 )
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx.core.djangoapps.user_api import errors, accounts, forms, helpers
 
 
 # Public access point for this function.
 visible_fields = _visible_fields
 
 
-@intercept_errors(UserAPIInternalError, ignore_errors=[UserAPIRequestError])
+@helpers.intercept_errors(errors.UserAPIInternalError, ignore_errors=[errors.UserAPIRequestError])
 def get_account_settings(request, usernames=None, configuration=None, view=None):
     """Returns account information for a user serialized as JSON.
 
@@ -67,16 +57,17 @@ def get_account_settings(request, usernames=None, configuration=None, view=None)
          A list of users account details.
 
     Raises:
-         UserNotFound: no user with username `username` exists (or `request.user.username` if
+         errors.UserNotFound: no user with username `username` exists (or `request.user.username` if
             `username` is not specified)
-         UserAPIInternalError: the operation failed due to an unexpected error.
+         errors.UserAPIInternalError: the operation failed due to an unexpected error.
+
     """
     requesting_user = request.user
     usernames = usernames or [requesting_user.username]
 
     requested_users = User.objects.select_related('profile').filter(username__in=usernames)
     if not requested_users:
-        raise UserNotFound()
+        raise errors.UserNotFound()
 
     serialized_users = []
     for user in requested_users:
@@ -95,7 +86,7 @@ def get_account_settings(request, usernames=None, configuration=None, view=None)
     return serialized_users
 
 
-@intercept_errors(UserAPIInternalError, ignore_errors=[UserAPIRequestError])
+@helpers.intercept_errors(errors.UserAPIInternalError, ignore_errors=[errors.UserAPIRequestError])
 def update_account_settings(requesting_user, update, username=None):
     """Update user account information.
 
@@ -111,17 +102,18 @@ def update_account_settings(requesting_user, update, username=None):
             `requesting_user.username` is assumed.
 
     Raises:
-        UserNotFound: no user with username `username` exists (or `requesting_user.username` if
+        errors.UserNotFound: no user with username `username` exists (or `requesting_user.username` if
             `username` is not specified)
-        UserNotAuthorized: the requesting_user does not have access to change the account
+        errors.UserNotAuthorized: the requesting_user does not have access to change the account
             associated with `username`
-        AccountValidationError: the update was not attempted because validation errors were found with
+        errors.AccountValidationError: the update was not attempted because validation errors were found with
             the supplied update
-        AccountUpdateError: the update could not be completed. Note that if multiple fields are updated at the same
-            time, some parts of the update may have been successful, even if an AccountUpdateError is returned;
-            in particular, the user account (not including e-mail address) may have successfully been updated,
+        errors.AccountUpdateError: the update could not be completed. Note that if multiple fields are updated at the
+            same time, some parts of the update may have been successful, even if an errors.AccountUpdateError is
+            returned; in particular, the user account (not including e-mail address) may have successfully been updated,
             but then the e-mail change request, which is processed last, may throw an error.
-        UserAPIInternalError: the operation failed due to an unexpected error.
+        errors.UserAPIInternalError: the operation failed due to an unexpected error.
+
     """
     if username is None:
         username = requesting_user.username
@@ -129,7 +121,7 @@ def update_account_settings(requesting_user, update, username=None):
     existing_user, existing_user_profile = _get_user_and_profile(username)
 
     if requesting_user.username != username:
-        raise UserNotAuthorized()
+        raise errors.UserNotAuthorized()
 
     # If user has requested to change email, we must call the multi-step process to handle this.
     # It is not handled by the serializer (which considers email to be read-only).
@@ -179,7 +171,7 @@ def update_account_settings(requesting_user, update, username=None):
 
     # If we have encountered any validation errors, return them to the user.
     if field_errors:
-        raise AccountValidationError(field_errors)
+        raise errors.AccountValidationError(field_errors)
 
     try:
         # If everything validated, go ahead and save the serializers.
@@ -224,40 +216,26 @@ def update_account_settings(requesting_user, update, username=None):
             existing_user_profile.save()
 
     except PreferenceValidationError as err:
-        raise AccountValidationError(err.preference_errors)
+        raise errors.AccountValidationError(err.preference_errors)
     except Exception as err:
-        raise AccountUpdateError(
+        raise errors.AccountUpdateError(
             u"Error thrown when saving account updates: '{}'".format(err.message)
         )
 
     # And try to send the email change request if necessary.
     if changing_email:
         if not settings.FEATURES['ALLOW_EMAIL_ADDRESS_CHANGE']:
-            raise AccountUpdateError(u"Email address changes have been disabled by the site operators.")
+            raise errors.AccountUpdateError(u"Email address changes have been disabled by the site operators.")
         try:
             student_views.do_email_change_request(existing_user, new_email)
         except ValueError as err:
-            raise AccountUpdateError(
+            raise errors.AccountUpdateError(
                 u"Error thrown from do_email_change_request: '{}'".format(err.message),
                 user_message=err.message
             )
 
 
-def _get_user_and_profile(username):
-    """
-    Helper method to return the legacy user and profile objects based on username.
-    """
-    try:
-        existing_user = User.objects.get(username=username)
-    except ObjectDoesNotExist:
-        raise UserNotFound()
-
-    existing_user_profile, _ = UserProfile.objects.get_or_create(user=existing_user)
-
-    return existing_user, existing_user_profile
-
-
-@intercept_errors(UserAPIInternalError, ignore_errors=[UserAPIRequestError])
+@helpers.intercept_errors(errors.UserAPIInternalError, ignore_errors=[errors.UserAPIRequestError])
 @transaction.atomic
 def create_account(username, password, email):
     """Create a new user account.
@@ -291,11 +269,12 @@ def create_account(username, password, email):
         unicode: an activation key for the account.
 
     Raises:
-        AccountUserAlreadyExists
-        AccountUsernameInvalid
-        AccountEmailInvalid
-        AccountPasswordInvalid
-        UserAPIInternalError: the operation failed due to an unexpected error.
+        errors.AccountUserAlreadyExists
+        errors.AccountUsernameInvalid
+        errors.AccountEmailInvalid
+        errors.AccountPasswordInvalid
+        errors.UserAPIInternalError: the operation failed due to an unexpected error.
+
     """
     # Check if ALLOW_PUBLIC_ACCOUNT_CREATION flag turned off to restrict user account creation
     if not configuration_helpers.get_value(
@@ -317,7 +296,7 @@ def create_account(username, password, email):
     try:
         user.save()
     except IntegrityError:
-        raise AccountUserAlreadyExists
+        raise errors.AccountUserAlreadyExists
 
     # Create a registration to track the activation process
     # This implicitly saves the registration.
@@ -350,16 +329,19 @@ def check_account_exists(username=None, email=None):
     """
     conflicts = []
 
-    if email is not None and User.objects.filter(email=email).exists():
+    try:
+        _validate_email_doesnt_exist(email)
+    except errors.AccountEmailAlreadyExists:
         conflicts.append("email")
-
-    if username is not None and User.objects.filter(username=username).exists():
+    try:
+        _validate_username_doesnt_exist(username)
+    except errors.AccountUsernameAlreadyExists:
         conflicts.append("username")
 
     return conflicts
 
 
-@intercept_errors(UserAPIInternalError, ignore_errors=[UserAPIRequestError])
+@helpers.intercept_errors(errors.UserAPIInternalError, ignore_errors=[errors.UserAPIRequestError])
 def activate_account(activation_key):
     """Activate a user's account.
 
@@ -370,20 +352,21 @@ def activate_account(activation_key):
         None
 
     Raises:
-        UserNotAuthorized
-        UserAPIInternalError: the operation failed due to an unexpected error.
+        errors.UserNotAuthorized
+        errors.UserAPIInternalError: the operation failed due to an unexpected error.
+
     """
     try:
         registration = Registration.objects.get(activation_key=activation_key)
     except Registration.DoesNotExist:
-        raise UserNotAuthorized
+        raise errors.UserNotAuthorized
     else:
         # This implicitly saves the registration
         registration.activate()
 
 
-@intercept_errors(UserAPIInternalError, ignore_errors=[UserAPIRequestError])
-def request_password_change(email, orig_host, is_secure):
+@helpers.intercept_errors(errors.UserAPIInternalError, ignore_errors=[errors.UserAPIRequestError])
+def request_password_change(email, is_secure):
     """Email a single-use link for performing a password reset.
 
     Users must confirm the password change before we update their information.
@@ -397,13 +380,14 @@ def request_password_change(email, orig_host, is_secure):
         None
 
     Raises:
-        UserNotFound
+        errors.UserNotFound
         AccountRequestError
-        UserAPIInternalError: the operation failed due to an unexpected error.
+        errors.UserAPIInternalError: the operation failed due to an unexpected error.
+
     """
     # Binding data to a form requires that the data be passed as a dictionary
     # to the Form class constructor.
-    form = PasswordResetFormNoActive({'email': email})
+    form = forms.PasswordResetFormNoActive({'email': email})
 
     # Validate that a user exists with the given email address.
     if form.is_valid():
@@ -411,12 +395,139 @@ def request_password_change(email, orig_host, is_secure):
         # and email it to the user.
         form.save(
             from_email=configuration_helpers.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL),
-            domain_override=orig_host,
             use_https=is_secure
         )
     else:
         # No user with the provided email address exists.
-        raise UserNotFound
+        raise errors.UserNotFound
+
+
+def get_name_validation_error(name):
+    """Get the built-in validation error message for when
+    the user's real name is invalid in some way (we wonder how).
+
+    :param name: The proposed user's real name.
+    :return: Validation error message.
+
+    """
+    return '' if name else accounts.REQUIRED_FIELD_NAME_MSG
+
+
+def get_username_validation_error(username):
+    """Get the built-in validation error message for when
+    the username is invalid in some way.
+
+    :param username: The proposed username (unicode).
+    :param default: The message to default to in case of no error.
+    :return: Validation error message.
+
+    """
+    return _validate(_validate_username, errors.AccountUsernameInvalid, username)
+
+
+def get_email_validation_error(email):
+    """Get the built-in validation error message for when
+    the email is invalid in some way.
+
+    :param email: The proposed email (unicode).
+    :param default: The message to default to in case of no error.
+    :return: Validation error message.
+
+    """
+    return _validate(_validate_email, errors.AccountEmailInvalid, email)
+
+
+def get_confirm_email_validation_error(confirm_email, email):
+    """Get the built-in validation error message for when
+    the confirmation email is invalid in some way.
+
+    :param confirm_email: The proposed confirmation email (unicode).
+    :param email: The email to match (unicode).
+    :param default: THe message to default to in case of no error.
+    :return: Validation error message.
+
+    """
+    return _validate(_validate_confirm_email, errors.AccountEmailInvalid, confirm_email, email)
+
+
+def get_password_validation_error(password, username=None):
+    """Get the built-in validation error message for when
+    the password is invalid in some way.
+
+    :param password: The proposed password (unicode).
+    :param username: The username associated with the user's account (unicode).
+    :param default: The message to default to in case of no error.
+    :return: Validation error message.
+
+    """
+    return _validate(_validate_password, errors.AccountPasswordInvalid, password, username)
+
+
+def get_country_validation_error(country):
+    """Get the built-in validation error message for when
+    the country is invalid in some way.
+
+    :param country: The proposed country.
+    :return: Validation error message.
+
+    """
+    return _validate(_validate_country, errors.AccountCountryInvalid, country)
+
+
+def get_username_existence_validation_error(username):
+    """Get the built-in validation error message for when
+    the username has an existence conflict.
+
+    :param username: The proposed username (unicode).
+    :param default: The message to default to in case of no error.
+    :return: Validation error message.
+
+    """
+    return _validate(_validate_username_doesnt_exist, errors.AccountUsernameAlreadyExists, username)
+
+
+def get_email_existence_validation_error(email):
+    """Get the built-in validation error message for when
+    the email has an existence conflict.
+
+    :param email: The proposed email (unicode).
+    :param default: The message to default to in case of no error.
+    :return: Validation error message.
+
+    """
+    return _validate(_validate_email_doesnt_exist, errors.AccountEmailAlreadyExists, email)
+
+
+def _get_user_and_profile(username):
+    """
+    Helper method to return the legacy user and profile objects based on username.
+    """
+    try:
+        existing_user = User.objects.get(username=username)
+    except ObjectDoesNotExist:
+        raise errors.UserNotFound()
+
+    existing_user_profile, _ = UserProfile.objects.get_or_create(user=existing_user)
+
+    return existing_user, existing_user_profile
+
+
+def _validate(validation_func, err, *args):
+    """Generic validation function that returns default on
+    no errors, but the message associated with the err class
+    otherwise. Passes all other arguments into the validation function.
+
+    :param validation_func: The function used to perform validation.
+    :param err: The error class to catch.
+    :param args: The arguments to pass into the validation function.
+    :return: Validation error message, or empty string if no error.
+
+    """
+    try:
+        validation_func(*args)
+    except err as validation_err:
+        return validation_err.message
+    return ''
 
 
 def _validate_username(username):
@@ -429,36 +540,62 @@ def _validate_username(username):
         None
 
     Raises:
-        AccountUsernameInvalid
+        errors.AccountUsernameInvalid
 
     """
-    if not isinstance(username, basestring):
-        raise AccountUsernameInvalid(u"Username must be a string")
-
-    if len(username) < USERNAME_MIN_LENGTH:
-        raise AccountUsernameInvalid(
-            u"Username '{username}' must be at least {min} characters long".format(
-                username=username,
-                min=USERNAME_MIN_LENGTH
-            )
-        )
-    if len(username) > USERNAME_MAX_LENGTH:
-        raise AccountUsernameInvalid(
-            u"Username '{username}' must be at most {max} characters long".format(
-                username=username,
-                max=USERNAME_MAX_LENGTH
-            )
-        )
     try:
+        _validate_unicode(username)
+        _validate_type(username, basestring, accounts.USERNAME_BAD_TYPE_MSG)
+        _validate_length(
+            username,
+            accounts.USERNAME_MIN_LENGTH,
+            accounts.USERNAME_MAX_LENGTH,
+            accounts.USERNAME_BAD_LENGTH_MSG
+        )
         with override_language('en'):
             # `validate_username` provides a proper localized message, however the API needs only the English
             # message by convention.
             student_forms.validate_username(username)
-    except ValidationError as error:
-        raise AccountUsernameInvalid(error.message)
+    except (UnicodeError, errors.AccountDataBadType, errors.AccountDataBadLength, ValidationError) as username_err:
+        raise errors.AccountUsernameInvalid(username_err.message)
 
 
-def _validate_password(password, username):
+def _validate_email(email):
+    """Validate the format of the email address.
+
+    Arguments:
+        email (unicode): The proposed email.
+
+    Returns:
+        None
+
+    Raises:
+        errors.AccountEmailInvalid
+
+    """
+    try:
+        _validate_unicode(email)
+        _validate_type(email, basestring, accounts.EMAIL_BAD_TYPE_MSG)
+        _validate_length(email, accounts.EMAIL_MIN_LENGTH, accounts.EMAIL_MAX_LENGTH, accounts.EMAIL_BAD_LENGTH_MSG)
+        validate_email.message = accounts.EMAIL_INVALID_MSG.format(email=email)
+        validate_email(email)
+    except (UnicodeError, errors.AccountDataBadType, errors.AccountDataBadLength, ValidationError) as invalid_email_err:
+        raise errors.AccountEmailInvalid(invalid_email_err.message)
+
+
+def _validate_confirm_email(confirm_email, email):
+    """Validate the confirmation email field.
+
+    :param confirm_email: The proposed confirmation email. (unicode)
+    :param email: The email to match. (unicode)
+    :return: None
+
+    """
+    if not confirm_email or confirm_email != email:
+        raise errors.AccountEmailInvalid(accounts.REQUIRED_FIELD_CONFIRM_EMAIL_MSG)
+
+
+def _validate_password(password, username=None):
     """Validate the format of the user's password.
 
     Passwords cannot be the same as the username of the account,
@@ -472,65 +609,116 @@ def _validate_password(password, username):
         None
 
     Raises:
-        AccountPasswordInvalid
+        errors.AccountPasswordInvalid
 
     """
-    if not isinstance(password, basestring):
-        raise AccountPasswordInvalid(u"Password must be a string")
-
-    if len(password) < PASSWORD_MIN_LENGTH:
-        raise AccountPasswordInvalid(
-            u"Password must be at least {min} characters long".format(
-                min=PASSWORD_MIN_LENGTH
-            )
-        )
-
-    if len(password) > PASSWORD_MAX_LENGTH:
-        raise AccountPasswordInvalid(
-            u"Password must be at most {max} characters long".format(
-                max=PASSWORD_MAX_LENGTH
-            )
-        )
-
-    if password == username:
-        raise AccountPasswordInvalid(u"Password cannot be the same as the username")
-
-
-def _validate_email(email):
-    """Validate the format of the email address.
-
-    Arguments:
-        email (unicode): The proposed email.
-
-    Returns:
-        None
-
-    Raises:
-        AccountEmailInvalid
-
-    """
-    if not isinstance(email, basestring):
-        raise AccountEmailInvalid(u"Email must be a string")
-
-    if len(email) < EMAIL_MIN_LENGTH:
-        raise AccountEmailInvalid(
-            u"Email '{email}' must be at least {min} characters long".format(
-                email=email,
-                min=EMAIL_MIN_LENGTH
-            )
-        )
-
-    if len(email) > EMAIL_MAX_LENGTH:
-        raise AccountEmailInvalid(
-            u"Email '{email}' must be at most {max} characters long".format(
-                email=email,
-                max=EMAIL_MAX_LENGTH
-            )
-        )
-
     try:
-        validate_email(email)
-    except ValidationError:
-        raise AccountEmailInvalid(
-            u"Email '{email}' format is not valid".format(email=email)
-        )
+        _validate_type(password, basestring, accounts.PASSWORD_BAD_TYPE_MSG)
+
+        if len(password) == 0:
+            raise errors.AccountPasswordInvalid(accounts.PASSWORD_EMPTY_MSG)
+        elif len(password) < accounts.PASSWORD_MIN_LENGTH:
+            raise errors.AccountPasswordInvalid(accounts.PASSWORD_BAD_MIN_LENGTH_MSG)
+        elif len(password) > accounts.PASSWORD_MAX_LENGTH:
+            raise errors.AccountPasswordInvalid(accounts.PASSWORD_BAD_MAX_LENGTH_MSG)
+
+        _validate_password_works_with_username(password, username)
+    except (errors.AccountDataBadType, errors.AccountDataBadLength) as invalid_password_err:
+        raise errors.AccountPasswordInvalid(invalid_password_err.message)
+
+
+def _validate_country(country):
+    """Validate the country selection.
+
+    :param country: The proposed country.
+    :return: None
+
+    """
+    if country == '' or country == '--':
+        raise errors.AccountCountryInvalid(accounts.REQUIRED_FIELD_COUNTRY_MSG)
+
+
+def _validate_username_doesnt_exist(username):
+    """Validate that the username is not associated with an existing user.
+
+    :param username: The proposed username (unicode).
+    :return: None
+    :raises: errors.AccountUsernameAlreadyExists
+    """
+    if username is not None and User.objects.filter(username=username).exists():
+        raise errors.AccountUsernameAlreadyExists(_(accounts.USERNAME_CONFLICT_MSG).format(username=username))
+
+
+def _validate_email_doesnt_exist(email):
+    """Validate that the email is not associated with an existing user.
+
+    :param email: The proposed email (unicode).
+    :return: None
+    :raises: errors.AccountEmailAlreadyExists
+    """
+    if email is not None and User.objects.filter(email=email).exists():
+        raise errors.AccountEmailAlreadyExists(_(accounts.EMAIL_CONFLICT_MSG).format(email_address=email))
+
+
+def _validate_password_works_with_username(password, username=None):
+    """Run validation checks on whether the password and username
+    go well together.
+
+    An example check is to see whether they are the same.
+
+    :param password: The proposed password (unicode).
+    :param username: The username associated with the user's account (unicode).
+    :return: None
+    :raises: errors.AccountPasswordInvalid
+    """
+    if password == username:
+        raise errors.AccountPasswordInvalid(accounts.PASSWORD_CANT_EQUAL_USERNAME_MSG)
+
+
+def _validate_type(data, type, err):
+    """Checks whether the input data is of type. If not,
+    throws a generic error message.
+
+    :param data: The data to check.
+    :param type: The type to check against.
+    :param err: The error message to throw back if data is not of type.
+    :return: None
+    :raises: errors.AccountDataBadType
+
+    """
+    if not isinstance(data, type):
+        raise errors.AccountDataBadType(err)
+
+
+def _validate_length(data, min, max, err):
+    """Validate that the data's length is less than or equal to max,
+    and greater than or equal to min.
+
+    :param data: The data to do the test on.
+    :param min: The minimum allowed length.
+    :param max: The maximum allowed length.
+    :param err: The error message to throw back if data's length is below min or above max.
+    :return: None
+    :raises: errors.AccountDataBadLength
+
+    """
+    if len(data) < min or len(data) > max:
+        raise errors.AccountDataBadLength(err)
+
+
+def _validate_unicode(data, err=u"Input not valid unicode"):
+    """Checks whether the input data is valid unicode or not.
+
+    :param data: The data to check for unicode validity.
+    :param err: The error message to throw back if unicode is invalid.
+    :return: None
+    :raises: UnicodeError
+
+    """
+    try:
+        if not isinstance(data, str) and not isinstance(data, unicode):
+            raise UnicodeError(err)
+        # In some cases we pass the above, but it's still inappropriate utf-8.
+        unicode(data)
+    except UnicodeError:
+        raise UnicodeError(err)
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
index 129cf9883e..008ff705eb 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
@@ -3,6 +3,7 @@
 Unit tests for behavior that is specific to the api methods (vs. the view methods).
 Most of the functionality is covered in test_views.py.
 """
+
 import re
 import ddt
 from dateutil.parser import parse as parse_datetime
@@ -17,17 +18,29 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.core import mail
 from django.test.client import RequestFactory
+from openedx.core.djangoapps.user_api.accounts import (
+    USERNAME_MAX_LENGTH,
+    PRIVATE_VISIBILITY
+)
+from openedx.core.djangoapps.user_api.accounts.api import (
+    get_account_settings,
+    update_account_settings,
+    create_account,
+    activate_account,
+    request_password_change
+)
+from openedx.core.djangoapps.user_api.errors import (
+    UserNotFound, UserNotAuthorized,
+    AccountUpdateError, AccountValidationError, AccountUserAlreadyExists,
+    AccountUsernameInvalid, AccountEmailInvalid, AccountPasswordInvalid,
+    AccountRequestError
+)
+from openedx.core.djangoapps.user_api.accounts.tests.testutils import (
+    INVALID_EMAILS, INVALID_PASSWORDS, INVALID_USERNAMES, VALID_USERNAMES_UNICODE
+)
 from openedx.core.djangolib.testing.utils import skip_unless_lms
 from student.models import PendingEmailChange
 from student.tests.tests import UserSettingsEventTestMixin
-from ...errors import (
-    UserNotFound, UserNotAuthorized, AccountUpdateError, AccountValidationError,
-    AccountUserAlreadyExists, AccountUsernameInvalid, AccountEmailInvalid, AccountPasswordInvalid, AccountRequestError
-)
-from ..api import (
-    get_account_settings, update_account_settings, create_account, activate_account, request_password_change
-)
-from .. import USERNAME_MAX_LENGTH, EMAIL_MAX_LENGTH, PASSWORD_MAX_LENGTH, PRIVATE_VISIBILITY
 
 
 def mock_render_to_string(template_name, context):
@@ -307,43 +320,8 @@ class AccountCreationActivationAndPasswordChangeTest(TestCase):
     PASSWORD = u'ṕáśśẃőŕd'
     EMAIL = u'frank+underwood@example.com'
 
-    ORIG_HOST = 'example.com'
     IS_SECURE = False
 
-    INVALID_USERNAMES = [
-        None,
-        u'',
-        u'a',
-        u'a' * (USERNAME_MAX_LENGTH + 1),
-        u'invalid_symbol_@',
-        u'invalid-unicode_fŕáńḱ',
-    ]
-
-    INVALID_EMAILS = [
-        None,
-        u'',
-        u'a',
-        'no_domain',
-        'no+domain',
-        '@',
-        '@domain.com',
-        'test@no_extension',
-        u'fŕáńḱ@example.com',
-
-        # Long email -- subtract the length of the @domain
-        # except for one character (so we exceed the max length limit)
-        u'{user}@example.com'.format(
-            user=(u'e' * (EMAIL_MAX_LENGTH - 11))
-        )
-    ]
-
-    INVALID_PASSWORDS = [
-        None,
-        u'',
-        u'a',
-        u'a' * (PASSWORD_MAX_LENGTH + 1)
-    ]
-
     @skip_unless_lms
     def test_activate_account(self):
         # Create the account, which is initially inactive
@@ -411,7 +389,7 @@ class AccountCreationActivationAndPasswordChangeTest(TestCase):
         activate_account(activation_key)
 
         # Request a password change
-        request_password_change(self.EMAIL, self.ORIG_HOST, self.IS_SECURE)
+        request_password_change(self.EMAIL, self.IS_SECURE)
 
         # Verify that one email message has been sent
         self.assertEqual(len(mail.outbox), 1)
@@ -425,7 +403,7 @@ class AccountCreationActivationAndPasswordChangeTest(TestCase):
     @skip_unless_lms
     def test_request_password_change_invalid_user(self):
         with self.assertRaises(UserNotFound):
-            request_password_change(self.EMAIL, self.ORIG_HOST, self.IS_SECURE)
+            request_password_change(self.EMAIL, self.IS_SECURE)
 
         # Verify that no email messages have been sent
         self.assertEqual(len(mail.outbox), 0)
@@ -435,7 +413,7 @@ class AccountCreationActivationAndPasswordChangeTest(TestCase):
         # Create an account, but do not activate it
         create_account(self.USERNAME, self.PASSWORD, self.EMAIL)
 
-        request_password_change(self.EMAIL, self.ORIG_HOST, self.IS_SECURE)
+        request_password_change(self.EMAIL, self.IS_SECURE)
 
         # Verify that the activation email was still sent
         self.assertEqual(len(mail.outbox), 1)
@@ -471,14 +449,7 @@ class AccountCreationUnicodeUsernameTest(TestCase):
     PASSWORD = u'unicode-user-password'
     EMAIL = u'unicode-user-username@example.com'
 
-    UNICODE_USERNAMES = [
-        u'Enchanté',
-        u'username_with_@',
-        u'username with spaces',
-        u'eastern_arabic_numbers_١٢٣',
-    ]
-
-    @ddt.data(*UNICODE_USERNAMES)
+    @ddt.data(*VALID_USERNAMES_UNICODE)
     def test_unicode_usernames(self, unicode_username):
         with patch.dict(settings.FEATURES, {'ENABLE_UNICODE_USERNAME': False}):
             with self.assertRaises(AccountUsernameInvalid):
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/testutils.py b/openedx/core/djangoapps/user_api/accounts/tests/testutils.py
new file mode 100644
index 0000000000..10b65ac703
--- /dev/null
+++ b/openedx/core/djangoapps/user_api/accounts/tests/testutils.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+"""
+Utility functions, constants, etc. for testing.
+"""
+
+from openedx.core.djangoapps.user_api.accounts import (
+    USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH,
+    EMAIL_MAX_LENGTH,
+    PASSWORD_MIN_LENGTH, PASSWORD_MAX_LENGTH
+)
+
+
+INVALID_NAMES = [
+    None,
+    '',
+    u''
+]
+
+INVALID_USERNAMES_ASCII = [
+    '$invalid-ascii$',
+    'invalid-fŕáńḱ',
+    '@invalid-ascii@'
+]
+
+INVALID_USERNAMES_UNICODE = [
+    u'invalid-unicode_fŕáńḱ',
+]
+
+INVALID_USERNAMES = [
+    None,
+    u'',
+    u'a',
+    u'a' * (USERNAME_MAX_LENGTH + 1),
+] + INVALID_USERNAMES_ASCII + INVALID_USERNAMES_UNICODE
+
+INVALID_EMAILS = [
+    None,
+    u'',
+    u'a',
+    'no_domain',
+    'no+domain',
+    '@',
+    '@domain.com',
+    'test@no_extension',
+    u'fŕáńḱ@example.com',
+
+    # Long email -- subtract the length of the @domain
+    # except for one character (so we exceed the max length limit)
+    u'{user}@example.com'.format(
+        user=(u'e' * (EMAIL_MAX_LENGTH - 11))
+    )
+]
+
+INVALID_PASSWORDS = [
+    None,
+    u'',
+    u'a',
+    u'a' * (PASSWORD_MAX_LENGTH + 1)
+]
+
+INVALID_COUNTRIES = [
+    None,
+    "",
+    "--"
+]
+
+VALID_NAMES = [
+    'Validation Bot',
+    u'Validation Bot'
+]
+
+VALID_USERNAMES_UNICODE = [
+    u'Enchanté',
+    u'username_with_@',
+    u'username with spaces',
+    u'eastern_arabic_numbers_١٢٣',
+]
+
+VALID_USERNAMES = [
+    u'username',
+    u'a' * USERNAME_MIN_LENGTH,
+    u'a' * USERNAME_MAX_LENGTH,
+    u'-' * USERNAME_MIN_LENGTH,
+    u'-' * USERNAME_MAX_LENGTH,
+    u'_username_',
+    u'-username-',
+    u'-_username_-'
+]
+
+VALID_EMAILS = [
+    'has@domain.com'
+]
+
+VALID_PASSWORDS = [
+    u'password',  # :)
+    u'a' * PASSWORD_MIN_LENGTH,
+    u'a' * PASSWORD_MAX_LENGTH
+]
+
+VALID_COUNTRIES = [
+    u'PK',
+    u'Pakistan',
+    u'US'
+]
diff --git a/openedx/core/djangoapps/user_api/course_tag/tests/test_api.py b/openedx/core/djangoapps/user_api/course_tag/tests/test_api.py
index 353a5a8031..2a55df15f1 100644
--- a/openedx/core/djangoapps/user_api/course_tag/tests/test_api.py
+++ b/openedx/core/djangoapps/user_api/course_tag/tests/test_api.py
@@ -6,7 +6,7 @@ from django.test import TestCase
 from student.tests.factories import UserFactory
 from nose.plugins.attrib import attr
 from openedx.core.djangoapps.user_api.course_tag import api as course_tag_api
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 
 @attr(shard=2)
@@ -17,7 +17,7 @@ class TestCourseTagAPI(TestCase):
     def setUp(self):
         super(TestCourseTagAPI, self).setUp()
         self.user = UserFactory.create()
-        self.course_id = SlashSeparatedCourseKey('test_org', 'test_course_number', 'test_run')
+        self.course_id = CourseLocator('test_org', 'test_course_number', 'test_run')
         self.test_key = 'test_key'
 
     def test_get_set_course_tag(self):
diff --git a/openedx/core/djangoapps/user_api/errors.py b/openedx/core/djangoapps/user_api/errors.py
index 1930d31365..c2fee3583f 100644
--- a/openedx/core/djangoapps/user_api/errors.py
+++ b/openedx/core/djangoapps/user_api/errors.py
@@ -33,6 +33,16 @@ class AccountUserAlreadyExists(AccountRequestError):
     pass
 
 
+class AccountUsernameAlreadyExists(AccountRequestError):
+    """User with the same username already exists. """
+    pass
+
+
+class AccountEmailAlreadyExists(AccountRequestError):
+    """User with the same email already exists. """
+    pass
+
+
 class AccountUsernameInvalid(AccountRequestError):
     """The requested username is not in a valid format. """
     pass
@@ -48,6 +58,21 @@ class AccountPasswordInvalid(AccountRequestError):
     pass
 
 
+class AccountCountryInvalid(AccountRequestError):
+    """The requested country does not exist. """
+    pass
+
+
+class AccountDataBadLength(AccountRequestError):
+    """The requested account data is either too short or too long. """
+    pass
+
+
+class AccountDataBadType(AccountRequestError):
+    """The requested account data is of the wrong type. """
+    pass
+
+
 class AccountUpdateError(AccountRequestError):
     """
     An update to the account failed. More detailed information is present in developer_message,
diff --git a/openedx/core/djangoapps/user_api/tests/factories.py b/openedx/core/djangoapps/user_api/tests/factories.py
index 14fd9ac934..a4dcda6e76 100644
--- a/openedx/core/djangoapps/user_api/tests/factories.py
+++ b/openedx/core/djangoapps/user_api/tests/factories.py
@@ -2,7 +2,7 @@
 from factory.django import DjangoModelFactory
 from factory import SubFactory
 from student.tests.factories import UserFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locator import CourseLocator
 
 from ..models import UserPreference, UserCourseTag, UserOrgTag
 
@@ -23,7 +23,7 @@ class UserCourseTagFactory(DjangoModelFactory):
         model = UserCourseTag
 
     user = SubFactory(UserFactory)
-    course_id = SlashSeparatedCourseKey('org', 'course', 'run')
+    course_id = CourseLocator('org', 'course', 'run')
     key = None
     value = None
 
diff --git a/openedx/core/djangoapps/user_api/tests/test_helpers.py b/openedx/core/djangoapps/user_api/tests/test_helpers.py
index 2e4cc66fb0..d5babff60c 100644
--- a/openedx/core/djangoapps/user_api/tests/test_helpers.py
+++ b/openedx/core/djangoapps/user_api/tests/test_helpers.py
@@ -60,7 +60,7 @@ class InterceptErrorsTest(TestCase):
             u"keyword arguments '{{'raise_error': <class '{}'>}}' "
             u"from File \"{}\", line XXX, in test_logs_errors\n"
             u"    intercepted_function(raise_error=FakeInputException): FakeInputException()"
-        ).format(exception, __file__)
+        ).format(exception, __file__.rstrip('c'))
 
         # Verify that the raised exception has the error message
         try:
diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py
index 389407bb6b..659eda012c 100644
--- a/openedx/core/djangoapps/user_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/tests/test_views.py
@@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse
 from django.test.client import RequestFactory
 from django.test.testcases import TransactionTestCase
 from django.test.utils import override_settings
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from pytz import common_timezones_set, UTC
 from social_django.models import UserSocialAuth, Partial
 
@@ -31,10 +31,9 @@ from third_party_auth.tests.utils import (
 from .test_helpers import TestCaseForm
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
-from ..helpers import FormDescription
 from ..accounts import (
     NAME_MAX_LENGTH, EMAIL_MIN_LENGTH, EMAIL_MAX_LENGTH, PASSWORD_MIN_LENGTH, PASSWORD_MAX_LENGTH,
-    USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH
+    USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH, USERNAME_BAD_LENGTH_MSG
 )
 from ..accounts.api import get_account_settings
 from ..models import UserOrgTag
@@ -100,8 +99,8 @@ class EmptyUserTestCase(UserAPITestCase):
 
 class EmptyRoleTestCase(UserAPITestCase):
     """Test that the endpoint supports empty result sets"""
-    course_id = SlashSeparatedCourseKey.from_deprecated_string("org/course/run")
-    LIST_URI = ROLE_LIST_URI + "?course_id=" + course_id.to_deprecated_string()
+    course_id = CourseKey.from_string("org/course/run")
+    LIST_URI = ROLE_LIST_URI + "?course_id=" + unicode(course_id)
 
     def test_get_list_empty(self):
         """Test that the endpoint properly returns empty result sets"""
@@ -136,8 +135,8 @@ class RoleTestCase(UserApiTestCase):
     """
     Test cases covering Role-related views and their behaviors
     """
-    course_id = SlashSeparatedCourseKey.from_deprecated_string("org/course/run")
-    LIST_URI = ROLE_LIST_URI + "?course_id=" + course_id.to_deprecated_string()
+    course_id = CourseKey.from_string("org/course/run")
+    LIST_URI = ROLE_LIST_URI + "?course_id=" + unicode(course_id)
 
     def setUp(self):
         super(RoleTestCase, self).setUp()
@@ -610,7 +609,6 @@ class LoginSessionViewTest(UserAPITestCase):
                 "placeholder": "",
                 "instructions": "",
                 "restrictions": {
-                    "min_length": PASSWORD_MIN_LENGTH,
                     "max_length": PASSWORD_MAX_LENGTH
                 },
                 "errorMessages": {},
@@ -1199,6 +1197,9 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
                     {"value": "none", "name": "No formal education", "default": False},
                     {"value": "other", "name": "Other education", "default": False},
                 ],
+                "errorMessages": {
+                    "required": "Please select your highest level of education completed."
+                }
             }
         )
 
@@ -1225,6 +1226,9 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
                     {"value": "none", "name": "No formal education TRANSLATED", "default": False},
                     {"value": "other", "name": "Other education TRANSLATED", "default": False},
                 ],
+                "errorMessages": {
+                    "required": "Please select your highest level of education completed."
+                }
             }
         )
 
@@ -1302,6 +1306,9 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
                 "type": "textarea",
                 "required": False,
                 "label": "Mailing address",
+                "errorMessages": {
+                    "required": "Please enter your mailing address."
+                }
             }
         )
 
@@ -1314,7 +1321,10 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
                 "required": False,
                 "label": u"Tell us why you're interested in {platform_name}".format(
                     platform_name=settings.PLATFORM_NAME
-                )
+                ),
+                "errorMessages": {
+                    "required": "Please tell us your goals."
+                }
             }
         )
 
@@ -1326,6 +1336,9 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
                 "type": "text",
                 "required": False,
                 "label": "City",
+                "errorMessages": {
+                    "required": "Please enter your City."
+                }
             }
         )
 
@@ -1993,8 +2006,8 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
         self.assertEqual(
             response_json,
             {
-                "username": [{"user_message": "Username must be minimum of two characters long"}],
-                "password": [{"user_message": "A valid password is required"}],
+                u"username": [{u"user_message": USERNAME_BAD_LENGTH_MSG}],
+                u"password": [{u"user_message": u"A valid password is required"}],
             }
         )
 
diff --git a/openedx/core/djangoapps/user_api/urls.py b/openedx/core/djangoapps/user_api/urls.py
index 38891f488e..ad11c09998 100644
--- a/openedx/core/djangoapps/user_api/urls.py
+++ b/openedx/core/djangoapps/user_api/urls.py
@@ -9,6 +9,7 @@ from ..profile_images.views import ProfileImageView
 from .accounts.views import AccountDeactivationView, AccountViewSet
 from .preferences.views import PreferencesDetailView, PreferencesView
 from .verification_api.views import PhotoVerificationStatusView
+from .validation.views import RegistrationValidationView
 
 ME = AccountViewSet.as_view({
     'get': 'get',
@@ -25,9 +26,21 @@ ACCOUNT_DETAIL = AccountViewSet.as_view({
 
 urlpatterns = patterns(
     '',
-    url(r'^v1/me$', ME, name='own_username_api'),
-    url(r'^v1/accounts/{}$'.format(settings.USERNAME_PATTERN), ACCOUNT_DETAIL, name='accounts_api'),
-    url(r'^v1/accounts$', ACCOUNT_LIST, name='accounts_detail_api'),
+    url(
+        r'^v1/me$',
+        ME,
+        name='own_username_api'
+    ),
+    url(
+        r'^v1/accounts$',
+        ACCOUNT_LIST,
+        name='accounts_detail_api'
+    ),
+    url(
+        r'^v1/accounts/{}$'.format(settings.USERNAME_PATTERN),
+        ACCOUNT_DETAIL,
+        name='accounts_api'
+    ),
     url(
         r'^v1/accounts/{}/image$'.format(settings.USERNAME_PATTERN),
         ProfileImageView.as_view(),
@@ -43,6 +56,11 @@ urlpatterns = patterns(
         PhotoVerificationStatusView.as_view(),
         name='verification_status'
     ),
+    url(
+        r'^v1/validation/registration$',
+        RegistrationValidationView.as_view(),
+        name='registration_validation'
+    ),
     url(
         r'^v1/preferences/{}$'.format(settings.USERNAME_PATTERN),
         PreferencesView.as_view(),
diff --git a/openedx/core/djangoapps/user_api/validation/__init__.py b/openedx/core/djangoapps/user_api/validation/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/djangoapps/user_api/validation/tests/__init__.py b/openedx/core/djangoapps/user_api/validation/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/djangoapps/user_api/validation/tests/test_views.py b/openedx/core/djangoapps/user_api/validation/tests/test_views.py
new file mode 100644
index 0000000000..5ff294a041
--- /dev/null
+++ b/openedx/core/djangoapps/user_api/validation/tests/test_views.py
@@ -0,0 +1,196 @@
+# -*- coding: utf-8 -*-
+"""
+Tests for an API endpoint for client-side user data validation.
+"""
+
+import unittest
+
+import ddt
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+
+from openedx.core.djangoapps.user_api import accounts
+from openedx.core.djangoapps.user_api.accounts.tests import testutils
+from openedx.core.lib.api import test_utils
+
+
+@ddt.ddt
+class RegistrationValidationViewTests(test_utils.ApiTestCase):
+    """
+    Tests for validity of user data in registration forms.
+    """
+
+    endpoint_name = 'registration_validation'
+    path = reverse(endpoint_name)
+
+    def get_validation_decision(self, data):
+        response = self.client.post(self.path, data)
+        return response.data.get('validation_decisions', {})
+
+    def assertValidationDecision(self, data, decision):
+        self.assertEqual(
+            self.get_validation_decision(data),
+            decision
+        )
+
+    def assertNotValidationDecision(self, data, decision):
+        self.assertNotEqual(
+            self.get_validation_decision(data),
+            decision
+        )
+
+    def test_no_decision_for_empty_request(self):
+        self.assertValidationDecision(
+            {},
+            {}
+        )
+
+    def test_no_decision_for_invalid_request(self):
+        self.assertValidationDecision(
+            {'invalid_field': 'random_user_data'},
+            {}
+        )
+
+    @ddt.data(
+        ['name', (name for name in testutils.VALID_NAMES)],
+        ['email', (email for email in testutils.VALID_EMAILS)],
+        ['password', (password for password in testutils.VALID_PASSWORDS)],
+        ['username', (username for username in testutils.VALID_USERNAMES)],
+        ['country', (country for country in testutils.VALID_COUNTRIES)]
+    )
+    @ddt.unpack
+    def test_positive_validation_decision(self, form_field_name, user_data):
+        """
+        Test if {0} as any item in {1} gives a positive validation decision.
+        """
+        self.assertValidationDecision(
+            {form_field_name: user_data},
+            {form_field_name: ''}
+        )
+
+    @ddt.data(
+        # Skip None type for invalidity checks.
+        ['name', (name for name in testutils.INVALID_NAMES[1:])],
+        ['email', (email for email in testutils.INVALID_EMAILS[1:])],
+        ['password', (password for password in testutils.INVALID_PASSWORDS[1:])],
+        ['username', (username for username in testutils.INVALID_USERNAMES[1:])],
+        ['country', (country for country in testutils.INVALID_COUNTRIES[1:])]
+    )
+    @ddt.unpack
+    def test_negative_validation_decision(self, form_field_name, user_data):
+        """
+        Test if {0} as any item in {1} gives a negative validation decision.
+        """
+        self.assertNotValidationDecision(
+            {form_field_name: user_data},
+            {form_field_name: ''}
+        )
+
+    @ddt.data(
+        ['username', 'username@email.com'],  # No conflict
+        ['user', 'username@email.com'],  # Username conflict
+        ['username', 'user@email.com'],  # Email conflict
+        ['user', 'user@email.com']  # Both conflict
+    )
+    @ddt.unpack
+    def test_existence_conflict(self, username, email):
+        """
+        Test if username '{0}' and email '{1}' have conflicts with
+        username 'user' and email 'user@email.com'.
+        """
+        user = User.objects.create_user(username='user', email='user@email.com')
+        self.assertValidationDecision(
+            {
+                'username': username,
+                'email': email
+            },
+            {
+                "username": accounts.USERNAME_CONFLICT_MSG.format(
+                    username=user.username
+                ) if username == user.username else '',
+                "email": accounts.EMAIL_CONFLICT_MSG.format(
+                    email_address=user.email
+                ) if email == user.email else ''
+            }
+        )
+
+    @ddt.data('', ('e' * accounts.EMAIL_MAX_LENGTH) + '@email.com')
+    def test_email_bad_length_validation_decision(self, email):
+        self.assertValidationDecision(
+            {'email': email},
+            {'email': accounts.EMAIL_BAD_LENGTH_MSG}
+        )
+
+    def test_email_generically_invalid_validation_decision(self):
+        email = 'email'
+        self.assertValidationDecision(
+            {'email': email},
+            {'email': accounts.EMAIL_INVALID_MSG.format(email=email)}
+        )
+
+    def test_confirm_email_matches_email(self):
+        email = 'user@email.com'
+        self.assertValidationDecision(
+            {'email': email, 'confirm_email': email},
+            {'email': '', 'confirm_email': ''}
+        )
+
+    @ddt.data('', 'users@other.email')
+    def test_confirm_email_doesnt_equal_email(self, confirm_email):
+        self.assertValidationDecision(
+            {'email': 'user@email.com', 'confirm_email': confirm_email},
+            {'email': '', 'confirm_email': accounts.REQUIRED_FIELD_CONFIRM_EMAIL_MSG}
+        )
+
+    @ddt.data(
+        'u' * (accounts.USERNAME_MIN_LENGTH - 1),
+        'u' * (accounts.USERNAME_MAX_LENGTH + 1)
+    )
+    def test_username_bad_length_validation_decision(self, username):
+        self.assertValidationDecision(
+            {'username': username},
+            {'username': accounts.USERNAME_BAD_LENGTH_MSG}
+        )
+
+    @unittest.skipUnless(settings.FEATURES.get("ENABLE_UNICODE_USERNAME"), "Unicode usernames disabled.")
+    @ddt.data(*testutils.INVALID_USERNAMES_UNICODE)
+    def test_username_invalid_unicode_validation_decision(self, username):
+        self.assertValidationDecision(
+            {'username': username},
+            {'username': accounts.USERNAME_INVALID_CHARS_UNICODE}
+        )
+
+    @unittest.skipIf(settings.FEATURES.get("ENABLE_UNICODE_USERNAME"), "Unicode usernames enabled.")
+    @ddt.data(*testutils.INVALID_USERNAMES_ASCII)
+    def test_username_invalid_ascii_validation_decision(self, username):
+        self.assertValidationDecision(
+            {'username': username},
+            {"username": accounts.USERNAME_INVALID_CHARS_ASCII}
+        )
+
+    def test_password_empty_validation_decision(self):
+        self.assertValidationDecision(
+            {'password': ''},
+            {"password": accounts.PASSWORD_EMPTY_MSG}
+        )
+
+    def test_password_bad_min_length_validation_decision(self):
+        password = 'p' * (accounts.PASSWORD_MIN_LENGTH - 1)
+        self.assertValidationDecision(
+            {'password': password},
+            {"password": accounts.PASSWORD_BAD_MIN_LENGTH_MSG}
+        )
+
+    def test_password_bad_max_length_validation_decision(self):
+        password = 'p' * (accounts.PASSWORD_MAX_LENGTH + 1)
+        self.assertValidationDecision(
+            {'password': password},
+            {"password": accounts.PASSWORD_BAD_MAX_LENGTH_MSG}
+        )
+
+    def test_password_equals_username_validation_decision(self):
+        self.assertValidationDecision(
+            {"username": "somephrase", "password": "somephrase"},
+            {"username": "", "password": accounts.PASSWORD_CANT_EQUAL_USERNAME_MSG}
+        )
diff --git a/openedx/core/djangoapps/user_api/validation/views.py b/openedx/core/djangoapps/user_api/validation/views.py
new file mode 100644
index 0000000000..1265c27cb4
--- /dev/null
+++ b/openedx/core/djangoapps/user_api/validation/views.py
@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+"""
+An API for client-side validation of (potential) user data.
+"""
+
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from openedx.core.djangoapps.user_api.accounts.api import (
+    get_email_validation_error,
+    get_email_existence_validation_error,
+    get_confirm_email_validation_error,
+    get_country_validation_error,
+    get_name_validation_error,
+    get_password_validation_error,
+    get_username_validation_error,
+    get_username_existence_validation_error
+)
+
+
+class RegistrationValidationView(APIView):
+    """
+        **Use Cases**
+
+            Get validation information about user data during registration.
+            Client-side may request validation for any number of form fields,
+            and the API will return a conclusion from its analysis for each
+            input (i.e. valid or not valid, or a custom, detailed message).
+
+        **Example Requests and Responses**
+
+            - Checks the validity of the username and email inputs separately.
+            POST /api/user/v1/validation/registration/
+            >>> {
+            >>>     "username": "hi_im_new",
+            >>>     "email": "newguy101@edx.org"
+            >>> }
+            RESPONSE
+            >>> {
+            >>>     "validation_decisions": {
+            >>>         "username": "",
+            >>>         "email": ""
+            >>>     }
+            >>> }
+            Empty strings indicate that there was no problem with the input.
+
+            - Checks the validity of the password field (its validity depends
+              upon both the username and password fields, so we need both). If
+              only password is input, we don't check for password/username
+              compatibility issues.
+            POST /api/user/v1/validation/registration/
+            >>> {
+            >>>     "username": "myname",
+            >>>     "password": "myname"
+            >>> }
+            RESPONSE
+            >>> {
+            >>>     "validation_decisions": {
+            >>>         "username": "",
+            >>>         "password": "Password cannot be the same as the username"
+            >>>     }
+            >>> }
+
+            - Checks the validity of the username, email, and password fields
+              separately, and also tells whether an account exists. The password
+              field's validity depends upon both the username and password, and
+              the account's existence depends upon both the username and email.
+            POST /api/user/v1/validation/registration/
+            >>> {
+            >>>     "username": "hi_im_new",
+            >>>     "email": "cto@edx.org",
+            >>>     "password": "p"
+            >>> }
+            RESPONSE
+            >>> {
+            >>>     "validation_decisions": {
+            >>>         "username": "",
+            >>>         "email": "It looks like cto@edx.org belongs to an existing account. Try again with a different email address.",
+            >>>         "password": "Password must be at least 2 characters long",
+            >>>     }
+            >>> }
+            In this example, username is valid and (we assume) there is
+            a preexisting account with that email. The password also seems
+            to contain the username.
+
+            Note that a validation decision is returned *for all* inputs, whether
+            positive or negative.
+
+        **Available Handlers**
+
+            "name":
+                A handler to check the validity of the user's real name.
+            "username":
+                A handler to check the validity of usernames.
+            "email":
+                A handler to check the validity of emails.
+            "confirm_email":
+                A handler to check whether the confirmation email field matches
+                the email field.
+            "password":
+                A handler to check the validity of passwords; a compatibility
+                decision with the username is made if it exists in the input.
+            "country":
+                A handler to check whether the validity of country fields.
+    """
+
+    # This end-point is available to anonymous users, so no authentication is needed.
+    authentication_classes = []
+
+    def name_handler(self, request):
+        name = request.data.get('name')
+        return get_name_validation_error(name)
+
+    def username_handler(self, request):
+        username = request.data.get('username')
+        invalid_username_error = get_username_validation_error(username)
+        username_exists_error = get_username_existence_validation_error(username)
+        # We prefer seeing for invalidity first.
+        # Some invalid usernames (like for superusers) may exist.
+        return invalid_username_error or username_exists_error
+
+    def email_handler(self, request):
+        email = request.data.get('email')
+        invalid_email_error = get_email_validation_error(email)
+        email_exists_error = get_email_existence_validation_error(email)
+        # We prefer seeing for invalidity first.
+        # Some invalid emails (like a blank one for superusers) may exist.
+        return invalid_email_error or email_exists_error
+
+    def confirm_email_handler(self, request):
+        email = request.data.get('email', None)
+        confirm_email = request.data.get('confirm_email')
+        return get_confirm_email_validation_error(confirm_email, email)
+
+    def password_handler(self, request):
+        username = request.data.get('username', None)
+        password = request.data.get('password')
+        return get_password_validation_error(password, username)
+
+    def country_handler(self, request):
+        country = request.data.get('country')
+        return get_country_validation_error(country)
+
+    validation_handlers = {
+        "name": name_handler,
+        "username": username_handler,
+        "email": email_handler,
+        "confirm_email": confirm_email_handler,
+        "password": password_handler,
+        "country": country_handler
+    }
+
+    def post(self, request):
+        """
+        POST /api/user/v1/validation/registration/
+
+        Expects request of the form
+        >>> {
+        >>>     "name": "Dan the Validator",
+        >>>     "username": "mslm",
+        >>>     "email": "mslm@gmail.com",
+        >>>     "confirm_email": "mslm@gmail.com",
+        >>>     "password": "password123",
+        >>>     "country": "PK"
+        >>> }
+        where each key is the appropriate form field name and the value is
+        user input. One may enter individual inputs if needed. Some inputs
+        can get extra verification checks if entered along with others,
+        like when the password may not equal the username.
+        """
+        validation_decisions = {}
+        for form_field_key in self.validation_handlers:
+            # For every field requiring validation from the client,
+            # request a decision for it from the appropriate handler.
+            if form_field_key in request.data:
+                handler = self.validation_handlers[form_field_key]
+                validation_decisions.update({
+                    form_field_key: handler(self, request)
+                })
+        return Response({"validation_decisions": validation_decisions})
diff --git a/openedx/core/djangoapps/user_api/views.py b/openedx/core/djangoapps/user_api/views.py
index 487a31477b..782139615d 100644
--- a/openedx/core/djangoapps/user_api/views.py
+++ b/openedx/core/djangoapps/user_api/views.py
@@ -23,6 +23,7 @@ import third_party_auth
 from django_comment_common.models import Role
 from edxmako.shortcuts import marketing_link
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx.core.djangoapps.user_api.accounts.api import check_account_exists
 from openedx.core.lib.api.authentication import SessionAuthenticationAllowInactiveUser
 from openedx.core.lib.api.permissions import ApiKeyHeaderPermission
 from openedx.features.enterprise_support.api import enterprise_customer_for_request
@@ -31,16 +32,7 @@ from student.forms import get_registration_extension_form
 from student.views import create_account_with_params, AccountValidationError
 from util.json_request import JsonResponse
 
-from .accounts import (
-    EMAIL_MAX_LENGTH,
-    EMAIL_MIN_LENGTH,
-    NAME_MAX_LENGTH,
-    PASSWORD_MAX_LENGTH,
-    PASSWORD_MIN_LENGTH,
-    USERNAME_MAX_LENGTH,
-    USERNAME_MIN_LENGTH
-)
-from .accounts.api import check_account_exists
+import accounts
 from .helpers import FormDescription, require_post_params, shim_student_view
 from .models import UserPreference, UserProfile
 from .preferences.api import get_country_time_zones, update_email_opt_in
@@ -92,8 +84,8 @@ class LoginSessionView(APIView):
             placeholder=email_placeholder,
             instructions=email_instructions,
             restrictions={
-                "min_length": EMAIL_MIN_LENGTH,
-                "max_length": EMAIL_MAX_LENGTH,
+                "min_length": accounts.EMAIL_MIN_LENGTH,
+                "max_length": accounts.EMAIL_MAX_LENGTH,
             }
         )
 
@@ -106,8 +98,7 @@ class LoginSessionView(APIView):
             label=password_label,
             field_type="password",
             restrictions={
-                "min_length": PASSWORD_MIN_LENGTH,
-                "max_length": PASSWORD_MAX_LENGTH,
+                "max_length": accounts.PASSWORD_MAX_LENGTH,
             }
         )
 
@@ -340,18 +331,8 @@ class RegistrationView(APIView):
         conflicts = check_account_exists(email=email, username=username)
         if conflicts:
             conflict_messages = {
-                "email": _(
-                    # Translators: This message is shown to users who attempt to create a new
-                    # account using an email address associated with an existing account.
-                    u"It looks like {email_address} belongs to an existing account. "
-                    u"Try again with a different email address."
-                ).format(email_address=email),
-                "username": _(
-                    # Translators: This message is shown to users who attempt to create a new
-                    # account using a username associated with an existing account.
-                    u"It looks like {username} belongs to an existing account. "
-                    u"Try again with a different username."
-                ).format(username=username),
+                "email": accounts.EMAIL_CONFLICT_MSG.format(email_address=email),
+                "username": accounts.USERNAME_CONFLICT_MSG.format(username=username),
             }
             errors = {
                 field: [{"user_message": conflict_messages[field]}]
@@ -425,8 +406,8 @@ class RegistrationView(APIView):
             placeholder=email_placeholder,
             instructions=email_instructions,
             restrictions={
-                "min_length": EMAIL_MIN_LENGTH,
-                "max_length": EMAIL_MAX_LENGTH,
+                "min_length": accounts.EMAIL_MIN_LENGTH,
+                "max_length": accounts.EMAIL_MAX_LENGTH,
             },
             required=required
         )
@@ -444,7 +425,7 @@ class RegistrationView(APIView):
         # Translators: This label appears above a field on the registration form
         # meant to confirm the user's email address.
         email_label = _(u"Confirm Email")
-        error_msg = _(u"The email addresses do not match.")
+        error_msg = accounts.REQUIRED_FIELD_CONFIRM_EMAIL_MSG
 
         form_desc.add_field(
             "confirm_email",
@@ -483,7 +464,7 @@ class RegistrationView(APIView):
             placeholder=name_placeholder,
             instructions=name_instructions,
             restrictions={
-                "max_length": NAME_MAX_LENGTH,
+                "max_length": accounts.NAME_MAX_LENGTH,
             },
             required=required
         )
@@ -519,8 +500,8 @@ class RegistrationView(APIView):
             instructions=username_instructions,
             placeholder=username_placeholder,
             restrictions={
-                "min_length": USERNAME_MIN_LENGTH,
-                "max_length": USERNAME_MAX_LENGTH,
+                "min_length": accounts.USERNAME_MIN_LENGTH,
+                "max_length": accounts.USERNAME_MAX_LENGTH,
             },
             required=required
         )
@@ -544,8 +525,8 @@ class RegistrationView(APIView):
             label=password_label,
             field_type="password",
             restrictions={
-                "min_length": PASSWORD_MIN_LENGTH,
-                "max_length": PASSWORD_MAX_LENGTH,
+                "min_length": accounts.PASSWORD_MIN_LENGTH,
+                "max_length": accounts.PASSWORD_MAX_LENGTH,
             },
             required=required
         )
@@ -563,6 +544,7 @@ class RegistrationView(APIView):
         # Translators: This label appears above a dropdown menu on the registration
         # form used to select the user's highest completed level of education.
         education_level_label = _(u"Highest level of education completed")
+        error_msg = accounts.REQUIRED_FIELD_LEVEL_OF_EDUCATION_MSG
 
         # The labels are marked for translation in UserProfile model definition.
         options = [(name, _(label)) for name, label in UserProfile.LEVEL_OF_EDUCATION_CHOICES]  # pylint: disable=translation-of-non-string
@@ -572,7 +554,10 @@ class RegistrationView(APIView):
             field_type="select",
             options=options,
             include_default_option=True,
-            required=required
+            required=required,
+            error_messages={
+                "required": error_msg
+            }
         )
 
     def _add_gender_field(self, form_desc, required=True):
@@ -637,12 +622,16 @@ class RegistrationView(APIView):
         # Translators: This label appears above a field on the registration form
         # meant to hold the user's mailing address.
         mailing_address_label = _(u"Mailing address")
+        error_msg = accounts.REQUIRED_FIELD_MAILING_ADDRESS_MSG
 
         form_desc.add_field(
             "mailing_address",
             label=mailing_address_label,
             field_type="textarea",
-            required=required
+            required=required,
+            error_messages={
+                "required": error_msg
+            }
         )
 
     def _add_goals_field(self, form_desc, required=True):
@@ -660,12 +649,16 @@ class RegistrationView(APIView):
         goals_label = _(u"Tell us why you're interested in {platform_name}").format(
             platform_name=configuration_helpers.get_value("PLATFORM_NAME", settings.PLATFORM_NAME)
         )
+        error_msg = accounts.REQUIRED_FIELD_GOALS_MSG
 
         form_desc.add_field(
             "goals",
             label=goals_label,
             field_type="textarea",
-            required=required
+            required=required,
+            error_messages={
+                "required": error_msg
+            }
         )
 
     def _add_city_field(self, form_desc, required=True):
@@ -681,11 +674,15 @@ class RegistrationView(APIView):
         # Translators: This label appears above a field on the registration form
         # which allows the user to input the city in which they live.
         city_label = _(u"City")
+        error_msg = accounts.REQUIRED_FIELD_CITY_MSG
 
         form_desc.add_field(
             "city",
             label=city_label,
-            required=required
+            required=required,
+            error_messages={
+                "required": error_msg
+            }
         )
 
     def _add_state_field(self, form_desc, required=False):
@@ -801,7 +798,7 @@ class RegistrationView(APIView):
         # Translators: This label appears above a dropdown menu on the registration
         # form used to select the country in which the user lives.
         country_label = _(u"Country")
-        error_msg = _(u"Please select your Country.")
+        error_msg = accounts.REQUIRED_FIELD_COUNTRY_MSG
 
         # If we set a country code, make sure it's uppercase for the sake of the form.
         default_country = form_desc._field_overrides.get('country', {}).get('defaultValue')
@@ -1036,8 +1033,8 @@ class PasswordResetView(APIView):
             placeholder=email_placeholder,
             instructions=email_instructions,
             restrictions={
-                "min_length": EMAIL_MIN_LENGTH,
-                "max_length": EMAIL_MAX_LENGTH,
+                "min_length": accounts.EMAIL_MIN_LENGTH,
+                "max_length": accounts.EMAIL_MAX_LENGTH,
             }
         )
 
@@ -1105,7 +1102,9 @@ class PreferenceUsersListView(generics.ListAPIView):
     paginate_by_param = "page_size"
 
     def get_queryset(self):
-        return User.objects.filter(preferences__key=self.kwargs["pref_key"]).prefetch_related("preferences").select_related("profile")
+        return User.objects.filter(
+            preferences__key=self.kwargs["pref_key"]
+        ).prefetch_related("preferences").select_related("profile")
 
 
 class UpdateEmailOptInPreference(APIView):
diff --git a/openedx/core/lib/api/test_utils.py b/openedx/core/lib/api/test_utils.py
index 181429add3..eb8c2a2aa3 100644
--- a/openedx/core/lib/api/test_utils.py
+++ b/openedx/core/lib/api/test_utils.py
@@ -28,7 +28,7 @@ class ApiTestCase(TestCase):
         return getattr(self.client, method)(*args, HTTP_X_EDX_API_KEY=TEST_API_KEY, **kwargs)
 
     def get_json(self, *args, **kwargs):
-        """Make a request with the given args and return the parsed JSON repsonse"""
+        """Make a request with the given args and return the parsed JSON response"""
         resp = self.request_with_auth("get", *args, **kwargs)
         self.assertHttpOK(resp)
         self.assertTrue(resp["Content-Type"].startswith("application/json"))
diff --git a/openedx/features/course_experience/static/course_experience/fixtures/enrollment-button.html b/openedx/features/course_experience/static/course_experience/fixtures/enrollment-button.html
new file mode 100644
index 0000000000..1e55c18cb7
--- /dev/null
+++ b/openedx/features/course_experience/static/course_experience/fixtures/enrollment-button.html
@@ -0,0 +1 @@
+<button class="enroll-btn btn-link">Enroll Now</button>
diff --git a/openedx/features/course_experience/static/course_experience/js/Enrollment.js b/openedx/features/course_experience/static/course_experience/js/Enrollment.js
new file mode 100644
index 0000000000..e28fd5e063
--- /dev/null
+++ b/openedx/features/course_experience/static/course_experience/js/Enrollment.js
@@ -0,0 +1,45 @@
+
+/*
+ * Course Enrollment on the Course Home page
+ */
+export class CourseEnrollment {  // eslint-disable-line import/prefer-default-export
+  /**
+   * Redirect to a URL.  Mainly useful for mocking out in tests.
+   * @param  {string} url The URL to redirect to.
+   */
+  static redirect(url) {
+    window.location.href = url;
+  }
+
+  static refresh() {
+    window.location.reload(false);
+  }
+
+  static createEnrollment(courseId) {
+    const data = JSON.stringify({
+      course_details: { course_id: courseId },
+    });
+    const enrollmentAPI = '/api/enrollment/v1/enrollment';
+    const trackSelection = '/course_modes/choose/';
+
+    return () =>
+      $.ajax(
+        {
+          type: 'POST',
+          url: enrollmentAPI,
+          data,
+          contentType: 'application/json',
+        }).done(() => {
+          window.analytics.track('edx.bi.user.course-home.enrollment');
+          CourseEnrollment.refresh();
+        }).fail(() => {
+          // If the simple enrollment we attempted failed, go to the track selection page,
+          // which is better for handling more complex enrollment situations.
+          CourseEnrollment.redirect(trackSelection + courseId);
+        });
+  }
+
+  constructor(buttonClass, courseId) {
+    $(buttonClass).click(CourseEnrollment.createEnrollment(courseId));
+  }
+}
diff --git a/openedx/features/course_experience/static/course_experience/js/spec/Enrollment_spec.js b/openedx/features/course_experience/static/course_experience/js/spec/Enrollment_spec.js
new file mode 100644
index 0000000000..6220736b89
--- /dev/null
+++ b/openedx/features/course_experience/static/course_experience/js/spec/Enrollment_spec.js
@@ -0,0 +1,48 @@
+/* globals $, loadFixtures */
+
+import {
+  expectRequest,
+  requests as mockRequests,
+  respondWithJson,
+  respondWithError,
+} from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
+import { CourseEnrollment } from '../Enrollment';
+
+
+describe('CourseEnrollment tests', () => {
+  describe('Ensure button behavior', () => {
+    const endpointUrl = '/api/enrollment/v1/enrollment';
+    const courseId = 'course-v1:edX+DemoX+Demo_Course';
+    const enrollButtonClass = '.enroll-btn';
+
+    window.analytics = jasmine.createSpyObj('analytics', ['page', 'track', 'trackLink']);
+
+    beforeEach(() => {
+      loadFixtures('course_experience/fixtures/enrollment-button.html');
+      new CourseEnrollment('.enroll-btn', courseId);  // eslint-disable-line no-new
+    });
+    it('Verify that we reload on success', () => {
+      const requests = mockRequests(this);
+      $(enrollButtonClass).click();
+      expectRequest(
+        requests,
+        'POST',
+        endpointUrl,
+        `{"course_details":{"course_id":"${courseId}"}}`,
+      );
+      spyOn(CourseEnrollment, 'refresh');
+      respondWithJson(requests);
+      expect(CourseEnrollment.refresh).toHaveBeenCalled();
+      expect(window.analytics.track).toHaveBeenCalled();
+      requests.restore();
+    });
+    it('Verify that we redirect to track selection on fail', () => {
+      const requests = mockRequests(this);
+      $(enrollButtonClass).click();
+      spyOn(CourseEnrollment, 'redirect');
+      respondWithError(requests, 403);
+      expect(CourseEnrollment.redirect).toHaveBeenCalled();
+      requests.restore();
+    });
+  });
+});
diff --git a/openedx/features/course_experience/templates/course_experience/course-home-fragment.html b/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
index e8fb3d8dd8..93e38c1670 100644
--- a/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
@@ -112,3 +112,7 @@ from openedx.features.course_experience import UNIFIED_COURSE_TAB_FLAG, SHOW_REV
         courseToolLink: ".course-tool-link",
     });
 </%static:webpack>
+
+<%static:webpack entry="Enrollment">
+    new CourseEnrollment('.enroll-btn', '${course_key | n, js_escaped_string}');
+</%static:webpack>
diff --git a/openedx/features/course_experience/tests/views/test_course_home.py b/openedx/features/course_experience/tests/views/test_course_home.py
index e4b73175e8..a2c398567b 100644
--- a/openedx/features/course_experience/tests/views/test_course_home.py
+++ b/openedx/features/course_experience/tests/views/test_course_home.py
@@ -160,7 +160,7 @@ class TestCourseHomePage(CourseHomePageTestCase):
         course_home_url(self.course)
 
         # Fetch the view and verify the query counts
-        with self.assertNumQueries(40, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
+        with self.assertNumQueries(42, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
             with check_mongo_calls(4):
                 url = course_home_url(self.course)
                 self.client.get(url)
diff --git a/openedx/features/course_experience/tests/views/test_course_updates.py b/openedx/features/course_experience/tests/views/test_course_updates.py
index ad2d481381..2f47917d80 100644
--- a/openedx/features/course_experience/tests/views/test_course_updates.py
+++ b/openedx/features/course_experience/tests/views/test_course_updates.py
@@ -127,7 +127,7 @@ class TestCourseUpdatesPage(SharedModuleStoreTestCase):
         course_updates_url(self.course)
 
         # Fetch the view and verify that the query counts haven't changed
-        with self.assertNumQueries(31, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
+        with self.assertNumQueries(33, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
             with check_mongo_calls(4):
                 url = course_updates_url(self.course)
                 self.client.get(url)
diff --git a/openedx/features/course_experience/views/course_sock.py b/openedx/features/course_experience/views/course_sock.py
index f55edb755a..418c705506 100644
--- a/openedx/features/course_experience/views/course_sock.py
+++ b/openedx/features/course_experience/views/course_sock.py
@@ -6,9 +6,8 @@ from opaque_keys.edx.keys import CourseKey
 from web_fragments.fragment import Fragment
 
 from student.models import CourseEnrollment
-from course_modes.models import CourseMode
+from course_modes.models import CourseMode, get_cosmetic_verified_display_price
 from courseware.date_summary import VerifiedUpgradeDeadlineDate
-from courseware.views.views import get_cosmetic_verified_display_price
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 
 
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index e8f600a365..73fea46278 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -16,31 +16,30 @@ dealer==2.0.4
 defusedxml==0.4.1
 django-babel-underscore==0.5.1
 markey==0.8  # From django-babel-underscore
-django-celery==3.2.1
 django-config-models==0.1.8
 django-countries==4.0
 django-extensions==1.5.9
 django-filter==1.0.4
 django-ipware==1.1.0
 django-model-utils==2.3.1
-django-mptt==0.7.4
+django-mptt>=0.8.6,<0.9
 django-oauth-plus==2.2.8
 django-oauth-toolkit==0.12.0
 django-pipeline-forgiving==1.0.0
 django-pyfs==1.0.6
-django-sekizai==0.8.2
+django-sekizai>=0.10
 django-ses==0.7.1
 django-simple-history==1.6.3
 django-statici18n==1.4.0
 django-storages==1.4.1
 django-method-override==0.1.0
-django-user-tasks==0.1.4
+django-user-tasks==0.1.5
 django==1.8.18
 django-waffle==0.12.0
 djangorestframework-jwt==1.11.0
 enum34==1.1.6
 edx-ccx-keys==0.2.1
-edx-celeryutils==0.2.4
+edx-celeryutils==0.2.6
 edx-drf-extensions==1.2.3
 edx-i18n-tools==0.3.9
 edx-lint==0.4.3
@@ -49,14 +48,14 @@ edx-lint==0.4.3
 astroid==1.3.8
 edx-django-oauth2-provider==1.1.4
 edx-django-sites-extensions==2.3.0
-edx-enterprise==0.39.1
+edx-enterprise==0.39.9
 edx-oauth2-provider==1.2.0
 edx-opaque-keys==0.4.0
 edx-organizations==0.4.5
 edx-rest-api-client==1.7.1
 edx-search==1.1.0
-edx-submissions==2.0.5
-edxval==0.1.0
+edx-submissions==2.0.9
+edxval==0.1.1
 event-tracking==0.2.4
 facebook-sdk==0.4.0
 feedparser==5.1.3
@@ -68,7 +67,7 @@ help-tokens==1.0.3
 httpretty==0.8.3
 lazy==1.1
 mako==1.0.2
-Markdown==2.2.1
+Markdown>=2.6,<2.7
 --allow-external meliae
 --allow-unverified meliae
 meliae==0.4.0
@@ -104,13 +103,13 @@ scipy==0.14.0
 Shapely==1.2.16
 singledispatch==3.4.0.2
 six>=1.10.0,<2.0.0
-sorl-thumbnail==12.3
+sorl-thumbnail>=12.3,<13
 sortedcontainers==0.9.2
 stevedore==1.10.0
 sure==1.2.3
 sympy==0.7.1
 xmltodict==0.4.1
-django-ratelimit-backend==1.0
+django-ratelimit-backend==1.1.1
 unicodecsv==0.14.1
 django-require==1.0.11
 django-webpack-loader==0.4.1
@@ -149,7 +148,7 @@ ipaddr==2.1.11
 django-cors-headers==1.1.0
 
 # Debug toolbar
-django_debug_toolbar==1.5
+django_debug_toolbar==1.8
 sqlparse>=0.2.0,<0.3.0
 
 # Used for testing
diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt
index 191c636649..05cc6a8d09 100644
--- a/requirements/edx/edx-private.txt
+++ b/requirements/edx/edx-private.txt
@@ -8,7 +8,7 @@
 
 # For Harvard courses:
 -e git+https://github.com/gsehub/xblock-mentoring.git@4d1cce78dc232d5da6ffd73817b5c490e87a6eee#egg=xblock-mentoring
-git+https://github.com/open-craft/problem-builder.git@v2.6.5#egg=xblock-problem-builder==2.6.5
+git+https://github.com/open-craft/problem-builder.git@v2.6.10#egg=xblock-problem-builder==2.6.10
 
 # Oppia XBlock
 -e git+https://github.com/oppia/xblock.git@9f6b95b7eb7dbabb96b77198a3202604f96adf65#egg=oppia-xblock
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 62f8a0c5d6..422eb521d0 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -47,7 +47,7 @@
 
 # Third-party:
 git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline==1.5.3
-git+https://github.com/edx/django-wiki.git@v0.0.10#egg=django-wiki==0.0.10
+git+https://github.com/edx/django-wiki.git@v0.0.11#egg=django-wiki==0.0.11
 git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8
 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
 git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6
@@ -76,11 +76,15 @@ git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc8685
 # This dependency will be removed by this work: https://openedx.atlassian.net/browse/PLAT-1660
 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
 
+# Why a django-celery fork? To add Django 1.11 compatibility to the abandoned repo.
+# This dependency will be removed by the Celery 4 upgrade: https://openedx.atlassian.net/browse/PLAT-1684
+git+https://github.com/edx/django-celery.git@f87c6f914a1410463f54aebf68458c0653b20602#egg=django-celery==3.2.1+edx.1
+
 # Our libraries:
 -e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail==0.0
 -e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
-git+https://github.com/edx/edx-ora2.git@1.4.8#egg=ora2==1.4.8
+git+https://github.com/edx/edx-ora2.git@1.4.11#egg=ora2==1.4.11
 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
 git+https://github.com/edx/RecommenderXBlock.git@0e744b393cf1f8b886fe77bc697e7d9d78d65cd6#egg=recommender-xblock==1.2
 git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
diff --git a/scripts/xss_linter.py b/scripts/xss_linter.py
index cd6fc16eeb..17e5cf240f 100755
--- a/scripts/xss_linter.py
+++ b/scripts/xss_linter.py
@@ -2392,7 +2392,7 @@ class MakoTemplateLinter(BaseLinter):
         contexts = [{'index': 0, 'type': 'html'}]
         javascript_types = [
             'text/javascript', 'text/ecmascript', 'application/ecmascript', 'application/javascript',
-            'text/x-mathjax-config', 'json/xblock-args'
+            'text/x-mathjax-config', 'json/xblock-args', 'application/json',
         ]
         html_types = ['text/template']
         for context in contexts_re.finditer(mako_template):
diff --git a/webpack.config.js b/webpack.config.js
index b34e53ce7b..9ba5257aea 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,6 +23,7 @@ var wpconfig = {
         CourseSock: './openedx/features/course_experience/static/course_experience/js/CourseSock.js',
         CourseTalkReviews: './openedx/features/course_experience/static/course_experience/js/CourseTalkReviews.js',
         WelcomeMessage: './openedx/features/course_experience/static/course_experience/js/WelcomeMessage.js',
+        Enrollment: './openedx/features/course_experience/static/course_experience/js/Enrollment.js',
         Import: './cms/static/js/features/import/factories/import.js'
     },