diff --git a/cms/djangoapps/contentstore/management/commands/delete_course.py b/cms/djangoapps/contentstore/management/commands/delete_course.py
index 8876fce581..3f91828f12 100644
--- a/cms/djangoapps/contentstore/management/commands/delete_course.py
+++ b/cms/djangoapps/contentstore/management/commands/delete_course.py
@@ -3,7 +3,6 @@
 
     Arguments:
         arg1 (str): Course key of the course to delete
-        arg2 (str): 'commit'
 
     Returns:
         none
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 65f0903a99..17c96c490b 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -215,6 +215,13 @@ if ENV_TOKENS.get('COMPREHENSIVE_THEME_DIR', None):
     COMPREHENSIVE_THEME_DIR = ENV_TOKENS.get('COMPREHENSIVE_THEME_DIR')
 
 COMPREHENSIVE_THEME_DIRS = ENV_TOKENS.get('COMPREHENSIVE_THEME_DIRS', COMPREHENSIVE_THEME_DIRS) or []
+
+# COMPREHENSIVE_THEME_LOCALE_PATHS contain the paths to themes locale directories e.g.
+# "COMPREHENSIVE_THEME_LOCALE_PATHS" : [
+#        "/edx/src/edx-themes/conf/locale"
+#    ],
+COMPREHENSIVE_THEME_LOCALE_PATHS = ENV_TOKENS.get('COMPREHENSIVE_THEME_LOCALE_PATHS', [])
+
 DEFAULT_SITE_THEME = ENV_TOKENS.get('DEFAULT_SITE_THEME', DEFAULT_SITE_THEME)
 ENABLE_COMPREHENSIVE_THEMING = ENV_TOKENS.get('ENABLE_COMPREHENSIVE_THEMING', ENABLE_COMPREHENSIVE_THEMING)
 
diff --git a/cms/envs/common.py b/cms/envs/common.py
index ce5c1ca62c..f8572177bd 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1190,3 +1190,6 @@ AFFILIATE_COOKIE_NAME = 'affiliate_id'
 ############## Settings for Studio Context Sensitive Help ##############
 
 DOC_LINK_BASE_URL = None
+
+# Theme directory locale paths
+COMPREHENSIVE_THEME_LOCALE_PATHS = []
diff --git a/cms/static/js/i18n/ar/djangojs.js b/cms/static/js/i18n/ar/djangojs.js
index 4dc9b10999..538edcb37a 100644
--- a/cms/static/js/i18n/ar/djangojs.js
+++ b/cms/static/js/i18n/ar/djangojs.js
@@ -667,7 +667,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 post title": "\u062a\u0639\u062f\u064a\u0644 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 ", 
     "Edit the name": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0627\u0633\u0645", 
     "Edit the program marketing slug": "\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0634\u0627\u0631\u0629 \u0627\u0644\u062a\u0633\u0648\u064a\u0642\u064a\u0629 \u0644\u0644\u0628\u0631\u0646\u0627\u0645\u062c", 
     "Edit the program subtitle": "\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0641\u0631\u0639\u064a \u0644\u0644\u0628\u0631\u0646\u0627\u0645\u062c.", 
@@ -716,7 +715,6 @@
     "Enter the page number you'd like to quickly navigate to.": "\u0623\u062f\u062e\u0644 \u0631\u0642\u0645 \u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u062a\u064a \u062a\u0648\u062f \u0627\u0644\u0648\u0644\u0648\u062c \u0625\u0644\u064a\u0647\u0627", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u0623\u062f\u062e\u0644 \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0623\u0648 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0644\u0643\u0644 \u0645\u062a\u0639\u0644\u0651\u0645 \u062a\u0631\u0639\u0628 \u0628\u0625\u0636\u0627\u0641\u062a\u0647 \u0643\u0627\u0633\u062a\u062b\u0646\u0627\u0621.", 
     "Enter username or email": "\u0623\u062f\u062e\u0644 \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0623\u0648 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a", 
-    "Enter your question or comment": "\u0623\u064e\u062f\u062e\u0650\u0644 \u0633\u0624\u0627\u0644\u0643 \u0623\u0648 \u062a\u0639\u0644\u064a\u0642\u0643", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "\u062c\u0627\u0631\u064a \u0625\u0639\u0627\u062f\u0629 \u0636\u0628\u0637 \u0645\u062d\u0627\u0648\u0644\u0627\u062a \u0627\u0645\u062a\u062d\u0627\u0646 \u0627\u0644\u062f\u062e\u0648\u0644 \u0644\u0644\u0637\u0627\u0644\u0628 '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "\u062c\u0627\u0631\u064a \u062d\u0630\u0641 \u062d\u0627\u0644\u0629 \u0627\u0645\u062a\u062d\u0627\u0646 \u0627\u0644\u062f\u062e\u0648\u0644 \u0644\u0644\u0637\u0627\u0644\u0628 '{student_id}'.", 
     "Error": "\u062e\u0637\u0623", 
@@ -2053,7 +2051,6 @@
     "less than a minute": "\u0623\u0642\u0644\u0651 \u0645\u0646 \u062f\u0642\u064a\u0642\u0629", 
     "marked as answer %(time_ago)s": "\u0645\u0648\u0633\u0648\u0645\u0629 \u0643\u0625\u062c\u0627\u0628\u0629 %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "\u0645\u0648\u0633\u0648\u0645\u0629 \u0643\u0625\u062c\u0627\u0628\u0629 %(time_ago)s \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645 %(user)s", 
-    "message": "\u0631\u0633\u0627\u0644\u0629", 
     "name": "\u0627\u0644\u0627\u0633\u0645  ", 
     "not enrolled": "\u063a\u064a\u0631 \u0645\u0633\u062c\u0644", 
     "off": "\u063a\u064a\u0631 \u0645\u0641\u0639\u0651\u0644", 
diff --git a/cms/static/js/i18n/eo/djangojs.js b/cms/static/js/i18n/eo/djangojs.js
index ca1423e41f..04e77e1274 100644
--- a/cms/static/js/i18n/eo/djangojs.js
+++ b/cms/static/js/i18n/eo/djangojs.js
@@ -412,6 +412,7 @@
     "Common Problem Types": "\u00c7\u00f6mm\u00f6n Pr\u00f6\u00dfl\u00e9m T\u00fdp\u00e9s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "Community TA": "\u00c7\u00f6mm\u00fcn\u00eft\u00fd T\u00c0 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#", 
     "Component": "\u00c7\u00f6mp\u00f6n\u00e9nt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#", 
+    "Component Location ID": "\u00c7\u00f6mp\u00f6n\u00e9nt L\u00f6\u00e7\u00e4t\u00ef\u00f6n \u00ccD \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "Configure": "\u00c7\u00f6nf\u00efg\u00fcr\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#", 
     "Confirm": "\u00c7\u00f6nf\u00efrm \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #", 
     "Confirm Timed Transcript": "\u00c7\u00f6nf\u00efrm T\u00efm\u00e9d Tr\u00e4ns\u00e7r\u00efpt \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#", 
@@ -528,7 +529,6 @@
     "Discussion": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#", 
     "Discussion Home": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n H\u00f6m\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1#", 
     "Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n \u00e4dm\u00efns, m\u00f6d\u00e9r\u00e4t\u00f6rs, \u00e4nd T\u00c0s \u00e7\u00e4n m\u00e4k\u00e9 th\u00e9\u00efr p\u00f6sts v\u00efs\u00ef\u00dfl\u00e9 t\u00f6 \u00e4ll st\u00fcd\u00e9nts \u00f6r sp\u00e9\u00e7\u00eff\u00fd \u00e4 s\u00efngl\u00e9 \u00e7\u00f6h\u00f6rt. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #", 
-    "Discussion topics; currently listing: ": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n t\u00f6p\u00ef\u00e7s; \u00e7\u00fcrr\u00e9ntl\u00fd l\u00efst\u00efng:  \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#", 
     "Display Name": "D\u00efspl\u00e4\u00fd N\u00e4m\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#", 
     "Div": "D\u00efv \u2c60'\u03c3\u044f\u0454\u043c#", 
     "Do not show again": "D\u00f6 n\u00f6t sh\u00f6w \u00e4g\u00e4\u00efn \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454#", 
@@ -691,7 +691,6 @@
     "Files must be in JPEG or PNG format.": "F\u00efl\u00e9s m\u00fcst \u00df\u00e9 \u00efn JP\u00c9G \u00f6r PNG f\u00f6rm\u00e4t. \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#", 
     "Fill browser": "F\u00efll \u00dfr\u00f6ws\u00e9r \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#", 
     "Filter and sort topics": "F\u00eflt\u00e9r \u00e4nd s\u00f6rt t\u00f6p\u00ef\u00e7s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#", 
-    "Filter topics": "F\u00eflt\u00e9r t\u00f6p\u00ef\u00e7s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#", 
     "Financial Assistance": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "Financial Assistance Application": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u00c0ppl\u00ef\u00e7\u00e4t\u00ef\u00f6n \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#", 
     "Find": "F\u00efnd \u2c60'\u03c3\u044f\u0454\u043c \u03b9#", 
diff --git a/cms/static/js/i18n/es-419/djangojs.js b/cms/static/js/i18n/es-419/djangojs.js
index fd3c544f99..b8cdd8fb5a 100644
--- a/cms/static/js/i18n/es-419/djangojs.js
+++ b/cms/static/js/i18n/es-419/djangojs.js
@@ -571,7 +571,6 @@
     "Edit Membership": "Editar membres\u00eda", 
     "Edit Team": "Editar Equipo", 
     "Edit Your Name": "Edite su nombre", 
-    "Edit post title": "Editar el t\u00edtulo de la publicaci\u00f3n", 
     "Edit the name": "Editar el nombre", 
     "Edit the program marketing slug": "Editar el slug de marketing para el programa", 
     "Edit the program subtitle": "Editar el subt\u00edtulo del programa", 
@@ -620,7 +619,6 @@
     "Enter the page number you'd like to quickly navigate to.": "Introduzca el n\u00famero de p\u00e1gina al cual le gustar\u00eda dirigirse", 
     "Enter the username or email address of each learner that you want to add as an exception.": "Ingrese el nombre de usuario y correo electr\u00f3nico de cada estudiante que quiere agregar como excepci\u00f3n ", 
     "Enter username or email": "Ingrese el nombre de usuario o el correo electr\u00f3nico.", 
-    "Enter your question or comment": "Ingresa tu pregunta o comentario", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "Intentos para ex\u00e1men de ingreso esta siendo reiniciado para el estudiante '{student_id}'", 
     "Entrance exam state is being deleted for student '{student_id}'.": "El estado del examen de ingreso est\u00e1 siendo borrado para el estudiante '{student_id}'.", 
     "Error": "Error", 
@@ -1930,7 +1928,6 @@
     "less than a minute": "menos de un minuto", 
     "marked as answer %(time_ago)s": "marcado como respuesta %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "marcado como respuesta %(time_ago)s por %(user)s", 
-    "message": "mensaje", 
     "name": "nombre", 
     "not enrolled": "No est\u00e1 inscrito", 
     "off": "Apagar", 
diff --git a/cms/static/js/i18n/fake2/djangojs.js b/cms/static/js/i18n/fake2/djangojs.js
index 3b86aabb30..61e9340803 100644
--- a/cms/static/js/i18n/fake2/djangojs.js
+++ b/cms/static/js/i18n/fake2/djangojs.js
@@ -412,6 +412,7 @@
     "Common Problem Types": "\u023b\u00f8\u026f\u026f\u00f8n \u2c63\u0279\u00f8bl\u01dd\u026f \u0166\u028ed\u01dds", 
     "Community TA": "\u023b\u00f8\u026f\u026fnn\u1d09\u0287\u028e \u0166\u023a", 
     "Component": "\u023b\u00f8\u026fd\u00f8n\u01ddn\u0287", 
+    "Component Location ID": "\u023b\u00f8\u026fd\u00f8n\u01ddn\u0287 \u0141\u00f8\u0254\u0250\u0287\u1d09\u00f8n \u0197\u0110", 
     "Configure": "\u023b\u00f8n\u025f\u1d09\u0183n\u0279\u01dd", 
     "Confirm": "\u023b\u00f8n\u025f\u1d09\u0279\u026f", 
     "Confirm Timed Transcript": "\u023b\u00f8n\u025f\u1d09\u0279\u026f \u0166\u1d09\u026f\u01ddd \u0166\u0279\u0250ns\u0254\u0279\u1d09d\u0287", 
@@ -528,7 +529,6 @@
     "Discussion": "\u0110\u1d09s\u0254nss\u1d09\u00f8n", 
     "Discussion Home": "\u0110\u1d09s\u0254nss\u1d09\u00f8n \u0126\u00f8\u026f\u01dd", 
     "Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.": "\u0110\u1d09s\u0254nss\u1d09\u00f8n \u0250d\u026f\u1d09ns, \u026f\u00f8d\u01dd\u0279\u0250\u0287\u00f8\u0279s, \u0250nd \u0166\u023as \u0254\u0250n \u026f\u0250\u029e\u01dd \u0287\u0265\u01dd\u1d09\u0279 d\u00f8s\u0287s \u028c\u1d09s\u1d09bl\u01dd \u0287\u00f8 \u0250ll s\u0287nd\u01ddn\u0287s \u00f8\u0279 sd\u01dd\u0254\u1d09\u025f\u028e \u0250 s\u1d09n\u0183l\u01dd \u0254\u00f8\u0265\u00f8\u0279\u0287.", 
-    "Discussion topics; currently listing: ": "\u0110\u1d09s\u0254nss\u1d09\u00f8n \u0287\u00f8d\u1d09\u0254s; \u0254n\u0279\u0279\u01ddn\u0287l\u028e l\u1d09s\u0287\u1d09n\u0183: ", 
     "Display Name": "\u0110\u1d09sdl\u0250\u028e N\u0250\u026f\u01dd", 
     "Div": "\u0110\u1d09\u028c", 
     "Do not show again": "\u0110\u00f8 n\u00f8\u0287 s\u0265\u00f8\u028d \u0250\u0183\u0250\u1d09n", 
@@ -691,7 +691,6 @@
     "Files must be in JPEG or PNG format.": "F\u1d09l\u01dds \u026fns\u0287 b\u01dd \u1d09n \u0248\u2c63\u0246\u01e4 \u00f8\u0279 \u2c63N\u01e4 \u025f\u00f8\u0279\u026f\u0250\u0287.", 
     "Fill browser": "F\u1d09ll b\u0279\u00f8\u028ds\u01dd\u0279", 
     "Filter and sort topics": "F\u1d09l\u0287\u01dd\u0279 \u0250nd s\u00f8\u0279\u0287 \u0287\u00f8d\u1d09\u0254s", 
-    "Filter topics": "F\u1d09l\u0287\u01dd\u0279 \u0287\u00f8d\u1d09\u0254s", 
     "Financial Assistance": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd", 
     "Financial Assistance Application": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd \u023addl\u1d09\u0254\u0250\u0287\u1d09\u00f8n", 
     "Find": "F\u1d09nd", 
diff --git a/cms/static/js/i18n/fr/djangojs.js b/cms/static/js/i18n/fr/djangojs.js
index b4482a908f..65896fb10b 100644
--- a/cms/static/js/i18n/fr/djangojs.js
+++ b/cms/static/js/i18n/fr/djangojs.js
@@ -507,7 +507,6 @@
     "Edit HTML": "Editer le code HTML", 
     "Edit Team": "Modifier l'\u00e9quipe", 
     "Edit Your Name": "Modifier votre nom", 
-    "Edit post title": "\u00c9diter le titre du message", 
     "Edit the name": "Modifier le nom", 
     "Edit this certificate?": "Modifier ce certificat ?", 
     "Editable": "Modifiable", 
@@ -548,7 +547,6 @@
     "Enter the page number you'd like to quickly navigate to.": "Saisissez le num\u00e9ro de la page que vous souhaitez atteindre rapidement.", 
     "Enter the username or email address of each learner that you want to add as an exception.": "Saisissez le nom d'utilisateur ou l'adresse email de chaque \u00e9tudiant que vous souhaitez ajouter comme exception.", 
     "Enter username or email": "Veuillez saisir un nom d'utilisateur ou un email.", 
-    "Enter your question or comment": "Saisir votre question ou commentaire", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "Le nombre d'examens d'entr\u00e9e est r\u00e9initialis\u00e9 pour l'\u00e9tudiant '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "Effacement du status de l'examen d'entr\u00e9e pour l'\u00e9tudiant '{student_id}'.", 
     "Error": "Erreur", 
@@ -1637,7 +1635,6 @@
     "less than a minute": "moins d\u2019une minute", 
     "marked as answer %(time_ago)s": "marqu\u00e9 comme r\u00e9ponse %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "marqu\u00e9 comme r\u00e9ponse %(time_ago)s par %(user)s", 
-    "message": "message", 
     "name": "nom", 
     "off": "arr\u00eat", 
     "on": "on", 
diff --git a/cms/static/js/i18n/he/djangojs.js b/cms/static/js/i18n/he/djangojs.js
index 3db921b3cd..30e795d247 100644
--- a/cms/static/js/i18n/he/djangojs.js
+++ b/cms/static/js/i18n/he/djangojs.js
@@ -40,7 +40,7 @@
     "A driver's license, passport, or other government-issued ID with your name and photo": "\u05e8\u05d9\u05e9\u05d9\u05d5\u05df \u05e0\u05d4\u05d9\u05d2\u05d4, \u05d3\u05e8\u05db\u05d5\u05df, \u05d0\u05d5 \u05ea\u05e2\u05d5\u05d3\u05d5\u05ea \u05de\u05d6\u05d4\u05d5\u05ea \u05d0\u05d7\u05e8\u05d5\u05ea \u05e9\u05d4\u05d5\u05e0\u05e4\u05e7\u05d5 \u05d1\u05d9\u05d3\u05d9 \u05d4\u05de\u05d3\u05d9\u05e0\u05d4 \u05d5\u05de\u05db\u05d9\u05dc\u05d5\u05ea \u05d0\u05ea \u05e9\u05de\u05da \u05d5\u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea\u05da", 
     "A list of courses you have just enrolled in as a verified student": "\u05e8\u05e9\u05d9\u05de\u05ea \u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05dc\u05d4\u05dd \u05e0\u05e8\u05e9\u05de\u05ea \u05db\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d1\u05e2\u05dc \u05d6\u05d4\u05d5\u05ea \u05de\u05d0\u05d5\u05de\u05ea\u05ea. ", 
     "A short description of the program, including concepts covered and expected outcomes (255 character limit).": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05e7\u05e6\u05e8 \u05e9\u05dc \u05d4\u05ea\u05db\u05e0\u05d9\u05ea \u05db\u05d5\u05dc\u05dc \u05e8\u05e2\u05d9\u05d5\u05e0\u05d5\u05ea \u05e9\u05d4\u05d5\u05e2\u05dc\u05d5 \u05d5\u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e6\u05e4\u05d5\u05d9\u05d5\u05ea (\u05d4\u05de\u05d2\u05d1\u05dc\u05d4 \u05d4\u05d9\u05d0 255 \u05ea\u05d5\u05d5\u05d9\u05dd).", 
-    "A valid email address is required": "\u05d3\u05e8\u05d5\u05e9\u05d4 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05ea\u05e7\u05d9\u05e0\u05d4", 
+    "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 You": "\u05d0\u05d5\u05d3\u05d5\u05ea\u05d9\u05da", 
@@ -88,7 +88,7 @@
     "All Groups": "\u05db\u05dc \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea", 
     "All Rights Reserved": "\u05db\u05dc \u05d4\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05e9\u05de\u05d5\u05e8\u05d5\u05ea", 
     "All Topics": "\u05db\u05dc \u05d4\u05e0\u05d5\u05e9\u05d0\u05d9\u05dd", 
-    "All chapters must have a name and asset": "\u05dc\u05db\u05dc \u05d4\u05e4\u05e8\u05e7\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd \u05d5\u05e2\u05e8\u05da", 
+    "All chapters must have a name and asset": "\u05dc\u05db\u05dc \u05d4\u05e4\u05e8\u05e7\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd \u05d5\u05de\u05d3\u05d9\u05d4", 
     "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 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.", 
@@ -128,7 +128,7 @@
     "Back to Dashboard": "\u05d1\u05d7\u05d6\u05e8\u05d4 \u05dc\u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4", 
     "Back to sign in": "\u05d1\u05d7\u05d6\u05e8\u05d4 \u05dc\u05db\u05e0\u05d9\u05e1\u05d4 \u05dc\u05d7\u05e9\u05d1\u05d5\u05df", 
     "Back to {platform} FAQs": "\u05d7\u05d6\u05e8\u05d4 \u05dc\u05e9\u05d0\u05dc\u05d5\u05ea \u05d4\u05e0\u05e4\u05d5\u05e6\u05d5\u05ea \u05e9\u05dc {platform}", 
-    "Basic": "\u05d1\u05e1\u05d9\u05e1\u05d9", 
+    "Basic": "\u05d1\u05e1\u05d9\u05e1", 
     "Be sure your entire face is inside the frame": "\u05d5\u05d3\u05d0 \u05db\u05d9 \u05db\u05dc \u05e4\u05e0\u05d9\u05da \u05de\u05ea\u05d0\u05d9\u05de\u05d9\u05dd \u05dc\u05d2\u05d1\u05d5\u05dc\u05d5\u05ea \u05d4\u05de\u05e1\u05d2\u05e8\u05ea.", 
     "Before proceeding, please confirm that your details match": "\u05d1\u05d8\u05e8\u05dd \u05ea\u05de\u05e9\u05d9\u05da, \u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05d4\u05e4\u05e8\u05d8\u05d9\u05dd \u05ea\u05d5\u05d0\u05de\u05d9\u05dd", 
     "Before you upgrade to a certificate track, you must activate your account.": "\u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05e9\u05d3\u05e8\u05d2 \u05dc\u05de\u05e1\u05dc\u05d5\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da.", 
@@ -211,7 +211,7 @@
     "Content Group Name": "\u05e9\u05dd \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df", 
     "Content-Specific Discussion Topics": "\u05e0\u05d5\u05e9\u05d0\u05d9 \u05d3\u05d9\u05d5\u05df \u05dc\u05ea\u05d5\u05db\u05df \u05de\u05e1\u05d5\u05d9\u05dd", 
     "Correct failed component": "\u05ea\u05e7\u05df \u05e8\u05db\u05d9\u05d1 \u05db\u05d5\u05e9\u05dc", 
-    "Could not parse certificate JSON. %(message)s": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e4\u05e6\u05dc JSON \u05e9\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4. %(message)s", 
+    "Could not parse certificate JSON. %(message)s": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d1\u05d3 JSON \u05e9\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4. %(message)s", 
     "Country of residence": "\u05d0\u05e8\u05e5 \u05de\u05d2\u05d5\u05e8\u05d9\u05dd", 
     "Course": "\u05e7\u05d5\u05e8\u05e1", 
     "Course Code": "\u05e7\u05d5\u05d3 \u05e7\u05d5\u05e8\u05e1", 
@@ -241,7 +241,7 @@
     "Create an account using": "\u05e6\u05d5\u05e8 \u05d7\u05e9\u05d1\u05d5\u05df \u05d1\u05e2\u05d6\u05e8\u05ea", 
     "Create team.": "\u05e6\u05d5\u05e8 \u05e6\u05d5\u05d5\u05ea.", 
     "Create your account": "\u05e6\u05d5\u05e8 \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da", 
-    "Creative Commons": "\u05e7\u05e8\u05d9\u05d0\u05d8\u05d9\u05d1 \u05e7\u05d5\u05de\u05d5\u05e0\u05e1", 
+    "Creative Commons": "Creative Commons", 
     "Creative Commons licensed content, with terms as follow:": "\u05ea\u05d5\u05db\u05df \u05d1\u05e8\u05d9\u05e9\u05d9\u05d5\u05df Creative Commons, \u05db\u05e4\u05d5\u05e3 \u05dc\u05ea\u05e0\u05d0\u05d9\u05dd \u05d4\u05d1\u05d0\u05d9\u05dd:", 
     "Crossed out items have been refunded.": "\u05ea\u05e9\u05dc\u05d5\u05dd \u05d4\u05d5\u05d7\u05d6\u05e8 \u05e2\u05d1\u05d5\u05e8 \u05e4\u05e8\u05d9\u05d8\u05d9\u05dd \u05e9\u05e0\u05de\u05d7\u05e7\u05d5 ", 
     "Current Role:": "\u05ea\u05e4\u05e7\u05d9\u05d3 \u05e0\u05d5\u05db\u05d7\u05d9:", 
@@ -258,7 +258,7 @@
     "Delete Page Confirmation": "\u05d0\u05d9\u05e9\u05d5\u05e8 \u05de\u05d7\u05d9\u05e7\u05ea \u05e2\u05de\u05d5\u05d3", 
     "Delete Team": "\u05de\u05d7\u05e7 \u05e6\u05d5\u05d5\u05ea", 
     "Delete course": "\u05de\u05d7\u05e7 \u05e7\u05d5\u05e8\u05e1", 
-    "Delete course run": "\u05de\u05d7\u05e7 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d9\u05de\u05d5\u05d3\u05d9\u05dd \u05e9\u05dc \u05e7\u05d5\u05e8\u05e1", 
+    "Delete course run": "\u05de\u05d7\u05e7 \u05d4\u05e8\u05e6\u05ea \u05e7\u05d5\u05e8\u05e1", 
     "Delete the user, {username}": "\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4\u05de\u05e9\u05ea\u05de\u05e9, {username}", 
     "Delete this %(item_display_name)s?": "\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4%(item_display_name)s?", 
     "Delete this %(xblock_type)s (and prerequisite)?": "\u05d4\u05d0\u05dd \u05dc\u05de\u05d7\u05d5\u05e7 %(xblock_type)s \u05d6\u05d4 (\u05d5\u05d0\u05ea \u05d4\u05d3\u05e8\u05d9\u05e9\u05d4 \u05d4\u05de\u05d5\u05e7\u05d3\u05de\u05ea)?", 
@@ -312,7 +312,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 post title": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05db\u05d5\u05ea\u05e8\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8", 
     "Edit the name": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e9\u05dd", 
     "Edit the program marketing slug": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e1\u05dc\u05d0\u05d2 \u05dc\u05e9\u05d9\u05d5\u05d5\u05e7 \u05d4\u05ea\u05db\u05e0\u05d9\u05ea", 
     "Edit the program subtitle": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05ea \u05d4\u05ea\u05db\u05e0\u05d9\u05ea", 
@@ -324,7 +323,7 @@
     "Editing comment": "\u05e2\u05d5\u05e8\u05da \u05d4\u05e2\u05e8\u05d4", 
     "Editing post": "\u05e2\u05d5\u05e8\u05da \u05e4\u05d5\u05e1\u05d8", 
     "Editing response": "\u05e2\u05d5\u05e8\u05da \u05ea\u05d2\u05d5\u05d1\u05d4", 
-    "Editing visibility for: %(title)s": "\u05e2\u05d5\u05e8\u05da \u05e0\u05e8\u05d0\u05d5\u05ea: %(title)s", 
+    "Editing visibility for: %(title)s": "\u05e2\u05d5\u05e8\u05da \u05d4\u05e6\u05d2\u05d4/\u05d4\u05e1\u05ea\u05e8\u05d4: %(title)s", 
     "Editing: %(title)s": "\u05e2\u05d5\u05e8\u05da: %(title)s", 
     "Editor": "\u05e2\u05d5\u05e8\u05da", 
     "Email address": "\u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9", 
@@ -342,7 +341,6 @@
     "Enter the name of the cohort": "\u05d4\u05d6\u05df \u05d0\u05ea \u05e9\u05dd \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
     "Enter the page number you'd like to quickly navigate to.": "\u05d4\u05d6\u05df \u05d0\u05ea \u05de\u05e1\u05e4\u05e8 \u05d4\u05e2\u05de\u05d5\u05d3 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e0\u05d5\u05d5\u05d8 \u05d1\u05d5 \u05d1\u05de\u05d4\u05d9\u05e8\u05d5\u05ea.", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u05d4\u05d6\u05df \u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9 \u05d0\u05d5 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05e9\u05dc \u05db\u05dc \u05dc\u05d5\u05de\u05d3 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05db\u05d7\u05e8\u05d9\u05d2.", 
-    "Enter your question or comment": "\u05d4\u05d6\u05df \u05d0\u05ea \u05e9\u05d0\u05dc\u05ea\u05da \u05d0\u05d5 \u05d4\u05e2\u05e8\u05ea\u05da", 
     "Error adding user": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05d5\u05e1\u05e4\u05ea \u05de\u05e9\u05ea\u05de\u05e9", 
     "Error importing course": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05d1\u05d5\u05d0 \u05e7\u05d5\u05e8\u05e1.", 
     "Error removing user": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e1\u05e8\u05ea \u05de\u05e9\u05ea\u05de\u05e9", 
@@ -365,7 +363,7 @@
     "File format not supported. Please upload a file with a {file_extension} extension.": "\u05ea\u05d1\u05e0\u05d9\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5 \u05d0\u05d9\u05e0\u05d4 \u05e0\u05ea\u05de\u05db\u05ea. \u05d0\u05e0\u05d0 \u05d4\u05e2\u05dc\u05d4 \u05e7\u05d5\u05d1\u05e5 \u05e2\u05dd \u05ea\u05d5\u05e1\u05e4\u05ea {file_extension}.", 
     "File upload succeeded": "\u05d4\u05e2\u05dc\u05d0\u05ea \u05e7\u05d5\u05d1\u05e5 \u05e2\u05d1\u05e8\u05d4 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4", 
     "File {filename} exceeds maximum size of {maxFileSizeInMBs} MB": "\u05d4\u05e7\u05d5\u05d1\u05e5 {filename} \u05d7\u05d5\u05e8\u05d2 \u05de\u05d4\u05d2\u05d5\u05d3\u05dc \u05d4\u05de\u05e8\u05d1\u05d9 \u05e9\u05dc {maxFileSizeInMBs} MB", 
-    "Files must be in JPEG or PNG format.": "\u05e7\u05d1\u05e6\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1\u05d9\u05dd \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e4\u05d5\u05e8\u05de\u05d5 JPEG \u05d0\u05d5 PNG. ", 
+    "Files must be in JPEG or PNG format.": "\u05e7\u05d1\u05e6\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1\u05d9\u05dd \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e4\u05d5\u05e8\u05de\u05d8 JPEG \u05d0\u05d5 PNG. ", 
     "Filter and sort topics": "\u05e1\u05e0\u05df \u05d5\u05de\u05d9\u05d9\u05df \u05e0\u05d5\u05e9\u05d0\u05d9\u05dd", 
     "Filter topics": "\u05e1\u05e0\u05df \u05e0\u05d5\u05e9\u05d0\u05d9\u05dd", 
     "Financial Assistance Application": "\u05d1\u05e7\u05e9\u05d4 \u05dc\u05e2\u05d6\u05e8\u05d4 \u05db\u05e1\u05e4\u05d9\u05ea", 
@@ -432,6 +430,7 @@
     "Instructor Photo URL": "\u05db\u05ea\u05d5\u05d1\u05ea URL \u05e9\u05dc \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05de\u05d3\u05e8\u05d9\u05da", 
     "Instructor Title": "\u05ea\u05d5\u05d0\u05e8 \u05d4\u05de\u05d3\u05e8\u05d9\u05da", 
     "Instructor tools": "\u05db\u05dc\u05d9 \u05d4\u05de\u05d3\u05e8\u05d9\u05da", 
+    "Internal Server Error.": "\u05e9\u05d2\u05d9\u05d0\u05ea \u05e9\u05e8\u05ea \u05e4\u05e0\u05d9\u05de\u05d9\u05ea.", 
     "Introduction to Cookie Baking": "\u05de\u05d1\u05d5\u05d0 \u05dc\u05d0\u05e4\u05d9\u05d9\u05ea \u05e2\u05d5\u05d2\u05d9\u05d5\u05ea", 
     "Invalidate Certificate": "\u05e4\u05e1\u05d9\u05dc\u05ea \u05ea\u05e2\u05d5\u05d3\u05d4", 
     "Invalidated": "\u05e0\u05e4\u05e1\u05dc\u05d4", 
@@ -480,7 +479,7 @@
     "Make sure your ID is well-lit": "\u05d5\u05d3\u05d0 \u05db\u05d9 \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4 \u05e9\u05dc\u05da \u05de\u05d5\u05d0\u05e8\u05ea \u05db\u05e8\u05d0\u05d5\u05d9", 
     "Make sure your face is well-lit": "\u05d0\u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05e4\u05e0\u05d9\u05da \u05de\u05d5\u05d0\u05e8\u05d9\u05dd \u05d4\u05d9\u05d8\u05d1.", 
     "Make this subsection available as a prerequisite to other content": "\u05d4\u05e4\u05d5\u05da \u05d0\u05ea \u05ea\u05ea \u05e4\u05e8\u05e7 \u05d6\u05d4 \u05dc\u05d6\u05de\u05d9\u05df \u05db\u05d3\u05e8\u05d9\u05e9\u05d4 \u05de\u05d5\u05e7\u05d3\u05de\u05ea \u05dc\u05ea\u05d5\u05db\u05df \u05d0\u05d7\u05e8", 
-    "Making Visible to Students": "\u05de\u05e9\u05e0\u05d4 \u05dc\u05d2\u05dc\u05d5\u05d9 \u05e2\u05d1\u05d5\u05e8 \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd", 
+    "Making Visible to Students": "\u05de\u05e6\u05d9\u05d2 \u05e2\u05d1\u05d5\u05e8 \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd", 
     "Manage Students": "\u05e0\u05d4\u05dc \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd", 
     "Manual": "\u05d9\u05d3\u05e0\u05d9", 
     "Mark Exam As Completed": "\u05e1\u05de\u05df \u05de\u05d1\u05d7\u05df \u05db\u05d4\u05d5\u05e9\u05dc\u05dd", 
@@ -584,7 +583,7 @@
     "Please enter your email address below and we will send you instructions for setting a new password.": "\u05e0\u05d0 \u05d4\u05d6\u05df \u05dc\u05d4\u05dc\u05df \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05e9\u05dc\u05da \u05d5\u05d0\u05e0\u05d5 \u05e0\u05e9\u05dc\u05d7 \u05dc\u05da \u05d4\u05e0\u05d7\u05d9\u05d5\u05ea \u05dc\u05e7\u05d1\u05d9\u05e2\u05ea \u05e1\u05d9\u05e1\u05de\u05d4 \u05d7\u05d3\u05e9\u05d4.  ", 
     "Please follow the instructions here to upload a file elsewhere and link to it: {maxFileSizeRedirectUrl}": "\u05d1\u05e6\u05e2 \u05d0\u05ea \u05d4\u05d4\u05d5\u05e8\u05d0\u05d5\u05ea \u05e9\u05dc\u05d4\u05dc\u05df \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e7\u05d5\u05d1\u05e5 \u05d1\u05de\u05e7\u05d5\u05dd \u05d0\u05d7\u05e8 \u05d5\u05dc\u05e7\u05e9\u05e8 \u05d0\u05dc\u05d9\u05d5: {maxFileSizeRedirectUrl}", 
     "Please print this page for your records; it serves as your receipt. You will also receive an email with the same information.": "\u05e0\u05d0 \u05d4\u05d3\u05e4\u05e1 \u05e2\u05de\u05d5\u05d3 \u05d6\u05d4 \u05dc\u05e8\u05e9\u05d5\u05de\u05d5\u05ea\u05d9\u05da; \u05d4\u05d5\u05d0 \u05de\u05e9\u05de\u05e9 \u05db\u05e7\u05d1\u05dc\u05d4. \u05d1\u05e0\u05d5\u05e1\u05e3, \u05ea\u05e7\u05d1\u05dc \u05d2\u05dd \u05d4\u05d5\u05d3\u05e2\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05e2\u05dd \u05de\u05d9\u05d3\u05e2 \u05d6\u05d4\u05d4. ", 
-    "Please select a Course Run": "\u05d1\u05d7\u05e8 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d9\u05de\u05d5\u05d3\u05d9\u05dd \u05e9\u05dc \u05e7\u05d5\u05e8\u05e1", 
+    "Please select a Course Run": "\u05d1\u05d7\u05e8 \u05d4\u05e8\u05e6\u05ea \u05e7\u05d5\u05e8\u05e1", 
     "Please select a PDF file to upload.": "\u05d0\u05e0\u05d0 \u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 PDF \u05dc\u05d4\u05e2\u05dc\u05d0\u05d4.", 
     "Please select a course date": "\u05d1\u05d7\u05e8 \u05ea\u05d0\u05e8\u05d9\u05da \u05e7\u05d5\u05e8\u05e1", 
     "Please select a file in .srt format.": "\u05d0\u05e0\u05d0 \u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 \u05d1\u05ea\u05d1\u05e0\u05d9\u05ea .srt", 
@@ -656,7 +655,7 @@
     "Reset my password": "\u05e9\u05d7\u05d6\u05e8 \u05d0\u05ea \u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05e9\u05dc\u05d9", 
     "Retake Photo": "\u05e6\u05dc\u05dd \u05e9\u05d5\u05d1 \u05ea\u05de\u05d5\u05e0\u05d4", 
     "Retake Your Photos": "\u05e6\u05dc\u05dd \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea\u05da", 
-    "Return and add email address": "\u05d7\u05d6\u05d5\u05e8 \u05d5\u05d4\u05d5\u05e1\u05e3 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\"\u05dc", 
+    "Return and add email address": "\u05d7\u05d6\u05d5\u05e8 \u05d5\u05d4\u05d5\u05e1\u05e3 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9", 
     "Return to Export": "\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d9\u05d9\u05e6\u05d5\u05d0", 
     "Return to Your Dashboard": "\u05d7\u05d6\u05d5\u05e8 \u05dc\u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4", 
     "Return to team listing": "\u05d7\u05d6\u05d5\u05e8 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05e6\u05d5\u05d5\u05ea", 
@@ -717,7 +716,7 @@
     "Some Rights Reserved": "\u05d7\u05dc\u05e7 \u05de\u05d4\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05e9\u05de\u05d5\u05e8\u05d5\u05ea", 
     "Some content in this unit is visible only to particular content groups": "\u05d7\u05dc\u05e7 \u05de\u05d4\u05ea\u05d5\u05db\u05df \u05d1\u05d9\u05d7\u05d9\u05d3\u05d4 \u05d6\u05d5 \u05d2\u05dc\u05d5\u05d9 \u05e8\u05e7 \u05e2\u05d1\u05d5\u05e8 \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05ea\u05d5\u05db\u05df \u05de\u05e1\u05d5\u05d9\u05de\u05d5\u05ea", 
     "Sorry, no results were found.": "\u05e6\u05e8 \u05dc\u05e0\u05d5, \u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea. ", 
-    "Sorry, there was an error parsing the subtitles that you uploaded. Please check the format and try again.": "\u05d0\u05e0\u05d5 \u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e0\u05d9\u05ea\u05d5\u05d7 \u05d4\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05e9\u05d4\u05e2\u05dc\u05ea. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d4\u05ea\u05d1\u05e0\u05d9\u05ea \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
+    "Sorry, there was an error parsing the subtitles that you uploaded. Please check the format and try again.": "\u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e0\u05d9\u05ea\u05d5\u05d7 \u05d4\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05e9\u05d4\u05e2\u05dc\u05ea. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d4\u05ea\u05d1\u05e0\u05d9\u05ea \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
     "Sorted by": "\u05de\u05d5\u05d9\u05d9\u05df \u05d1\u05d9\u05d3\u05d9", 
     "Specify an alternative to the official course title to display on certificates. Leave blank to use the official course title.": "\u05e6\u05d9\u05d9\u05df \u05d7\u05dc\u05d5\u05e4\u05d4 \u05dc\u05db\u05d5\u05ea\u05e8\u05ea \u05e7\u05d5\u05e8\u05e1 \u05e9\u05ea\u05d5\u05e6\u05d2 \u05d1\u05ea\u05e2\u05d5\u05d3\u05d5\u05ea. \u05d4\u05e9\u05d0\u05e8 \u05e8\u05d9\u05e7 \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05db\u05d5\u05ea\u05e8\u05ea \u05e7\u05d5\u05e8\u05e1 \u05e8\u05e9\u05de\u05d9\u05ea.", 
     "Specify any additional rules or rule exceptions that the proctoring review team should enforce when reviewing the videos. For example, you could specify that calculators are allowed.": "\u05e6\u05d9\u05d9\u05df \u05db\u05dc \u05db\u05dc\u05dc \u05e0\u05d5\u05e1\u05e3 \u05d0\u05d5 \u05d7\u05e8\u05d9\u05d2\u05d4 \u05de\u05d4\u05db\u05dc\u05dc\u05d9\u05dd \u05e9\u05d9\u05db\u05d5\u05dc \u05e6\u05d5\u05d5\u05ea \u05d4\u05d1\u05d7\u05d9\u05e0\u05d4 \u05ea\u05d7\u05ea \u05e4\u05d9\u05e7\u05d5\u05d7 \u05dc\u05d4\u05d7\u05d9\u05dc \u05d1\u05e2\u05ea \u05d1\u05d7\u05d9\u05e0\u05ea \u05e1\u05e8\u05d8\u05d5\u05e0\u05d9 \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5. \u05dc\u05d3\u05d5\u05d2\u05de\u05d4, \u05e0\u05d9\u05ea\u05df \u05dc\u05e6\u05d9\u05d9\u05df \u05e9\u05de\u05d5\u05ea\u05e8 \u05dc\u05d4\u05d9\u05e2\u05d6\u05e8 \u05d1\u05de\u05d7\u05e9\u05d1\u05d5\u05e0\u05d9\u05dd.", 
@@ -785,26 +784,26 @@
     "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 public display name of the program.": "\u05e9\u05dd \u05d4\u05ea\u05e6\u05d5\u05d2\u05d4 \u05d4\u05e6\u05d9\u05d1\u05d5\u05e8\u05d9 \u05e9\u05dc \u05d4\u05ea\u05db\u05e0\u05d9\u05ea.", 
     "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\u05d2\u05d5\u05dc\u05de\u05d9\u05ea \u05d4\u05d9\u05d0:", 
+    "The raw error message is:": "\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d4\u05d9\u05d0:", 
     "The timed transcript for the first video file does not appear to be the same as the timed transcript for the second video file.": "\u05e0\u05e8\u05d0\u05d4 \u05db\u05d9 \u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df \u05dc\u05e7\u05d5\u05d1\u05e5 \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05e8\u05d0\u05e9\u05d5\u05df \u05d0\u05d9\u05e0\u05d5 \u05d3\u05d5\u05de\u05d4 \u05dc\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df \u05e9\u05dc \u05e7\u05d5\u05d1\u05e5 \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05e9\u05e0\u05d9.", 
     "The timed transcript for this video on edX is out of date, but YouTube has a current timed transcript for this video.": "\u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df \u05e2\u05d1\u05d5\u05e8 \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d6\u05d4 \u05d1-edX \u05de\u05d9\u05d5\u05e9\u05df, \u05d0\u05da \u05e7\u05d9\u05d9\u05de\u05ea \u05d2\u05e8\u05e1\u05d4 \u05e2\u05d3\u05db\u05e0\u05d9\u05ea \u05e2\u05d1\u05d5\u05e8 \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d6\u05d4 \u05dc-YouTube.", 
     "The title entered here will override the title set for the individual run of the course. It will be displayed on the XSeries progress page and in marketing presentations.": "\u05d4\u05db\u05d5\u05ea\u05e8\u05ea \u05e9\u05d4\u05d5\u05d6\u05e0\u05d4 \u05db\u05d0\u05df \u05ea\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4\u05db\u05d5\u05ea\u05e8\u05ea \u05e9\u05d4\u05d5\u05d2\u05d3\u05e8\u05d4 \u05dc\u05d4\u05e8\u05e6\u05d4 \u05d9\u05d7\u05d9\u05d3\u05d4 \u05e9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1. \u05d4\u05d9\u05d0 \u05ea\u05d5\u05e6\u05d2 \u05d1\u05d3\u05e3 \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05e9\u05dc XSeries \u05d5\u05d1\u05de\u05e6\u05d2\u05d5\u05ea \u05d4\u05e9\u05d9\u05d5\u05d5\u05e7.", 
     "The unique number that identifies your course within your organization, e.g. CS101.": "\u05d4\u05de\u05e1\u05e4\u05e8 \u05d4\u05d9\u05d9\u05d7\u05d5\u05d3\u05d9 \u05d4\u05de\u05d6\u05d4\u05d4 \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e9\u05dc\u05da \u05d1\u05ea\u05d5\u05da \u05d4\u05d0\u05e8\u05d2\u05d5\u05df, \u05dc\u05d3\u05d5\u05d2\u05de\u05d4 CS101.", 
     "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.", 
     "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 while exporting.": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05e6\u05d5\u05d0 \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. ", 
     "There is invalid code in your content. Please check to make sure it is valid HTML.": "\u05d9\u05e9 \u05e7\u05d5\u05d3 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9 \u05d1\u05ea\u05d5\u05db\u05df \u05e9\u05dc\u05da. \u05d0\u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05d6\u05d4\u05d5 HTML \u05d7\u05d5\u05e7\u05d9.", 
     "There must be at least one group.": "\u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05d9\u05d5\u05ea \u05dc\u05e4\u05d7\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d4 \u05d0\u05d7\u05ea.", 
     "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 an error changing the user's role": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\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 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 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.": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05d5\u05e8\u05d3\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5.", 
-    "There was an error while verifying the file you submitted.": "\u05e7\u05e8\u05ea\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": "\u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e2\u05dc\u05d0\u05d4", 
+    "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.", 
@@ -822,9 +821,9 @@
     "This is the Name of the Group Configuration": "\u05d6\u05d4\u05d5 \u05e9\u05dd \u05d4\u05d2\u05d3\u05e8\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
     "This is the name of the group": "\u05d6\u05d4\u05d5 \u05e9\u05dd \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
     "This learner is currently sharing a limited profile.": "\u05dc\u05d5\u05de\u05d3 \u05d6\u05d4 \u05de\u05e9\u05ea\u05e3 \u05db\u05e8\u05d2\u05e2 \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05de\u05d5\u05d2\u05d1\u05dc.", 
-    "This link will open in a modal window": "\u05e7\u05d9\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05d9\u05e4\u05ea\u05d7 \u05d1\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9", 
+    "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\u05d3\u05e3 \u05d0\u05d5 \u05d5\u05d3\u05d0 \u05e9\u05d4\u05d9\u05e0\u05da \u05de\u05e7\u05d5\u05d5\u05df.", 
+    "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 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 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\u05d3\u05e3 \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05e9\u05dc \u05dc\u05d5\u05de\u05d3.", 
@@ -837,7 +836,6 @@
     "Timed Transcript Uploaded Successfully": "\u05ea\u05de\u05dc\u05d9\u05dc \u05de\u05ea\u05d5\u05d6\u05de\u05df \u05d4\u05d5\u05e2\u05dc\u05d4 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4", 
     "Timed Transcript from %(filename)s": "\u05ea\u05de\u05dc\u05d9\u05dc \u05de\u05ea\u05d5\u05d6\u05de\u05df \u05de%(filename)s", 
     "Tips on taking a successful photo": "\u05d8\u05d9\u05e4\u05d9\u05dd \u05dc\u05e6\u05d9\u05dc\u05d5\u05dd \u05ea\u05de\u05d5\u05e0\u05d4 \u05d8\u05d5\u05d1\u05d4", 
-    "Title": "\u05db\u05d5\u05ea\u05e8\u05ea", 
     "Title ": "\u05db\u05d5\u05ea\u05e8\u05ea ", 
     "Title of the signatory": "\u05db\u05d5\u05ea\u05e8\u05ea \u05d4\u05d7\u05d5\u05ea\u05b5\u05dd", 
     "Title:": "\u05db\u05d5\u05ea\u05e8\u05ea:", 
@@ -848,7 +846,6 @@
     "To receive a certificate, you must also verify your identity before %(date)s.": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e7\u05d1\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05d5\u05d5\u05d3\u05d0 \u05d2\u05dd \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da \u05dc\u05e4\u05e0\u05d9 %(date)s.", 
     "To receive a certificate, you must also verify your identity.": "\u05db\u05d3\u05d9 \u05dc\u05e7\u05d1\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05d0\u05de\u05ea \u05d2\u05dd \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da.", 
     "To receive credit on a problem, you must click \"Check\" or \"Final Check\" on it before you select \"End My Exam\".": "\u05db\u05d3\u05d9 \u05dc\u05e7\u05d1\u05dc \u05e0\u05e7\u05d5\u05d3\u05ea \u05d6\u05db\u05d5\u05ea \u05e2\u05dc \u05d1\u05e2\u05d9\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05dc\u05d7\u05d5\u05e5 \u05e2\u05dc \"\u05d1\u05d3\u05d5\u05e7\" \u05d0\u05d5 \u05e2\u05dc \"\u05d1\u05d3\u05d9\u05e7\u05d4 \u05e1\u05d5\u05e4\u05d9\u05ea\" \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05d1\u05d7\u05e8 \"\u05e1\u05d9\u05d5\u05dd \u05d4\u05de\u05d1\u05d7\u05df \u05e9\u05dc\u05d9\".", 
-    "To review student cohort assignments or see the results of uploading a CSV file, download course profile information or cohort results on the {link_start}Data Download{link_end} page.": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e1\u05e7\u05d5\u05e8 \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d1\u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5 \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05d4\u05e2\u05dc\u05d0\u05ea \u05e7\u05d5\u05d1\u05e5 \u05d4-CSV, \u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d5\u05e8\u05d9\u05d3 \u05d0\u05ea \u05de\u05d9\u05d3\u05e2 \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05de\u05d9\u05d3\u05d4 \u05d1\u05e2\u05de\u05d5\u05d3 {link_start}Data Download{link_end}.", 
     "To share your certificate on Mozilla Backpack, you must first have a Backpack account. Complete the following steps to add your certificate to Backpack.": "\u05db\u05d3\u05d9 \u05dc\u05e9\u05ea\u05e3 \u05d0\u05ea \u05ea\u05e2\u05d5\u05d3\u05ea\u05da \u05d1-Mozilla Backpack, \u05e2\u05dc\u05d9\u05da \u05dc\u05e4\u05ea\u05d5\u05d7 \u05d7\u05e9\u05d1\u05d5\u05df Backpack \u05ea\u05d7\u05d9\u05dc\u05d4. \u05d4\u05e9\u05dc\u05dd \u05d0\u05ea \u05d4\u05e9\u05dc\u05d1\u05d9\u05dd \u05d4\u05d1\u05d0\u05d9\u05dd \u05db\u05d3\u05d9 \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d0\u05ea \u05ea\u05e2\u05d5\u05d3\u05ea\u05da \u05dc-Backpack.", 
     "To take a successful photo, make sure that:": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e6\u05dc\u05dd \u05ea\u05de\u05d5\u05e0\u05d4 \u05de\u05d5\u05e6\u05dc\u05d7\u05ea, \u05d5\u05d3\u05d0 \u05db\u05d9:", 
     "To use the current photo, select the camera button {icon}. To take another photo, select the retake button {icon}.": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05ea\u05de\u05d5\u05e0\u05d4 \u05d4\u05e2\u05d3\u05db\u05e0\u05d9\u05ea, \u05d1\u05d7\u05e8 \u05d1\u05dc\u05d7\u05e6\u05df \u05d4\u05de\u05e6\u05dc\u05de\u05d4 {icon}. \u05db\u05d3\u05d9 \u05dc\u05e6\u05dc\u05dd \u05ea\u05de\u05d5\u05e0\u05d4 \u05d0\u05d7\u05e8\u05ea, \u05d1\u05d7\u05e8 \u05d1\u05dc\u05d7\u05e6\u05df \u05d4\u05e6\u05d9\u05dc\u05d5\u05dd \u05de\u05d7\u05d3\u05e9 {icon}.", 
@@ -877,7 +874,7 @@
     "Update post": "\u05e2\u05d3\u05db\u05df \u05e4\u05d5\u05e1\u05d8", 
     "Update response": "\u05e2\u05d3\u05db\u05df \u05ea\u05d2\u05d5\u05d1\u05d4", 
     "Update team.": "\u05e2\u05d3\u05db\u05df \u05e6\u05d5\u05d5\u05ea.", 
-    "Updating Tags": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d2\u05d9\u05dd", 
+    "Updating Tags": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d2\u05d9\u05d5\u05ea", 
     "Upgrade Deadline": "\u05de\u05d5\u05e2\u05d3 \u05e9\u05d3\u05e8\u05d5\u05d2", 
     "Upgrade Now": "\u05e9\u05d3\u05e8\u05d2 \u05e2\u05db\u05e9\u05d9\u05d5", 
     "Upgrade to a Verified Certificate for {courseName}": "\u05e9\u05d3\u05e8\u05d2 \u05dc\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d0\u05d5\u05de\u05ea\u05ea \u05e2\u05d1\u05d5\u05e8 {courseName}", 
@@ -949,7 +946,7 @@
     "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 1-2 days). In the meantime, you can still access all available course content.": "\u05e7\u05d9\u05d1\u05dc\u05e0\u05d5 \u05d0\u05ea \u05d4\u05de\u05d9\u05d3\u05e2 \u05e9\u05dc\u05da \u05d5\u05d0\u05e0\u05d5 \u05de\u05d0\u05de\u05ea\u05d9\u05dd \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da. \u05ea\u05e8\u05d0\u05d4 \u05d4\u05d5\u05d3\u05e2\u05d4 \u05d1\u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4 \u05db\u05d0\u05e9\u05e8 \u05d9\u05d5\u05e9\u05dc\u05dd \u05ea\u05d4\u05dc\u05d9\u05da \u05d4\u05d0\u05d9\u05de\u05d5\u05ea  (\u05dc\u05e8\u05d5\u05d1 \u05ea\u05d5\u05da \u05d9\u05d5\u05dd \u05d0\u05d5 \u05d9\u05d5\u05de\u05d9\u05d9\u05dd). \u05d1\u05d9\u05e0\u05ea\u05d9\u05d9\u05dd, \u05ea\u05d5\u05db\u05dc  \u05dc\u05d2\u05e9\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05dc\u05db\u05dc \u05ea\u05d5\u05db\u05df \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05d6\u05de\u05d9\u05df.", 
     "We just need a little more information before you start learning with %(platformName)s.": "\u05d0\u05e0\u05d7\u05e0\u05d5 \u05d6\u05e7\u05d5\u05e7\u05d9\u05dd \u05e8\u05e7 \u05dc\u05de\u05d9\u05d3\u05e2 \u05de\u05d5\u05e2\u05d8 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05ea\u05d7\u05d9\u05dc \u05dc\u05dc\u05de\u05d5\u05d3 \u05e2\u05dd %(platformName)s.", 
     "We use the highest levels of security available to encrypt your photo and send it to our authorization service for review. Your photo and information are not saved or visible anywhere on %(platformName)s after the verification process is complete.": "\u05d0\u05e0\u05d5 \u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d1\u05e8\u05de\u05d5\u05ea \u05d4\u05d2\u05d1\u05d5\u05d4\u05d5\u05ea \u05d1\u05d9\u05d5\u05ea\u05e8 \u05e9\u05dc \u05d0\u05d1\u05d8\u05d7\u05d4 \u05dc\u05d4\u05e6\u05e4\u05d9\u05df \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05e9\u05dc\u05da \u05d5\u05dc\u05e9\u05dc\u05d5\u05d7 \u05d0\u05d5\u05ea\u05d4 \u05dc\u05d1\u05d3\u05d9\u05e7\u05d4 \u05d1\u05e9\u05d9\u05e8\u05d5\u05ea \u05d4\u05d0\u05d9\u05de\u05d5\u05ea \u05e9\u05dc\u05e0\u05d5.  \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05d5\u05d4\u05de\u05d9\u05d3\u05e2 \u05d4\u05d0\u05d9\u05e9\u05d9 \u05e9\u05dc\u05da \u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d9\u05dd \u05d0\u05d5 \u05d2\u05dc\u05d5\u05d9\u05d9\u05dd \u05d1\u05d0\u05e3 \u05de\u05e7\u05d5\u05dd \u05d1-%(platformName)s \u05dc\u05d0\u05d7\u05e8 \u05d4\u05e9\u05dc\u05de\u05ea \u05ea\u05d4\u05dc\u05d9\u05da \u05d0\u05d9\u05de\u05d5\u05ea \u05d4\u05d6\u05d4\u05d5\u05ea.  ", 
-    "We're sorry, there was an error": "\u05d0\u05e0\u05d5 \u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4", 
+    "We're sorry, there was an error": "\u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4", 
     "Web:": "\u05d0\u05ea\u05e8 \u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8:", 
     "Webcam": "\u05de\u05e6\u05dc\u05de\u05ea \u05e8\u05e9\u05ea", 
     "Weight of Total Grade": "\u05de\u05e9\u05e7\u05dc \u05e1\u05da \u05d4\u05e6\u05d9\u05d5\u05df", 
@@ -988,11 +985,11 @@
     "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. 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 \u05d3\u05e3 \u05d6\u05d4?", 
+    "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 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\"\u05dc \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 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 specify a name": "\u05e2\u05dc\u05d9\u05da \u05dc\u05ea\u05ea \u05e9\u05dd", 
     "You need a certificate in this course to be eligible for a program certificate.": "\u05d0\u05ea\u05d4 \u05e6\u05e8\u05d9\u05da \u05ea\u05e2\u05d5\u05d3\u05d4 \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05db\u05d3\u05d9 \u05dc\u05e7\u05d1\u05dc \u05ea\u05e2\u05d5\u05d3\u05ea \u05ea\u05db\u05e0\u05d9\u05ea.", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u05d4\u05d9\u05e0\u05da \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 \u05d4\u05d9\u05e0\u05da \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05dc\u05de\u05e6\u05dc\u05de\u05d4.", 
@@ -1002,7 +999,7 @@
     "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page.": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05d5\u05db\u05dc \u05dc\u05d4\u05d9\u05e8\u05e9\u05dd \u05dc\u05e7\u05d5\u05e8\u05e1. \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05ea\u05d9\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05e0\u05db\u05e0\u05e1 \u05e9\u05dc\u05da \u05dc\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4. \u05dc\u05d0\u05d7\u05e8 \u05d4\u05e9\u05dc\u05de\u05ea \u05e9\u05dc\u05d1 \u05d4\u05d4\u05e4\u05e2\u05dc\u05d4, \u05d9\u05e9 \u05d1\u05d0\u05e4\u05e9\u05e8\u05d5\u05ea\u05da \u05dc\u05d7\u05d6\u05d5\u05e8 \u05d5\u05dc\u05e8\u05e2\u05e0\u05df \u05d3\u05e3 \u05d6\u05d4. ", 
     "You reserve all rights for your work": " \u05db\u05dc \u05d4\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05e2\u05dc \u05e2\u05d1\u05d5\u05d3\u05ea\u05da \u05e9\u05de\u05d5\u05e8\u05d5\u05ea \u05e2\u05de\u05da.", 
     "You still need to visit the %(display_name)s website to complete the credit process.": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d1\u05e7\u05e8 \u05e2\u05d3\u05d9\u05d9\u05df \u05d1\u05d0\u05ea\u05e8 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8 %(display_name)s \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05ea\u05d4\u05dc\u05d9\u05da \u05e7\u05d1\u05dc\u05ea \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05d4\u05d6\u05db\u05d5\u05ea.", 
-    "You waive some rights for your work, such that others can use it too": "\u05d0\u05ea\u05d4 \u05de\u05d5\u05d5\u05ea\u05e8 \u05e2\u05dc \u05db\u05de\u05d4 \u05de\u05d6\u05db\u05d5\u05d9\u05d5\u05ea\u05d9\u05d9\u05da \u05e2\u05dc \u05e2\u05d1\u05d5\u05d3\u05ea\u05da \u05db\u05d3\u05d9 \u05e9\u05d2\u05dd \u05d0\u05d7\u05e8\u05d9\u05dd \u05d9\u05d5\u05db\u05dc\u05d5 \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d4", 
+    "You waive some rights for your work, such that others can use it too": "\u05d0\u05ea\u05d4 \u05de\u05d5\u05d5\u05ea\u05e8 \u05e2\u05dc \u05de\u05e1\u05e4\u05e8 \u05d6\u05db\u05d5\u05d9\u05d5\u05ea\u05d9\u05d9\u05da \u05e2\u05dc \u05e2\u05d1\u05d5\u05d3\u05ea\u05da \u05db\u05d3\u05d9 \u05e9\u05d0\u05d7\u05e8\u05d9\u05dd \u05d9\u05d5\u05db\u05dc\u05d5 \u05d2\u05dd \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d4", 
     "You will not receive notification for emails that bounce, so double-check your spelling.": "\u05dc\u05d0 \u05ea\u05e7\u05d1\u05dc \u05d4\u05ea\u05e8\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05d4\u05d5\u05d3\u05e2\u05d5\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05e9\u05dc\u05d0 \u05d9\u05d2\u05d9\u05e2\u05d5 \u05dc\u05d9\u05e2\u05d3\u05df, \u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05e9\u05d5\u05d1 \u05d0\u05ea \u05d4\u05d0\u05d9\u05d5\u05ea. ", 
     "You will use your webcam to take a picture of your face and of your government-issued photo ID.": "\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e6\u05dc\u05dd \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e0\u05d9\u05da \u05d5\u05d0\u05ea \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4, \u05e9\u05d4\u05d5\u05e0\u05e4\u05e7\u05d4 \u05d1\u05d9\u05d3\u05d9 \u05d4\u05de\u05de\u05e9\u05dc\u05d4, \u05e2\u05dd \u05d4\u05ea\u05de\u05d5\u05e0\u05d4.", 
     "You!": "\u05d0\u05ea\u05d4!", 
@@ -1074,7 +1071,7 @@
     "section.title": "section.title", 
     "send an email message to {email}": "\u05e9\u05dc\u05d7 \u05d4\u05d5\u05d3\u05e2\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05dc{email}", 
     "status": "\u05d3\u05d5\u05d7 \u05de\u05e6\u05d1", 
-    "subsection": "\u05ea\u05ea \u05de\u05e7\u05d8\u05e2", 
+    "subsection": "\u05ea\u05ea \u05e4\u05e8\u05e7", 
     "timed": "\u05de\u05ea\u05d5\u05d6\u05de\u05df", 
     "title": "\u05db\u05d5\u05ea\u05e8\u05ea", 
     "unanswered question": "\u05e9\u05d0\u05dc\u05d4 \u05e9\u05dc\u05d0 \u05e0\u05e2\u05e0\u05ea\u05d4", 
@@ -1086,12 +1083,18 @@
     "{0} is invalid": "{0} \u05d0\u05d9\u05e0\u05d5 \u05d7\u05d5\u05e7\u05d9", 
     "{0} is required": "{0} \u05d4\u05d5\u05d0 \u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4", 
     "{0} must be a number": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05de\u05e1\u05e4\u05e8", 
-    "{0} must be a valid email": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05d7\u05d5\u05e7\u05d9", 
-    "{0} must be a valid url": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea url \u05d7\u05d5\u05e7\u05d9", 
+    "{0} must be a valid email": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d7\u05d5\u05e7\u05d9", 
+    "{0} must be a valid url": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05ea URL \u05d7\u05d5\u05e7\u05d9\u05ea", 
     "{0} must be accepted": "\u05d7\u05d5\u05d1\u05d4 \u05dc\u05e7\u05d1\u05dc {0} ", 
+    "{0} must be at least {1} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e2\u05dc {1} \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05db\u05dc \u05d4\u05e4\u05d7\u05d5\u05ea", 
+    "{0} must be at most {1} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e2\u05dc {1} \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05db\u05dc \u05d4\u05d9\u05d5\u05ea\u05e8", 
     "{0} must be between {1} and {2}": "{0}  \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05d9\u05df {1} \u05dc-{2}", 
+    "{0} must be between {1} and {2} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05d9\u05df {1} \u05d5-{2} \u05ea\u05d5\u05d5\u05d9\u05dd ", 
+    "{0} must be greater than or equal to {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc \u05d0\u05d5 \u05e9\u05d5\u05d5\u05d4 \u05dc-{1}", 
+    "{0} must be less than or equal to {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e7\u05d8\u05df \u05d0\u05d5 \u05e9\u05d5\u05d5\u05d4 \u05dc- {1}", 
     "{0} must be one of: {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d0\u05d7\u05d3 \u05de:  {1}", 
     "{0} must be the same as {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d6\u05d4\u05d4 \u05dc-{1}", 
+    "{0} must be {1} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e2\u05dc {1} \u05ea\u05d5\u05d5\u05d9\u05dd", 
     "{0} must only contain digits": "{0}  \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05db\u05d9\u05dc \u05e8\u05e7 \u05e1\u05e4\u05e8\u05d5\u05ea", 
     "{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.", 
diff --git a/cms/static/js/i18n/pt-br/djangojs.js b/cms/static/js/i18n/pt-br/djangojs.js
index 2bc117fe91..bcd41c61d8 100644
--- a/cms/static/js/i18n/pt-br/djangojs.js
+++ b/cms/static/js/i18n/pt-br/djangojs.js
@@ -506,7 +506,6 @@
     "Edit Membership": "Editar assinatura.", 
     "Edit Team": "Editar equipe", 
     "Edit Your Name": "Edite o seu nome", 
-    "Edit post title": "Editar t\u00edtulo da publica\u00e7\u00e3o", 
     "Edit the name": "Editar nome", 
     "Edit this certificate?": "Gostaria de editar este certificado?", 
     "Editable": "Edit\u00e1vel", 
@@ -546,7 +545,6 @@
     "Enter the page number you'd like to quickly navigate to.": "Entre com o n\u00famero da p\u00e1gina que voc\u00ea gostaria de acessar rapidamente", 
     "Enter the username or email address of each learner that you want to add as an exception.": "Informe o nome de usu\u00e1rio ou endere\u00e7o de e-mail de cada aluno que voc\u00ea deseja adicionar como uma exce\u00e7\u00e3o.", 
     "Enter username or email": "Digite um nome de usu\u00e1rio ou email", 
-    "Enter your question or comment": "Insira sua pergunta ou coment\u00e1rio", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "Zerando n\u00famero de tentativas de Exame de Admiss\u00e3o para o aluno '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "O Exame de admiss\u00e3o do aluno '{student_id}' est\u00e1 sendo apagado.", 
     "Error": "Erro", 
@@ -1623,7 +1621,6 @@
     "less than a minute": "menos de um minuto", 
     "marked as answer %(time_ago)s": "marcado como resposta %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "marcado como resposta %(time_ago)s por %(user)s", 
-    "message": "mensagem", 
     "name": "nome", 
     "off": "Desligado", 
     "on": "Ligado", 
diff --git a/cms/static/js/i18n/rtl/djangojs.js b/cms/static/js/i18n/rtl/djangojs.js
index f34c6c746e..753fb851f1 100644
--- a/cms/static/js/i18n/rtl/djangojs.js
+++ b/cms/static/js/i18n/rtl/djangojs.js
@@ -412,6 +412,7 @@
     "Common Problem Types": "\u0630\u062e\u0648\u0648\u062e\u0631 \u062d\u0642\u062e\u0632\u0645\u062b\u0648 \u0641\u063a\u062d\u062b\u0633", 
     "Community TA": "\u0630\u062e\u0648\u0648\u0639\u0631\u0647\u0641\u063a \u0641\u0634", 
     "Component": "\u0630\u062e\u0648\u062d\u062e\u0631\u062b\u0631\u0641", 
+    "Component Location ID": "\u0630\u062e\u0648\u062d\u062e\u0631\u062b\u0631\u0641 \u0645\u062e\u0630\u0634\u0641\u0647\u062e\u0631 \u0647\u064a", 
     "Configure": "\u0630\u062e\u0631\u0628\u0647\u0644\u0639\u0642\u062b", 
     "Confirm": "\u0630\u062e\u0631\u0628\u0647\u0642\u0648", 
     "Confirm Timed Transcript": "\u0630\u062e\u0631\u0628\u0647\u0642\u0648 \u0641\u0647\u0648\u062b\u064a \u0641\u0642\u0634\u0631\u0633\u0630\u0642\u0647\u062d\u0641", 
@@ -528,7 +529,6 @@
     "Discussion": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631", 
     "Discussion Home": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631 \u0627\u062e\u0648\u062b", 
     "Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631 \u0634\u064a\u0648\u0647\u0631\u0633, \u0648\u062e\u064a\u062b\u0642\u0634\u0641\u062e\u0642\u0633, \u0634\u0631\u064a \u0641\u0634\u0633 \u0630\u0634\u0631 \u0648\u0634\u0646\u062b \u0641\u0627\u062b\u0647\u0642 \u062d\u062e\u0633\u0641\u0633 \u062f\u0647\u0633\u0647\u0632\u0645\u062b \u0641\u062e \u0634\u0645\u0645 \u0633\u0641\u0639\u064a\u062b\u0631\u0641\u0633 \u062e\u0642 \u0633\u062d\u062b\u0630\u0647\u0628\u063a \u0634 \u0633\u0647\u0631\u0644\u0645\u062b \u0630\u062e\u0627\u062e\u0642\u0641.", 
-    "Discussion topics; currently listing: ": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631 \u0641\u062e\u062d\u0647\u0630\u0633; \u0630\u0639\u0642\u0642\u062b\u0631\u0641\u0645\u063a \u0645\u0647\u0633\u0641\u0647\u0631\u0644: ", 
     "Display Name": "\u064a\u0647\u0633\u062d\u0645\u0634\u063a \u0631\u0634\u0648\u062b", 
     "Div": "\u064a\u0647\u062f", 
     "Do not show again": "\u064a\u062e \u0631\u062e\u0641 \u0633\u0627\u062e\u0635 \u0634\u0644\u0634\u0647\u0631", 
@@ -691,7 +691,6 @@
     "Files must be in JPEG or PNG format.": "\u0628\u0647\u0645\u062b\u0633 \u0648\u0639\u0633\u0641 \u0632\u062b \u0647\u0631 \u062a\u062d\u062b\u0644 \u062e\u0642 \u062d\u0631\u0644 \u0628\u062e\u0642\u0648\u0634\u0641.", 
     "Fill browser": "\u0628\u0647\u0645\u0645 \u0632\u0642\u062e\u0635\u0633\u062b\u0642", 
     "Filter and sort topics": "\u0628\u0647\u0645\u0641\u062b\u0642 \u0634\u0631\u064a \u0633\u062e\u0642\u0641 \u0641\u062e\u062d\u0647\u0630\u0633", 
-    "Filter topics": "\u0628\u0647\u0645\u0641\u062b\u0642 \u0641\u062e\u062d\u0647\u0630\u0633", 
     "Financial Assistance": "\u0628\u0647\u0631\u0634\u0631\u0630\u0647\u0634\u0645 \u0634\u0633\u0633\u0647\u0633\u0641\u0634\u0631\u0630\u062b", 
     "Financial Assistance Application": "\u0628\u0647\u0631\u0634\u0631\u0630\u0647\u0634\u0645 \u0634\u0633\u0633\u0647\u0633\u0641\u0634\u0631\u0630\u062b \u0634\u062d\u062d\u0645\u0647\u0630\u0634\u0641\u0647\u062e\u0631", 
     "Find": "\u0628\u0647\u0631\u064a", 
diff --git a/cms/static/js/i18n/ru/djangojs.js b/cms/static/js/i18n/ru/djangojs.js
index 471e72d492..438a905b67 100644
--- a/cms/static/js/i18n/ru/djangojs.js
+++ b/cms/static/js/i18n/ru/djangojs.js
@@ -618,7 +618,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\u0443\u0439\u0442\u0435 \u0421\u0432\u043e\u0451 \u0418\u043c\u044f", 
-    "Edit post title": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\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 the program marketing slug": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u0440\u0430\u0442\u043a\u043e\u0435 \u0442\u043e\u0440\u0433\u043e\u0432\u043e\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b", 
     "Edit the program subtitle": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u0434\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b", 
@@ -667,7 +666,6 @@
     "Enter the page number you'd like to quickly navigate to.": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u043e\u043c\u0435\u0440 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b, \u043a \u043a\u043e\u0442\u043e\u0440\u043e\u0439 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0439\u0442\u0438.", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043b\u0438 \u0430\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439.", 
     "Enter username or email": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043b\u0438 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441", 
-    "Enter your question or comment": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0441\u0432\u043e\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 \u0438\u043b\u0438 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u0441\u044f \u0441\u0431\u0440\u043e\u0441 \u0441\u0447\u0451\u0442\u0447\u0438\u043a\u0430 \u043f\u043e\u043f\u044b\u0442\u043e\u043a \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0432\u0441\u0442\u0443\u043f\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u044f \u0434\u043b\u044f \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u044f '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "\u0423\u0434\u0430\u043b\u044f\u0435\u0442\u0441\u044f \u0441\u0442\u0430\u0442\u0443\u0441 \u0432\u0441\u0442\u0443\u043f\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u044f \u0434\u043b\u044f '{student_id}'.", 
     "Error": "\u041e\u0448\u0438\u0431\u043a\u0430", 
@@ -838,6 +836,7 @@
     "If you leave, you can no longer post in this team's discussions. Your place will be available to another learner.": "\u041f\u043e\u043a\u0438\u043d\u0443\u0432 \u043a\u043e\u043c\u0430\u043d\u0434\u0443, \u0432\u044b \u0431\u043e\u043b\u044c\u0448\u0435 \u043d\u0435 \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u0447\u0430\u0441\u0442\u0432\u043e\u0432\u0430\u0442\u044c \u0432 \u0435\u0451 \u043e\u0431\u0441\u0443\u0436\u0434\u0435\u043d\u0438\u044f\u0445.  \u0412\u0430\u0448\u0435 \u043c\u0435\u0441\u0442\u043e \u0441\u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u043d\u044f\u0442\u044c \u0434\u0440\u0443\u0433\u043e\u0439 \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u044c.", 
     "If you make significant changes, make sure you notify members of the team before making these changes.": "\u041f\u0435\u0440\u0435\u0434 \u0442\u0435\u043c, \u043a\u0430\u043a \u0432\u043d\u043e\u0441\u0438\u0442\u044c \u0437\u043d\u0430\u0447\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f, \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e \u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0434\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u0438\u0445 \u0447\u043b\u0435\u043d\u043e\u0432 \u043a\u043e\u043c\u0430\u043d\u0434\u044b.", 
     "If you make this %(xblockType)s visible to learners, learners will be able to see its content after the release date has passed and you have published the unit. Only units that are explicitly hidden from learners will remain hidden after you clear this option for the %(xblockType)s.": "\u0415\u0441\u043b\u0438 \u0441\u0434\u0435\u043b\u0430\u0442\u044c \u044d\u0442\u043e\u0442 %(xblockType)s \u0432\u0438\u0434\u0438\u043c\u044b\u043c \u0434\u043b\u044f \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0435\u0439, \u043d\u0430\u0447\u0438\u043d\u0430\u044f \u0441 \u0434\u0430\u0442\u044b \u0432\u044b\u043f\u0443\u0441\u043a\u0430 \u0438 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0438 \u0431\u043b\u043e\u043a\u0430 \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0438 \u0441\u043c\u043e\u0433\u0443\u0442 \u043f\u0440\u043e\u0441\u043c\u0430\u0442\u0440\u0438\u0432\u0430\u0442\u044c \u0435\u0433\u043e \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435. \u0422\u043e\u043b\u044c\u043a\u043e \u0431\u043b\u043e\u043a\u0438, \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u043d\u043e \u043f\u043e\u043c\u0435\u0447\u0435\u043d\u043d\u044b\u0435 \u043a\u0430\u043a \u0441\u043a\u0440\u044b\u0442\u044b\u0435, \u043e\u0441\u0442\u0430\u043d\u0443\u0442\u0441\u044f \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u044b\u043c\u0438, \u043f\u043e\u0441\u043b\u0435 \u0442\u043e\u0433\u043e, \u043a\u0430\u043a \u0412\u044b \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u0435 \u044d\u0442\u0443 \u043e\u043f\u0446\u0438\u044e \u0434\u043b\u044f %(xblockType)s.", 
+    "If you select an option other than \"%(hide_label)s\", after the subsection release date has passed, published units in this subsection will become available to learners unless units are explicitly hidden.": "\u0415\u0441\u043b\u0438 \u0412\u044b \u0432\u044b\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u0430\u043a\u043e\u0439-\u043b\u0438\u0431\u043e \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u043a\u0440\u043e\u043c\u0435 \"%(hide_label)s\", \u043f\u0440\u0438 \u043d\u0430\u0441\u0442\u0443\u043f\u043b\u0435\u043d\u0438\u0438 \u0434\u0430\u0442\u044b \u0432\u044b\u043f\u0443\u0441\u043a\u0430 \u043f\u043e\u0434\u0440\u0430\u0437\u0434\u0435\u043b\u0430 \u043e\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0431\u043b\u043e\u043a\u0438 \u0438\u0437 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0434\u0435\u043b\u0430 \u0441\u0442\u0430\u043d\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u043e\u0431\u0443\u0447\u0430\u044e\u0449\u0438\u043c\u0441\u044f, \u0437\u0430 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u043c \u0431\u043b\u043e\u043a\u043e\u0432, \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u043d\u043e \u0441\u043a\u0440\u044b\u0442\u044b\u0445 \u0430\u0432\u0442\u043e\u0440\u0430\u043c\u0438.", 
     "If you use the Advanced Editor, this problem will be converted to XML and you will not be able to return to the Simple Editor Interface.\n\nProceed to the Advanced Editor and convert this problem to XML?": "\u0415\u0441\u043b\u0438 \u0432\u044b \u0432\u043e\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0435\u0441\u044c \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u043c \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u043e\u043c, \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u043e \u0432 \u0444\u043e\u0440\u043c\u0430\u0442 XML, \u0438 \u0432\u044b \u043d\u0435 \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a \u043f\u0440\u043e\u0441\u0442\u043e\u043c\u0443 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u0443.\n\n\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u043c\u0443 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u0443 \u0438 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u0442\u044c \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u0432 \u0444\u043e\u0440\u043c\u0430\u0442 XML?", 
     "Ignore": "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c", 
     "Ignore all": "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0432\u0441\u0435", 
@@ -1989,7 +1988,6 @@
     "less than a minute": "\u043c\u0435\u043d\u044c\u0448\u0435 \u043c\u0438\u043d\u0443\u0442\u044b", 
     "marked as answer %(time_ago)s": "\u043e\u0442\u043c\u0435\u0447\u0435\u043d\u043e \u043a\u0430\u043a \u043e\u0442\u0432\u0435\u0442 %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "\u043e\u0442\u043c\u0435\u0447\u0435\u043d\u043e \u043a\u0430\u043a \u043e\u0442\u0432\u0435\u0442 %(time_ago)s \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c %(user)s", 
-    "message": "\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435", 
     "name": "\u0438\u043c\u044f", 
     "not enrolled": "\u043d\u0435 \u0437\u0430\u0447\u0438\u0441\u043b\u0435\u043d", 
     "off": "\u0432\u044b\u043a\u043b", 
diff --git a/cms/static/js/i18n/zh-cn/djangojs.js b/cms/static/js/i18n/zh-cn/djangojs.js
index a2a99d2657..6d0e31e0d2 100644
--- a/cms/static/js/i18n/zh-cn/djangojs.js
+++ b/cms/static/js/i18n/zh-cn/djangojs.js
@@ -427,7 +427,6 @@
     "Edit Membership": "\u7f16\u8f91\u56e2\u961f\u6210\u5458\u4fe1\u606f", 
     "Edit Team": "\u7f16\u8f91\u56e2\u961f", 
     "Edit Your Name": "\u7f16\u8f91\u4f60\u7684\u540d\u5b57", 
-    "Edit post title": "\u7f16\u8f91\u8ba8\u8bba\u5e16\u6807\u9898", 
     "Editable": "\u53ef\u7f16\u8f91", 
     "Editing comment": "\u7f16\u8f91\u8bc4\u8bba", 
     "Editing post": "\u7f16\u8f91\u8ba8\u8bba\u5e16", 
@@ -467,7 +466,6 @@
     "Enter the page number you'd like to quickly navigate to.": "\u8f93\u5165\u60a8\u9700\u8981\u5feb\u901f\u524d\u5f80\u7684\u9875\u7801\u3002", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u8f93\u5165\u60a8\u8981\u6dfb\u52a0\u4e3a\u7279\u6b8a\u5904\u7406\u7684\u6bcf\u4e00\u4f4d\u5b66\u5458\u7684\u7528\u6237\u540d\u6216\u7535\u5b50\u90ae\u4ef6\u3002", 
     "Enter username or email": "\u8f93\u5165\u7528\u6237\u540d\u6216\u8005\u7535\u5b50\u90ae\u4ef6\u5730\u5740", 
-    "Enter your question or comment": "\u8bf7\u8f93\u5165\u60a8\u7684\u95ee\u9898\u6216\u8005\u8bc4\u8bba", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "\u6b63\u5728\u91cd\u7f6e\u5b66\u751f\u201c{student_id}\u201d\u7684\u5165\u5b66\u8003\u8bd5\u5c1d\u8bd5\u6b21\u6570\u3002", 
     "Entrance exam state is being deleted for student '{student_id}'.": "\u5b66\u751f'{student_id}'\u7684\u5165\u5b66\u8003\u8bd5\u7684\u72b6\u6001\u5df2\u88ab\u5220\u9664\u3002", 
     "Error": "\u9519\u8bef", 
diff --git a/common/djangoapps/student/tests/test_reset_password.py b/common/djangoapps/student/tests/test_reset_password.py
index 0bef3d29a7..13d8243d07 100644
--- a/common/djangoapps/student/tests/test_reset_password.py
+++ b/common/djangoapps/student/tests/test_reset_password.py
@@ -252,6 +252,25 @@ class ResetPasswordTests(EventTestMixin, CacheIsolationTestCase):
         self.user = User.objects.get(pk=self.user.pk)
         self.assertTrue(self.user.is_active)
 
+    def test_password_reset_fail(self):
+        """Tests that if we provide mismatched passwords, user is not marked as active."""
+        self.assertFalse(self.user.is_active)
+
+        url = reverse(
+            'password_reset_confirm',
+            kwargs={'uidb36': self.uidb36, 'token': self.token}
+        )
+        request_params = {'new_password1': 'password1', 'new_password2': 'password2'}
+        confirm_request = self.request_factory.post(url, data=request_params)
+
+        # Make a password reset request with mismatching passwords.
+        resp = password_reset_confirm_wrapper(confirm_request, self.uidb36, self.token)
+
+        # Verify the response status code is: 200 with password reset fail and also verify that
+        # the user is not marked as active.
+        self.assertEqual(resp.status_code, 200)
+        self.assertFalse(User.objects.get(pk=self.user.pk).is_active)
+
     @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/views.py b/common/djangoapps/student/views.py
index b2d1ad4771..45c8b75541 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -2242,6 +2242,13 @@ def password_reset_confirm_wrapper(request, uidb36=None, token=None):
             request, uidb64=uidb64, token=token, extra_context=platform_name
         )
 
+        # If password reset was unsuccessful a template response is returned (status_code 200).
+        # Check if form is invalid then show an error to the user.
+        # Note if password reset was successful we get response redirect (status_code 302).
+        if response.status_code == 200 and not response.context_data['form'].is_valid():
+            response.context_data['err_msg'] = _('Error in resetting your password. Please try again.')
+            return response
+
         # get the updated user
         updated_user = User.objects.get(id=uid_int)
 
diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 08d3d18322..5fcd28a630 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -1523,10 +1523,3 @@ div.problem .annotation-input {
     background: url('#{$static-path}/images/partially-correct-icon.png') center center no-repeat;
   }
 }
-
-// Loading Spinner
-// ====================
-.problems-wrapper .loading-spinner {
-  text-align: center;
-  color: $gray-d1;
-}
diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss
index a826ea365a..79bdf9f09f 100644
--- a/common/lib/xmodule/xmodule/css/video/display.scss
+++ b/common/lib/xmodule/xmodule/css/video/display.scss
@@ -21,7 +21,7 @@
 
 .video {
   @include clearfix();
-  background: rgb(240, 243, 245); // UXPL grayscale-cool xx-light;
+  background: rgb(245, 245, 245); // UXPL grayscale x-back
   display: block;
   margin: 0 -12px;
   padding: 12px;
@@ -74,71 +74,69 @@
     width: 0px;
     height: 0px;
   }
-
-  .wrapper-downloads {
-    margin: 0;
-    padding: 0;
-
-    .video-download-button {
-      display: inline-block;
-      vertical-align: top;
-      margin: ($baseline*0.75) ($baseline/2) 0 0;
-
-      > a {
-        @include transition(all $tmg-f2 ease-in-out 0s);
-        @include font-size(14);
-        line-height : 14px;
-        float: left;
-        border-radius: 3px;
-        background-color: $very-light-text;
-        padding: ($baseline*0.75);
-        color: $lighter-base-font-color;
-
-        &:hover,
-        &:focus {
-          background-color: $action-primary-active-bg;
-          color: $very-light-text;
+  
+    .downloads-heading {
+        margin: 1em 0 0 0;
+    }
+  
+    .wrapper-downloads {
+        display: flex;
+        
+        .hd {
+            margin: 0;
+        }
+        
+        .wrapper-download-video,
+        .wrapper-download-transcripts,
+        .wrapper-handouts,
+        .branding {
+            flex: 1;
+            margin-top: $baseline;
+            @include padding-right($baseline);
+            vertical-align: top;
+        }
+        
+        .wrapper-download-video {
+            
+            .video-sources {
+                margin: 0;
+            }
+        }
+        
+        .wrapper-download-transcripts {
+            
+            .list-download-transcripts {
+                margin: 0;
+                padding: 0;
+                list-style: none;
+                
+                .transcript-option {
+                    margin: 0;
+                }
+            }
+        }
+        
+        .branding {
+            @include padding-right(0);
+
+            .host-tag {
+                position: absolute;
+                left: -9999em;
+                display: inline-block;
+                vertical-align: middle;
+                color: $base-font-color;
+            }
+
+            .brand-logo {
+                display: inline-block;
+                max-width: 100%;
+                max-height: ($baseline*2);
+                padding: ($baseline/4) 0;
+                vertical-align: middle;
+            }
         }
-      }
     }
 
-    .video-tracks {
-
-      > a {
-        border-radius: 3px 0 0 3px;
-      }
-
-      > a.external-track {
-        border-radius: 3px;
-      }
-    }
-
-    .branding {
-      display: inline-block;
-      float: right;
-      margin: 15px 0 0 10px;
-      vertical-align: top;
-
-      .host-tag {
-        @include margin-right($baseline/2);
-        position: absolute;
-        left: -9999em;
-        display: inline-block;
-        vertical-align: middle;
-        font-size: 70%;
-        color: #777;
-      }
-
-      .brand-logo {
-        display: inline-block;
-        max-width: 100%;
-        max-height: ($baseline*2);
-        padding: ($baseline/4) 0;
-        vertical-align: middle;
-      }
-    }
-  }
-
   .video-wrapper {
     @include float(left);
     @include margin-right(flex-gutter(9));
diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_all.html b/common/lib/xmodule/xmodule/js/fixtures/video_all.html
index 4850a5e9e5..d5d50b5709 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/video_all.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/video_all.html
@@ -10,8 +10,8 @@
 
         <div class="tc-wrapper">
           <article class="video-wrapper">
-            <span tabindex="0" class="spinner" aria-hidden="false" aria-label="${_('Loading video player')}"></span>
-            <span tabindex="-1" class="btn-play is-hidden" aria-hidden="true" aria-label="${_('Play video')}"></span>
+            <span tabindex="0" class="spinner" aria-hidden="false" aria-label="Loading video player"></span>
+            <span tabindex="-1" class="btn-play is-hidden" aria-hidden="true" aria-label="Play video"></span>
             <div class="video-player-pre"></div>
             <section class="video-player">
               <div id="id"></div>
@@ -29,22 +29,32 @@
         </div>
 
         <div class="focus_grabber last"></div>
-
-        <ul class="wrapper-downloads">
-          <li class="video-tracks">
-            <div class="a11y-menu-container">
-                <a class="a11y-menu-button" href="#" title=".srt">.srt</a>
-                <ol class="a11y-menu-list">
-                  <li class="a11y-menu-item">
-                    <a class="a11y-menu-item-link" href="#txt" title="Text (.txt) file" data-value="txt">Text (.txt) file</a>
-                  </li>
-                  <li class="a11y-menu-item active">
-                    <a class="a11y-menu-item-link" href="#srt" title="SubRip (.srt) file" data-value="srt">SubRip (.srt) file</a>
-                  </li>
-                </ol>
+        
+        <h3 class="hd hd-4 downloads-heading sr" id="video-download-transcripts">Downloads and transcripts</h3>
+        <div class="wrapper-downloads" role="region" aria-labelledby="video-download-transcripts">
+            <div class="wrapper-download-video">
+                <h4 class="hd hd-5">Video</h4>
+                <a class="btn-link video-sources video-download-button" href="#">
+                    Download video file
+                </a>
             </div>
-          </li>
-        </ul>
+            <div class="wrapper-download-transcripts">
+                <h4 class="hd hd-5">Transcripts</h4>
+                <ul class="list-download-transcripts">
+                    <li class="transcript-option">
+                        <a href="#" class="btn btn-link" data-href="txt">Download Text (.txt) file</a>
+                    </li>
+                    <li class="transcript-option">
+                        <a href="#" class="btn btn-link" data-href="srt">Download SubRip (.srt) file</a>
+                    </li>
+                </ul>
+                <a href="#" class="external-track">Download transcript</a>
+            </div>
+            <div class="wrapper-handouts">
+                <h4 class="hd hd-5">Handouts</h4>
+                <a href="#">Download Handout</a>
+            </div>
+        </div>
 
       </div>
     </div>
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_accessible_menu_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_accessible_menu_spec.js
deleted file mode 100644
index f7dc49b238..0000000000
--- a/common/lib/xmodule/xmodule/js/spec/video/video_accessible_menu_spec.js
+++ /dev/null
@@ -1,290 +0,0 @@
-(function(undefined) {
-    describe('Video Accessible Menu', function() {
-        var state;
-
-        afterEach(function() {
-            $('source').remove();
-            state.storage.clear();
-            state.videoPlayer.destroy();
-        });
-
-        describe('constructor', function() {
-            describe('always', function() {
-                var videoTracks, container, button, menu, menuItems,
-                    menuItemsLinks;
-
-                beforeEach(function() {
-                    state = jasmine.initializePlayer();
-                    videoTracks = $('li.video-tracks');
-                    container = videoTracks.children('div.a11y-menu-container');
-                    button = container.children('a.a11y-menu-button');
-                    menuList = container.children('ol.a11y-menu-list');
-                    menuItems = menuList.children('li.a11y-menu-item');
-                    menuItemsLinks = menuItems.children('a.a11y-menu-item-link');
-                });
-
-                it('add the accessible menu', function() {
-                    var activeMenuItem;
-                    // Make sure we have the expected HTML structure:
-                    // Menu container exists
-                    expect(container.length).toBe(1);
-                    // Only one button and one menu list per menu container.
-                    expect(button.length).toBe(1);
-                    expect(menuList.length).toBe(1);
-                    // At least one menu item and one menu link per menu
-                    // container. Exact length test?
-                    expect(menuItems.length).toBeGreaterThan(0);
-                    expect(menuItemsLinks.length).toBeGreaterThan(0);
-                    expect(menuItems.length).toBe(menuItemsLinks.length);
-                    // And one menu item is active
-                    activeMenuItem = menuItems.filter('.active');
-                    expect(activeMenuItem.length).toBe(1);
-
-                    expect(activeMenuItem.children('a.a11y-menu-item-link'))
-                        .toHaveData('value', 'srt');
-
-                    expect(activeMenuItem.children('a.a11y-menu-item-link'))
-                        .toHaveHtml('SubRip (.srt) file');
-
-                    /* TO DO: Check that all the anchors contain correct text.
-                    $.each(li.toArray().reverse(), function (index, link) {
-                        expect($(link)).toHaveData(
-                            'speed', state.videoSpeedControl.speeds[index]
-                        );
-                        expect($(link).find('a').text()).toBe(
-                            state.videoSpeedControl.speeds[index] + 'x'
-                        );
-                    });
-                    */
-                });
-            });
-
-            describe('when running', function() {
-                var videoTracks, container, button, menu, menuItems,
-                    menuItemsLinks, KEY = $.ui.keyCode,
-
-                    keyPressEvent = function(key) {
-                        return $.Event('keydown', {keyCode: key});
-                    },
-
-                    tabBackPressEvent = function() {
-                        return $.Event('keydown',
-                                       {keyCode: KEY.TAB, shiftKey: true});
-                    },
-
-                    tabForwardPressEvent = function() {
-                        return $.Event('keydown',
-                                       {keyCode: KEY.TAB, shiftKey: false});
-                    },
-
-                    // Get previous element in array or cyles back to the last
-                    // if it is the first.
-                    previousSpeed = function(index) {
-                        return speedEntries.eq(index < 1 ?
-                                               speedEntries.length - 1 :
-                                               index - 1);
-                    },
-
-                    // Get next element in array or cyles back to the first if
-                    // it is the last.
-                    nextSpeed = function(index) {
-                        return speedEntries.eq(index >= speedEntries.length - 1 ?
-                                               0 :
-                                               index + 1);
-                    };
-
-                beforeEach(function() {
-                    state = jasmine.initializePlayer();
-                    videoTracks = $('li.video-tracks');
-                    container = videoTracks.children('div.a11y-menu-container');
-                    button = container.children('a.a11y-menu-button');
-                    menuList = container.children('ol.a11y-menu-list');
-                    menuItems = menuList.children('li.a11y-menu-item');
-                    menuItemsLinks = menuItems.children('a.a11y-menu-item-link');
-                    spyOn($.fn, 'focus').and.callThrough();
-                });
-
-                it('open/close the menu on mouseenter/mouseleave', function() {
-                    container.mouseenter();
-                    expect(container).toHaveClass('open');
-                    container.mouseleave();
-                    expect(container).not.toHaveClass('open');
-                });
-
-                it('do not close the menu on mouseleave if a menu item has ' +
-                    'focus', function() {
-                    // Open menu. Focus is on last menu item.
-                    container.trigger(keyPressEvent(KEY.ENTER));
-                    container.mouseenter().mouseleave();
-                    expect(container).toHaveClass('open');
-                });
-
-                it('close the menu on click', function() {
-                    container.mouseenter().click();
-                    expect(container).not.toHaveClass('open');
-                });
-
-                it('close the menu on outside click', function() {
-                    container.trigger(keyPressEvent(KEY.ENTER));
-                    $(window).click();
-                    expect(container).not.toHaveClass('open');
-                });
-
-                it('open the menu on ENTER keydown', function() {
-                    container.trigger(keyPressEvent(KEY.ENTER));
-                    expect(container).toHaveClass('open');
-                    expect(menuItemsLinks.last().focus).toHaveBeenCalled();
-                });
-
-                it('open the menu on SPACE keydown', function() {
-                    container.trigger(keyPressEvent(KEY.SPACE));
-                    expect(container).toHaveClass('open');
-                    expect(menuItemsLinks.last().focus).toHaveBeenCalled();
-                });
-
-                it('open the menu on UP keydown', function() {
-                    container.trigger(keyPressEvent(KEY.UP));
-                    expect(container).toHaveClass('open');
-                    expect(menuItemsLinks.last().focus).toHaveBeenCalled();
-                });
-
-                it('close the menu on ESCAPE keydown', function() {
-                    container.trigger(keyPressEvent(KEY.ESCAPE));
-                    expect(container).not.toHaveClass('open');
-                });
-
-                it('UP and DOWN keydown function as expected on menu items',
-                   function() {
-                    // Iterate through list in both directions and check if
-                    // things wrap up correctly.
-                       var lastEntry = menuItemsLinks.length - 1, i;
-
-                    // First open menu
-                       container.trigger(keyPressEvent(KEY.UP));
-
-                    // Iterate with UP key until we have looped.
-                       for (i = lastEntry; i >= 0; i--) {
-                           menuItemsLinks.eq(i).trigger(keyPressEvent(KEY.UP));
-                       }
-
-                    // Iterate with DOWN key until we have looped.
-                       for (i = 0; i <= lastEntry; i++) {
-                           menuItemsLinks.eq(i).trigger(keyPressEvent(KEY.DOWN));
-                       }
-
-                    // Test if each element has been called twice.
-                       expect($.fn.focus.calls.count())
-                        .toEqual(2 * menuItemsLinks.length + 1);
-                   });
-
-                it('ESC keydown on menu item closes menu', function() {
-                    // First open menu. Focus is on last speed entry.
-                    container.trigger(keyPressEvent(KEY.UP));
-                    menuItemsLinks.last().trigger(keyPressEvent(KEY.ESCAPE));
-
-                    // Menu is closed and focus has been returned to speed
-                    // control.
-                    expect(container).not.toHaveClass('open');
-                    expect(container.focus).toHaveBeenCalled();
-                });
-
-                it('ENTER keydown on menu item selects its data and closes menu',
-                   function() {
-                    // First open menu.
-                       container.trigger(keyPressEvent(KEY.UP));
-                    // Focus on '.txt'
-                       menuItemsLinks.eq(0).focus();
-                       menuItemsLinks.eq(0).trigger(keyPressEvent(KEY.ENTER));
-
-                    // Menu is closed, focus has been returned to container
-                    // and file format is '.txt'.
-                    /* TO DO
-                    expect(container.focus).toHaveBeenCalled();
-                    expect($('.video_speeds li[data-speed="1.50"]'))
-                        .toHaveClass('active');
-                    expect($('.speeds p.active')).toHaveHtml('1.50x');
-                    */
-                   });
-
-                it('SPACE keydown on menu item selects its data and closes menu',
-                   function() {
-                    // First open menu.
-                       container.trigger(keyPressEvent(KEY.UP));
-                    // Focus on '.txt'
-                       menuItemsLinks.eq(0).focus();
-                       menuItemsLinks.eq(0).trigger(keyPressEvent(KEY.SPACE));
-
-                    // Menu is closed, focus has been returned to container
-                    // and file format is '.txt'.
-                    /* TO DO
-                    expect(speedControl.focus).toHaveBeenCalled();
-                    expect($('.video_speeds li[data-speed="1.50"]'))
-                        .toHaveClass('active');
-                    expect($('.speeds p.active')).toHaveHtml('1.50x');
-                    */
-                   });
-
-                // TO DO? No such behavior implemented.
-                xit('TAB + SHIFT keydown on speed entry closes menu and gives ' +
-                    'focus to Play/Pause control', function() {
-                    // First open menu. Focus is on last speed entry.
-                    speedControl.trigger(keyPressEvent(KEY.UP));
-                    speedEntries.last().trigger(tabBackPressEvent());
-
-                    // Menu is closed and focus has been given to Play/Pause
-                    // control.
-                    expect(state.videoControl.playPauseEl.focus)
-                        .toHaveBeenCalled();
-                });
-
-                // TO DO? No such behavior implemented.
-                xit('TAB keydown on speed entry closes menu and gives focus ' +
-                   'to Volume control', function() {
-                    // First open menu. Focus is on last speed entry.
-                    speedControl.trigger(keyPressEvent(KEY.UP));
-                    speedEntries.last().trigger(tabForwardPressEvent());
-
-                    // Menu is closed and focus has been given to Volume
-                    // control.
-                    expect(state.videoVolumeControl.buttonEl.focus)
-                        .toHaveBeenCalled();
-                });
-            });
-        });
-
-        // TODO
-        xdescribe('change file format', function() {
-            describe('when new file format is not the same', function() {
-                beforeEach(function() {
-                    state = jasmine.initializePlayer();
-                    state.videoSpeedControl.setSpeed(1.0);
-                    spyOn(state.videoPlayer, 'onSpeedChange').and.callThrough();
-
-                    $('li[data-speed="0.75"] .speed-link').click();
-                });
-
-                it('trigger speedChange event', function() {
-                    expect(state.videoPlayer.onSpeedChange).toHaveBeenCalled();
-                    expect(state.videoSpeedControl.currentSpeed).toEqual(0.75);
-                });
-            });
-        });
-
-        // TODO
-        xdescribe('onSpeedChange', function() {
-            beforeEach(function() {
-                state = jasmine.initializePlayer();
-                $('li[data-speed="1.0"] .speed-link').addClass('active');
-                state.videoSpeedControl.setSpeed(0.75);
-            });
-
-            it('set the new speed as active', function() {
-                expect($('.video_speeds li[data-speed="1.0"]'))
-                    .not.toHaveClass('active');
-                expect($('.video_speeds li[data-speed="0.75"]'))
-                    .toHaveClass('active');
-                expect($('.speeds p.active')).toHaveHtml('0.75x');
-            });
-        });
-    });
-}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/src/video/035_video_accessible_menu.js b/common/lib/xmodule/xmodule/js/src/video/035_video_accessible_menu.js
index 246cfff2dd..7b47debd63 100644
--- a/common/lib/xmodule/xmodule/js/src/video/035_video_accessible_menu.js
+++ b/common/lib/xmodule/xmodule/js/src/video/035_video_accessible_menu.js
@@ -1,9 +1,9 @@
 (function(define) {
     'use strict';
-// VideoAccessibleMenu module.
+// VideoTranscriptDownloadHandler module.
     define(
-'video/035_video_accessible_menu.js', [],
-function() {
+'video/035_video_accessible_menu.js', ['underscore'],
+function(_) {
     /**
      * Video Download Transcript control module.
      * @exports video/035_video_accessible_menu.js
@@ -11,231 +11,59 @@ function() {
      * @param {jquery Element} element
      * @param {Object} options
      */
-    var VideoAccessibleMenu = function(element, options) {
-        if (!(this instanceof VideoAccessibleMenu)) {
-            return new VideoAccessibleMenu(element, options);
+    var VideoTranscriptDownloadHandler = function(element, options) {
+        if (!(this instanceof VideoTranscriptDownloadHandler)) {
+            return new VideoTranscriptDownloadHandler(element, options);
         }
 
-        _.bindAll(this, 'openMenu', 'openMenuHandler', 'closeMenu', 'closeMenuHandler', 'toggleMenuHandler',
-            'clickHandler', 'keyDownHandler', 'render', 'menuItemsLinksFocused', 'changeFileType', 'setValue'
-        );
+        _.bindAll(this, 'clickHandler');
 
         this.container = element;
         this.options = options || {};
 
-        if (this.container.find('.video-tracks')) {
+        if (this.container.find('.wrapper-downloads .wrapper-download-transcripts')) {
             this.initialize();
         }
+
+        return false;
     };
 
-    VideoAccessibleMenu.prototype = {
-        /** Initializes the module. */
+    VideoTranscriptDownloadHandler.prototype = {
+        // Initializes the module.
         initialize: function() {
             this.value = this.options.storage.getItem('transcript_download_format');
-            this.el = this.container.find('.video-tracks .a11y-menu-container');
-            this.render();
-            this.bindHandlers();
+            this.el = this.container.find('.list-download-transcripts');
+            this.el.on('click', '.btn-link', this.clickHandler);
         },
 
-        /**
-         * Creates any necessary DOM elements, attach them, and set their,
-         * initial configuration.
-         */
-        render: function() {
-            var value, msg;
-            // For the  time being, we assume that the menu structure is present in
-            // the template HTML. In the future accessible menu plugin, everything
-            // inside <div class='menu-container'></div> will be generated in this
-            // file.
-            this.button = this.el.children('.a11y-menu-button');
-            this.menuList = this.el.children('.a11y-menu-list');
-            this.menuItems = this.menuList.children('.a11y-menu-item');
-            this.menuItemsLinks = this.menuItems.children('.a11y-menu-item-link');
-            value = (function(val, activeElement) {
-                return val || activeElement.find('a').data('value') || 'srt';
-            }(this.value, this.menuItems.filter('.active')));
-            msg = '.' + value;
-
-            if (value) {
-                this.setValue(value);
-                this.button.text(gettext(msg));
-            }
-        },
-
-        /** Bind any necessary function callbacks to DOM events. */
-        bindHandlers: function() {
-            // Attach various events handlers to menu container.
-            this.el.on({
-                'mouseenter': this.openMenuHandler,
-                'mouseleave': this.closeMenuHandler,
-                'click': this.toggleMenuHandler,
-                'keydown': this.keyDownHandler
-            });
-
-            // Attach click and keydown event handlers to individual menu items.
-            this.menuItems
-                .on('click', 'a.a11y-menu-item-link', this.clickHandler)
-                .on('keydown', 'a.a11y-menu-item-link', this.keyDownHandler);
-        },
-
-        // Get previous element in array or cyles back to the last if it is the
-        // first.
-        previousMenuItemLink: function(links, index) {
-            return index < 1 ? links.last() : links.eq(index - 1);
-        },
-
-        // Get next element in array or cyles back to the first if it is the last.
-        nextMenuItemLink: function(links, index) {
-            return index >= links.length - 1 ? links.first() : links.eq(index + 1);
-        },
-
-        menuItemsLinksFocused: function() {
-            return this.menuItemsLinks.is(':focus');
-        },
-
-        openMenu: function(withoutHandler) {
-            // When menu items have focus, the menu stays open on
-            // mouseleave. A closeMenuHandler is added to the window
-            // element to have clicks close the menu when they happen
-            // outside of it. We namespace the click event to easily remove it (and
-            // only it) in closeMenu.
-            this.el.addClass('open');
-            this.button.text('...');
-            if (!withoutHandler) {
-                $(window).on('click.currentMenu', this.closeMenuHandler);
-            }
-            // @TODO: onOpen callback
-        },
-
-        closeMenu: function(withoutHandler) {
-            // Remove the previously added clickHandler from window element.
-            var msg = '.' + this.value;
-
-            this.el.removeClass('open');
-            this.button.text(gettext(msg));
-            if (!withoutHandler) {
-                $(window).off('click.currentMenu');
-            }
-            // @TODO: onClose callback
-        },
-
-        openMenuHandler: function() {
-            this.openMenu(true);
-            return false;
-        },
-
-        closeMenuHandler: function(event) {
-            // Only close the menu if no menu item link has focus or `click` event.
-            if (!this.menuItemsLinksFocused() || event.type === 'click') {
-                this.closeMenu(true);
-            }
-            return false;
-        },
-
-        toggleMenuHandler: function() {
-            if (this.el.hasClass('open')) {
-                this.closeMenu(true);
-            } else {
-                this.openMenu(true);
-            }
-            return false;
-        },
-
-        // Various event handlers. They all return false to stop propagation and
-        // prevent default behavior.
+        // Event handler. We delay link clicks until the file type is set
         clickHandler: function(event) {
-            this.changeFileType.call(this, event);
-            this.closeMenu(true);
-            return false;
-        },
+            var that = this,
+                fileType,
+                data,
+                downloadUrl;
 
-        keyDownHandler: function(event) {
-            var KEY = $.ui.keyCode,
-                keyCode = event.keyCode,
-                target = $(event.currentTarget),
-                index;
+            event.preventDefault();
 
-            if (target.is('a.a11y-menu-item-link')) {
-                index = target.parent().index();
-                switch (keyCode) {
-                    // Scroll up menu, wrapping at the top. Keep menu open.
-                case KEY.UP:
-                    this.previousMenuItemLink(this.menuItemsLinks, index).focus();
-                    break;
-                    // Scroll down  menu, wrapping at the bottom. Keep menu
-                    // open.
-                case KEY.DOWN:
-                    this.nextMenuItemLink(this.menuItemsLinks, index).focus();
-                    break;
-                    // Close menu.
-                case KEY.TAB:
-                    this.closeMenu();
-                        // TODO
-                        // What has to happen here? In speed menu, tabbing backward
-                        // will give focus to Play/Pause button and tabbing
-                        // forward to Volume button.
-                    break;
-                    // Close menu, give focus to button and change
-                    // file type.
-                case KEY.ENTER:
-                case KEY.SPACE:
-                    this.button.focus();
-                    this.changeFileType.call(this, event);
-                    this.closeMenu();
-                    break;
-                    // Close menu and give focus to speed control.
-                case KEY.ESCAPE:
-                    this.closeMenu();
-                    this.button.focus();
-                    break;
-                }
-                return false;
-            }
-            else {
-                switch (keyCode) {
-                    // Open menu and focus on last element of list above it.
-                case KEY.ENTER:
-                case KEY.SPACE:
-                case KEY.UP:
-                    this.openMenu();
-                    this.menuItemsLinks.last().focus();
-                    break;
-                    // Close menu.
-                case KEY.ESCAPE:
-                    this.closeMenu();
-                    break;
-                }
-                // We do not stop propagation and default behavior on a TAB
-                // keypress.
-                return event.keyCode === KEY.TAB;
-            }
-                                                },
-
-        setValue: function(value) {
-            this.value = value;
-            this.menuItems
-                .removeClass('active')
-                .find("a[data-value='" + value + "']")
-                .parent()
-                .addClass('active');
-        },
-
-        changeFileType: function(event) {
-            var fileType = $(event.currentTarget).data('value'),
-                data = {'transcript_download_format': fileType};
-
-            this.setValue(fileType);
-            this.options.storage.setItem('transcript_download_format', fileType);
+            fileType = $(event.target).data('value');
+            data = {transcript_download_format: fileType};
+            downloadUrl = $(event.target).attr('href');
 
             $.ajax({
                 url: this.options.saveStateUrl,
                 type: 'POST',
                 dataType: 'json',
-                data: data
+                data: data,
+                success: function() {
+                    that.options.storage.setItem('transcript_download_format', fileType);
+                },
+                complete: function() {
+                    document.location.href = downloadUrl;
+                }
             });
         }
     };
 
-    return VideoAccessibleMenu;
+    return VideoTranscriptDownloadHandler;
 });
 }(RequireJS.define));
diff --git a/common/static/common/js/discussion/views/discussion_thread_list_view.js b/common/static/common/js/discussion/views/discussion_thread_list_view.js
index 7548f9ad70..5ac5c91295 100644
--- a/common/static/common/js/discussion/views/discussion_thread_list_view.js
+++ b/common/static/common/js/discussion/views/discussion_thread_list_view.js
@@ -36,6 +36,9 @@
                 this.chooseFilter = function() {
                     return DiscussionThreadListView.prototype.chooseFilter.apply(self, arguments);
                 };
+                this.keyboardBinding = function() {
+                    return DiscussionThreadListView.prototype.keyboardBinding.apply(self, arguments);
+                };
                 this.filterTopics = function() {
                     return DiscussionThreadListView.prototype.filterTopics.apply(self, arguments);
                 };
@@ -95,6 +98,7 @@
                     return DiscussionUtil.ignoreEnterKey(event);
                 },
                 'keyup .forum-nav-browse-filter-input': 'filterTopics',
+                'keydown .forum-nav-browse-filter-input': 'keyboardBinding',
                 'click .forum-nav-browse-menu-wrapper': 'ignoreClick',
                 'click .forum-nav-browse-title': 'selectTopicHandler',
                 'change .forum-nav-sort-control': 'sortThreads',
@@ -125,6 +129,14 @@
                 this.boardName = null;
                 this.current_search = '';
                 this.mode = 'all';
+                this.keyCodes = {
+                    enter: 13,
+                    escape: 27,
+                    up: 38,
+                    down: 40
+                };
+                this.filterInputReset();
+                this.selectedTopic = $('.forum-nav-browse-menu-item:visible .forum-nav-browse-title.is-focused');
                 this.searchAlertCollection = new Backbone.Collection([], {
                     model: Backbone.Model
                 });
@@ -436,6 +448,7 @@
                     this.$('.forum-nav-thread-list-wrapper').hide();
                     if (!initialLoad) {
                         $('.forum-nav-browse-filter-input').focus();
+                        this.filterInputReset();
                     }
                     $('body').bind('click', this.hideBrowseMenu);
                     return this.updateSidebar();
@@ -443,20 +456,29 @@
             };
 
             DiscussionThreadListView.prototype.hideBrowseMenu = function() {
+                var selectedTopicList = this.$('.forum-nav-browse-title.is-focused');
                 if (this.isBrowseMenuVisible()) {
+                    selectedTopicList.removeClass('is-focused');
                     this.$('.forum-nav-browse-menu-wrapper').hide();
                     this.$('.forum-nav-thread-list-wrapper').show();
+                    if (this.selectedTopicId !== 'undefined') {
+                        this.$('.forum-nav-browse-filter-input').attr('aria-activedescendant', this.selectedTopicId);
+                    }
                     $('body').unbind('click', this.hideBrowseMenu);
                     return this.updateSidebar();
                 }
             };
 
             DiscussionThreadListView.prototype.toggleBrowseMenu = function(event) {
+                var inputText = $('.forum-nav-browse-filter-input').val();
                 event.preventDefault();
                 event.stopPropagation();
                 if (this.isBrowseMenuVisible()) {
                     return this.hideBrowseMenu();
                 } else {
+                    if (inputText !== '') {
+                        this.filterTopics(inputText);
+                    }
                     return this.showBrowseMenu();
                 }
             };
@@ -493,28 +515,115 @@
                 return crumbs;
             };
 
-            DiscussionThreadListView.prototype.filterTopics = function(event) {
-                var items, query,
+            DiscussionThreadListView.prototype.selectOption = function(element) {
+                var activeDescendantId, activeDescendantText;
+                if (this.selectedTopic.length > 0) {
+                    this.selectedTopic.removeClass('is-focused');
+                }
+                if (element) {
+                    element.addClass('is-focused');
+                    activeDescendantId = element.parent().attr('id');
+                    activeDescendantText = element.text();
+                    this.selectedTopic = element;
+                    this.selectedTopicId = activeDescendantId;
+                    $('.forum-nav-browse-filter-input')
+                        .attr('aria-activedescendant', activeDescendantId)
+                        .val(activeDescendantText);
+                }
+            };
+
+            DiscussionThreadListView.prototype.filterInputReset = function() {
+                this.filterEnabled = true;
+                this.selectedTopicIndex = -1;
+                this.selectedTopicId = null;
+            };
+
+            DiscussionThreadListView.prototype.keyboardBinding = function(event) {
+                var $inputText = $('.forum-nav-browse-filter-input'),
+                    $filteredMenuItems = $('.forum-nav-browse-menu-item:visible'),
+                    filteredMenuItemsLen = $filteredMenuItems.length,
+                    $curOption = $filteredMenuItems.eq(0).find('.forum-nav-browse-title').eq(0),
+                    $activeOption, $prev, $next;
+
+                switch (event.keyCode) {
+                case this.keyCodes.enter:
+                    $activeOption = $filteredMenuItems.find('.forum-nav-browse-title.is-focused');
+                    if ($inputText.val() !== '') {
+                        $activeOption.trigger('click');
+                        this.filterInputReset();
+                    }
+                    break;
+
+                case this.keyCodes.escape:
+                    this.toggleBrowseMenu(event);
+                    $('.forum-nav-browse-filter-input').val('');
+                    this.filterInputReset();
+                    $('.all-topics').trigger('click');
+                    break;
+
+                case this.keyCodes.up:
+                    if (this.selectedTopicIndex > 0) {
+                        this.selectedTopicIndex -= 1;
+                        if (this.isBrowseMenuVisible()) {
+                            $prev = $('.forum-nav-browse-menu-item:visible')
+                            .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
+                            .eq(0);
+                            this.filterEnabled = false;
+                            $curOption.removeClass('is-focused');
+                            $prev.addClass('is-focused');
+                        }
+                        this.selectOption($prev);
+                    }
+                    break;
+
+                case this.keyCodes.down:
+                    if (this.selectedTopicIndex < filteredMenuItemsLen - 1) {
+                        this.selectedTopicIndex += 1;
+                        if (this.isBrowseMenuVisible()) {
+                            $next = $('.forum-nav-browse-menu-item:visible')
+                                .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
+                                .eq(0);
+                            this.filterEnabled = false;
+                            $curOption.removeClass('is-focused');
+                            $next.addClass('is-focused');
+                        }
+                        this.selectOption($next);
+                    }
+                    break;
+
+                default:
+                    break;
+                }
+                return true;
+            };
+
+            DiscussionThreadListView.prototype.filterTopics = function() {
+                var items, query, filteredItems,
                     self = this;
-                query = $(event.target).val();
+                query = this.$('.forum-nav-browse-filter-input').val();
                 items = this.$('.forum-nav-browse-menu-item');
                 if (query.length === 0) {
+                    items.find('.forum-nav-browse-title.is-focused').removeClass('is-focused');
                     return items.show();
                 } else {
-                    items.hide();
-                    return items.each(function(i, item) {
-                        var path, pathText,
-                            $item = $(item);
-                        if (!$item.is(':visible')) {
-                            pathText = self.getPathText($item).toLowerCase();
-                            if (query.split(' ').every(function(term) {
-                                return pathText.search(term.toLowerCase()) !== -1;
-                            })) {
-                                path = $item.parents('.forum-nav-browse-menu-item').andSelf();
-                                return path.add($item.find('.forum-nav-browse-menu-item')).show();
+                    if (this.filterEnabled) {
+                        items.hide();
+                        filteredItems = items.each(function(i, item) {
+                            var path, pathText,
+                                $item = $(item);
+                            if (!$item.is(':visible')) {
+                                pathText = self.getPathText($item).toLowerCase();
+                                if (query.split(' ').every(function(term) {
+                                    return pathText.search(term.toLowerCase()) !== -1;
+                                })) {
+                                    path = $item.parents('.forum-nav-browse-menu-item').andSelf();
+                                    return path.add($item.find('.forum-nav-browse-menu-item')).show();
+                                }
                             }
-                        }
-                    });
+                            return filteredItems;
+                        });
+                    }
+                    return filteredItems;
                 }
             };
 
diff --git a/common/static/common/templates/discussion/forum-action-answer.underscore b/common/static/common/templates/discussion/forum-action-answer.underscore
index 4f9c2bd8fd..77a2ff1376 100644
--- a/common/static/common/templates/discussion/forum-action-answer.underscore
+++ b/common/static/common/templates/discussion/forum-action-answer.underscore
@@ -1,5 +1,5 @@
 <li class="actions-item">
-    <button class="btn action-button action-answer" role="checkbox" aria-checked="false">
+    <button class="btn-link action-button action-answer" role="checkbox" aria-checked="false">
         <span class="sr"><%- gettext("Mark as Answer") %></span>
         <span class="action-label" aria-hidden="true">
             <span class="label-unchecked"><%- gettext("Mark as Answer") %></span>
diff --git a/common/test/acceptance/pages/lms/problem.py b/common/test/acceptance/pages/lms/problem.py
index 2c0e3efafa..02f885db53 100644
--- a/common/test/acceptance/pages/lms/problem.py
+++ b/common/test/acceptance/pages/lms/problem.py
@@ -162,7 +162,7 @@ class ProblemPage(PageObject):
         """
         Click the choice input(radio, checkbox or option) where value matches `choice_value` in choice group.
         """
-        self.q(css='div.problem .choicegroup input[value="' + choice_value + '"]').click()
+        self.q(css='div.problem .choicegroup input[value="' + choice_value + '"]').first.click()
         self.wait_for_ajax()
 
     def is_correct(self):
diff --git a/common/test/acceptance/pages/lms/progress.py b/common/test/acceptance/pages/lms/progress.py
index f0a6d5aab6..e923994403 100644
--- a/common/test/acceptance/pages/lms/progress.py
+++ b/common/test/acceptance/pages/lms/progress.py
@@ -67,6 +67,13 @@ class ProgressPage(CoursePage):
         # Retrieve the scores for the section
         return self._section_scores(chapter_index, section_index)
 
+    def text_on_page(self, text):
+        """
+        Return whether the given text appears
+        on the page.
+        """
+        return text in self.q(css=".view-in-course").html[0]
+
     def _chapter_index(self, title):
         """
         Return the CSS index of the chapter with `title`.
diff --git a/common/test/acceptance/pages/lms/video/video.py b/common/test/acceptance/pages/lms/video/video.py
index 86bf546942..0848e8f5e1 100644
--- a/common/test/acceptance/pages/lms/video/video.py
+++ b/common/test/acceptance/pages/lms/video/video.py
@@ -57,7 +57,10 @@ VIDEO_MENUS = {
     'language': '.lang .menu',
     'speed': '.speed .menu',
     'download_transcript': '.video-tracks .a11y-menu-list',
-    'transcript-format': '.video-tracks .a11y-menu-button',
+    'transcript-format': {
+        'srt': '.wrapper-download-transcripts .list-download-transcripts .btn-link[data-value="srt"]',
+        'txt': '.wrapper-download-transcripts .list-download-transcripts .btn-link[data-value="txt"]'
+    },
     'transcript-skip': '.sr-is-focusable.transcript-start',
 }
 
@@ -584,7 +587,7 @@ class VideoPage(PageObject):
             bool: Transcript download result.
 
         """
-        transcript_selector = self.get_element_selector(VIDEO_MENUS['transcript-format'])
+        transcript_selector = self.get_element_selector(VIDEO_MENUS['transcript-format'][transcript_format])
 
         # check if we have a transcript with correct format
         if '.' + transcript_format not in self.q(css=transcript_selector).text[0]:
@@ -595,16 +598,15 @@ class VideoPage(PageObject):
             'txt': 'text/plain',
         }
 
-        transcript_url_selector = self.get_element_selector(VIDEO_BUTTONS['download_transcript'])
-        url = self.q(css=transcript_url_selector).attrs('href')[0]
+        link = self.q(css=transcript_selector)
+        url = link.attrs('href')[0]
+        link.click()
+
         result, headers, content = self._get_transcript(url)
 
         if result is False:
             return False
 
-        if formats[transcript_format] not in headers.get('content-type', ''):
-            return False
-
         if text_to_search not in content.decode('utf-8'):
             return False
 
@@ -674,45 +676,6 @@ class VideoPage(PageObject):
         selector = self.get_element_selector(VIDEO_MENUS[menu_name])
         return self.q(css=selector).present
 
-    def select_transcript_format(self, transcript_format):
-        """
-        Select transcript with format `transcript_format`.
-
-        Arguments:
-            transcript_format (st): Transcript file format `srt` or `txt`.
-
-        Returns:
-            bool: Selection Result.
-
-        """
-        button_selector = self.get_element_selector(VIDEO_MENUS['transcript-format'])
-
-        button = self.q(css=button_selector).results[0]
-
-        hover = ActionChains(self.browser).move_to_element(button)
-        hover.perform()
-
-        if '...' not in self.q(css=button_selector).text[0]:
-            return False
-
-        menu_selector = self.get_element_selector(VIDEO_MENUS['download_transcript'])
-        menu_items = self.q(css=menu_selector + ' a').results
-        for item in menu_items:
-            if item.get_attribute('data-value') == transcript_format:
-                ActionChains(self.browser).move_to_element(item).click().perform()
-                self.wait_for_ajax()
-                break
-
-        self.browser.execute_script("window.scrollTo(0, 0);")
-
-        if self.q(css=menu_selector + ' .active a').attrs('data-value')[0] != transcript_format:
-            return False
-
-        if '.' + transcript_format not in self.q(css=button_selector).text[0]:
-            return False
-
-        return True
-
     @property
     def sources(self):
         """
diff --git a/common/test/acceptance/pages/studio/video/video.py b/common/test/acceptance/pages/studio/video/video.py
index bb6ebf0b48..73d9cb747c 100644
--- a/common/test/acceptance/pages/studio/video/video.py
+++ b/common/test/acceptance/pages/studio/video/video.py
@@ -32,7 +32,7 @@ CLASS_SELECTORS = {
 
 BUTTON_SELECTORS = {
     'create_video': 'button[data-category="video"]',
-    'handout_download': '.video-handout.video-download-button a',
+    'handout_download': '.wrapper-handouts .btn-link',
     'handout_download_editor': '.wrapper-comp-setting.file-uploader .download-action',
     'upload_asset': '.upload-action',
     'asset_submit': '.action-upload',
diff --git a/common/test/acceptance/tests/discussion/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py
index ae99594527..8a17e19dcf 100644
--- a/common/test/acceptance/tests/discussion/test_discussion.py
+++ b/common/test/acceptance/tests/discussion/test_discussion.py
@@ -211,6 +211,7 @@ class DiscussionHomePageTest(UniqueCourseTest):
         self.page.a11y_audit.config.set_rules({
             "ignore": [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TNL-5169, AC-534
             ]
         })
         self.page.a11y_audit.check_for_accessibility_errors()
@@ -455,6 +456,7 @@ class DiscussionTabMultipleThreadTest(BaseDiscussionTestCase):
         self.thread_page_1.a11y_audit.config.set_rules({
             "ignore": [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TNL-5169, AC-534
             ]
         })
 
@@ -463,6 +465,7 @@ class DiscussionTabMultipleThreadTest(BaseDiscussionTestCase):
         self.thread_page_2.a11y_audit.config.set_rules({
             "ignore": [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TNL-5169, AC-534
             ]
         })
 
@@ -819,6 +822,7 @@ class DiscussionResponseEditTest(BaseDiscussionTestCase):
         page.a11y_audit.config.set_rules({
             'ignore': [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TNL-5169, AC-534
             ]
         })
         page.visit()
@@ -916,6 +920,7 @@ class DiscussionCommentEditTest(BaseDiscussionTestCase):
         page.a11y_audit.config.set_rules({
             'ignore': [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TNL-5169, AC-534
             ]
         })
         page.a11y_audit.check_for_accessibility_errors()
@@ -1321,6 +1326,7 @@ class DiscussionSearchAlertTest(UniqueCourseTest):
         self.page.a11y_audit.config.set_rules({
             'ignore': [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TNL-5169, AC-534
             ]
         })
         self.page.a11y_audit.check_for_accessibility_errors()
diff --git a/common/test/acceptance/tests/helpers.py b/common/test/acceptance/tests/helpers.py
index 98a4259b99..04c6787c35 100644
--- a/common/test/acceptance/tests/helpers.py
+++ b/common/test/acceptance/tests/helpers.py
@@ -17,6 +17,9 @@ from bok_choy.javascript import js_defined
 from bok_choy.web_app_test import WebAppTest
 from bok_choy.promise import EmptyPromise, Promise
 from bok_choy.page_object import XSS_INJECTION
+from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
+from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
+from common.test.acceptance.fixtures.course import XBlockFixtureDesc
 from opaque_keys.edx.locator import CourseLocator
 from pymongo import MongoClient, ASCENDING
 from openedx.core.lib.tests.assertions.events import assert_event_matches, is_matching_event, EventMatchTolerates
@@ -350,6 +353,32 @@ def is_404_page(browser):
     return 'Page not found (404)' in browser.find_element_by_tag_name('h1').text
 
 
+def create_multiple_choice_problem(problem_name):
+    """
+    Return the Multiple Choice Problem Descriptor, given the name of the problem.
+    """
+    factory = MultipleChoiceResponseXMLFactory()
+    xml_data = factory.build_xml(
+        question_text='The correct answer is Choice 2',
+        choices=[False, False, True, False],
+        choice_names=['choice_0', 'choice_1', 'choice_2', 'choice_3']
+    )
+
+    return XBlockFixtureDesc(
+        'problem',
+        problem_name,
+        data=xml_data,
+        metadata={'rerandomize': 'always'}
+    )
+
+
+def auto_auth(browser, username, email, staff, course_id):
+    """
+    Logout and login with given credentials.
+    """
+    AutoAuthPage(browser, username=username, email=email, course_id=course_id, staff=staff).visit()
+
+
 class EventsTestMixin(TestCase):
     """
     Helpers and setup for running tests that evaluate events emitted
diff --git a/common/test/acceptance/tests/lms/test_lms_courseware.py b/common/test/acceptance/tests/lms/test_lms_courseware.py
index 8e000d6e4b..282d037e63 100644
--- a/common/test/acceptance/tests/lms/test_lms_courseware.py
+++ b/common/test/acceptance/tests/lms/test_lms_courseware.py
@@ -3,58 +3,26 @@
 End-to-end tests for the LMS.
 """
 
-from contextlib import contextmanager
 import json
 from datetime import datetime, timedelta
 
 import ddt
 from nose.plugins.attrib import attr
 
-from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
-from ..helpers import UniqueCourseTest, EventsTestMixin
-from ...pages.studio.auto_auth import AutoAuthPage
-from ...pages.lms.create_mode import ModeCreationPage
-from ...pages.studio.component_editor import ComponentEditorView
-from ...pages.studio.overview import CourseOutlinePage
-from ...pages.studio.utils import type_in_codemirror
-from ...pages.lms.courseware import CoursewarePage, CoursewareSequentialTabPage
-from ...pages.lms.course_nav import CourseNavPage
-from ...pages.lms.instructor_dashboard import InstructorDashboardPage
-from ...pages.lms.problem import ProblemPage
+from ..helpers import UniqueCourseTest, EventsTestMixin, auto_auth, create_multiple_choice_problem
+from ...fixtures.course import CourseFixture, XBlockFixtureDesc
 from ...pages.common.logout import LogoutPage
+from ...pages.lms.course_nav import CourseNavPage
+from ...pages.lms.courseware import CoursewarePage, CoursewareSequentialTabPage
+from ...pages.lms.create_mode import ModeCreationPage
+from ...pages.lms.dashboard import DashboardPage
+from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage
+from ...pages.lms.problem import ProblemPage
+from ...pages.lms.progress import ProgressPage
 from ...pages.lms.staff_view import StaffPage
 from ...pages.lms.track_selection import TrackSelectionPage
-from ...pages.lms.pay_and_verify import PaymentAndVerificationFlow, FakePaymentPage
-from ...pages.lms.dashboard import DashboardPage
-from ...pages.lms.progress import ProgressPage
-from ...fixtures.course import CourseFixture, XBlockFixtureDesc
-
-
-def create_multiple_choice_problem(problem_name):
-    """
-    Return the Multiple Choice Problem Descriptor, given the name of the problem.
-    """
-    factory = MultipleChoiceResponseXMLFactory()
-    xml_data = factory.build_xml(
-        question_text='The correct answer is Choice 2',
-        choices=[False, False, True, False],
-        choice_names=['choice_0', 'choice_1', 'choice_2', 'choice_3']
-    )
-
-    return XBlockFixtureDesc(
-        'problem',
-        problem_name,
-        data=xml_data,
-        metadata={'rerandomize': 'always'}
-    )
-
-
-def _auto_auth(browser, username, email, staff, course_id):
-    """
-    Logout and login with given credentials.
-    """
-    AutoAuthPage(browser, username=username, email=email,
-                 course_id=course_id, staff=staff).visit()
+from ...pages.studio.auto_auth import AutoAuthPage
+from ...pages.studio.overview import CourseOutlinePage
 
 
 class CoursewareTest(UniqueCourseTest):
@@ -97,7 +65,7 @@ class CoursewareTest(UniqueCourseTest):
         ).install()
 
         # Auto-auth register for the course.
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
 
     def _goto_problem_page(self):
         """
@@ -121,7 +89,7 @@ class CoursewareTest(UniqueCourseTest):
 
         # Logout and login as a staff user.
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
 
         # Visit course outline page in studio.
         self.course_outline.visit()
@@ -131,7 +99,7 @@ class CoursewareTest(UniqueCourseTest):
 
         # Logout and login as a student.
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
 
         # Visit courseware as a student.
         self.courseware_page.visit()
@@ -210,14 +178,14 @@ class ProctoredExamTest(UniqueCourseTest):
         ).visit()
 
         # Auto-auth register for the course.
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
 
     def _login_as_a_verified_user(self):
         """
         login as a verififed user
         """
 
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
 
         # the track selection page cannot be visited. see the other tests to see if any prereq is there.
         # Navigate to the track selection page
@@ -240,7 +208,7 @@ class ProctoredExamTest(UniqueCourseTest):
         Then I can view all settings related to Proctored and timed exams
         """
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.course_outline.visit()
 
         self.course_outline.open_subsection_settings_dialog()
@@ -256,7 +224,7 @@ class ProctoredExamTest(UniqueCourseTest):
         Then I can see an option to take the exam as a proctored exam.
         """
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.course_outline.visit()
         self.course_outline.open_subsection_settings_dialog()
 
@@ -275,7 +243,7 @@ class ProctoredExamTest(UniqueCourseTest):
         then take it as student"
         """
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.course_outline.visit()
         self.course_outline.open_subsection_settings_dialog()
 
@@ -314,13 +282,13 @@ class ProctoredExamTest(UniqueCourseTest):
         self._setup_and_take_timed_exam(hide_after_due)
 
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.course_outline.visit()
         last_week = (datetime.today() - timedelta(days=7)).strftime("%m/%d/%Y")
         self.course_outline.change_problem_due_date(last_week)
 
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
         self.courseware_page.visit()
         self.assertEqual(self.courseware_page.has_submitted_exam_message(), hide_after_due)
 
@@ -335,7 +303,7 @@ class ProctoredExamTest(UniqueCourseTest):
         self._setup_and_take_timed_exam()
 
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.courseware_page.visit()
         staff_page = StaffPage(self.browser, self.course_id)
         self.assertEqual(staff_page.staff_view_mode, 'Staff')
@@ -357,7 +325,7 @@ class ProctoredExamTest(UniqueCourseTest):
         Practice: True, False
         """
         LogoutPage(self.browser).visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.course_outline.visit()
 
         self.course_outline.open_subsection_settings_dialog()
@@ -853,7 +821,7 @@ class SubsectionHiddenAfterDueDateTest(UniqueCourseTest):
         self._setup_subsection()
 
         # Auto-auth register for the course.
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
 
     def _setup_subsection(self):
         """
@@ -861,7 +829,7 @@ class SubsectionHiddenAfterDueDateTest(UniqueCourseTest):
         it as a student.
         """
         self.logout_page.visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.course_outline.visit()
         self.course_outline.open_subsection_settings_dialog()
 
@@ -869,7 +837,7 @@ class SubsectionHiddenAfterDueDateTest(UniqueCourseTest):
         self.course_outline.make_subsection_hidden_after_due_date()
 
         self.logout_page.visit()
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
         self.courseware_page.visit()
 
         self.logout_page.visit()
@@ -893,7 +861,7 @@ class SubsectionHiddenAfterDueDateTest(UniqueCourseTest):
         Then I should be able to see my grade on the progress page
         """
         self.logout_page.visit()
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
         self.courseware_page.visit()
         self.assertFalse(self.courseware_page.content_hidden_past_due_date())
 
@@ -901,230 +869,15 @@ class SubsectionHiddenAfterDueDateTest(UniqueCourseTest):
         self.assertEqual(self.progress_page.scores('Test Section 1', 'Test Subsection 1'), [(0, 1)])
 
         self.logout_page.visit()
-        _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+        auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
         self.course_outline.visit()
         last_week = (datetime.today() - timedelta(days=7)).strftime("%m/%d/%Y")
         self.course_outline.change_problem_due_date(last_week)
 
         self.logout_page.visit()
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
         self.courseware_page.visit()
         self.assertTrue(self.courseware_page.content_hidden_past_due_date())
 
         self.progress_page.visit()
         self.assertEqual(self.progress_page.scores('Test Section 1', 'Test Subsection 1'), [(0, 1)])
-
-
-class ProgressPageBaseTest(UniqueCourseTest):
-    """
-    Provides utility methods for tests retrieving
-    scores from the progress page.
-    """
-    USERNAME = "STUDENT_TESTER"
-    EMAIL = "student101@example.com"
-    SECTION_NAME = 'Test Section 1'
-    SUBSECTION_NAME = 'Test Subsection 1'
-    UNIT_NAME = 'Test Unit 1'
-    PROBLEM_NAME = 'Test Problem 1'
-
-    def setUp(self):
-        super(ProgressPageBaseTest, self).setUp()
-        self.courseware_page = CoursewarePage(self.browser, self.course_id)
-        self.problem_page = ProblemPage(self.browser)  # pylint: disable=attribute-defined-outside-init
-        self.progress_page = ProgressPage(self.browser, self.course_id)
-        self.logout_page = LogoutPage(self.browser)
-
-        self.course_outline = CourseOutlinePage(
-            self.browser,
-            self.course_info['org'],
-            self.course_info['number'],
-            self.course_info['run']
-        )
-
-        # Install a course with sections/problems, tabs, updates, and handouts
-        course_fix = CourseFixture(
-            self.course_info['org'],
-            self.course_info['number'],
-            self.course_info['run'],
-            self.course_info['display_name']
-        )
-
-        course_fix.add_children(
-            XBlockFixtureDesc('chapter', self.SECTION_NAME).add_children(
-                XBlockFixtureDesc('sequential', self.SUBSECTION_NAME).add_children(
-                    XBlockFixtureDesc('vertical', self.UNIT_NAME).add_children(
-                        create_multiple_choice_problem(self.PROBLEM_NAME)
-                    )
-                )
-            )
-        ).install()
-
-        # Auto-auth register for the course.
-        _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
-
-    def _answer_problem_correctly(self):
-        """
-        Submit a correct answer to the problem.
-        """
-        self.courseware_page.go_to_sequential_position(1)
-        self.problem_page.click_choice('choice_choice_2')
-        self.problem_page.click_check()
-
-    def _get_section_score(self):
-        """
-        Return a list of scores from the progress page.
-        """
-        self.progress_page.visit()
-        return self.progress_page.section_score(self.SECTION_NAME, self.SUBSECTION_NAME)
-
-    def _get_scores(self):
-        """
-        Return a list of scores from the progress page.
-        """
-        self.progress_page.visit()
-        return self.progress_page.scores(self.SECTION_NAME, self.SUBSECTION_NAME)
-
-    @contextmanager
-    def _logged_in_session(self, staff=False):
-        """
-        Ensure that the user is logged in and out appropriately at the beginning
-        and end of the current test.
-        """
-        self.logout_page.visit()
-        try:
-            if staff:
-                _auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
-            else:
-                _auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
-            yield
-        finally:
-            self.logout_page.visit()
-
-
-class ProgressPageTest(ProgressPageBaseTest):
-    """
-    Test that the progress page reports scores from completed assessments.
-    """
-    def test_progress_page_shows_scored_problems(self):
-        with self._logged_in_session():
-            self.assertEqual(self._get_scores(), [(0, 1)])
-            self.assertEqual(self._get_section_score(), (0, 1))
-            self.courseware_page.visit()
-            self._answer_problem_correctly()
-            self.assertEqual(self._get_scores(), [(1, 1)])
-            self.assertEqual(self._get_section_score(), (1, 1))
-
-
-@ddt.ddt
-class PersistentGradesTest(ProgressPageBaseTest):
-    """
-    Test that grades for completed assessments are persisted
-    when various edits are made.
-    """
-    def setUp(self):
-        super(PersistentGradesTest, self).setUp()
-        self.instructor_dashboard_page = InstructorDashboardPage(self.browser, self.course_id)
-
-    def _change_subsection_structure(self):
-        """
-        Adds a unit to the subsection, which
-        should not affect a persisted subsectiong grade.
-        """
-        with self._logged_in_session(staff=True):
-            self.course_outline.visit()
-            subsection = self.course_outline.section(self.SECTION_NAME).subsection(self.SUBSECTION_NAME)
-            subsection.expand_subsection()
-            subsection.add_unit()
-
-    def _set_staff_lock_on_subsection(self, locked):
-        """
-        Sets staff lock for a subsection, which should hide the
-        subsection score from students on the progress page.
-        """
-        with self._logged_in_session(staff=True):
-            self.course_outline.visit()
-            subsection = self.course_outline.section_at(0).subsection_at(0)
-            subsection.set_staff_lock(locked)
-            self.assertEqual(subsection.has_staff_lock_warning, locked)
-
-    def _change_weight_for_problem(self):
-        """
-        Changes the weight of the problem, which should not affect
-        persisted grades.
-        """
-        with self._logged_in_session(staff=True):
-            self.course_outline.visit()
-            self.course_outline.section_at(0).subsection_at(0).expand_subsection()
-            unit = self.course_outline.section_at(0).subsection_at(0).unit(self.UNIT_NAME).go_to()
-            container = unit.xblocks[0].go_to_container()
-            component = container.xblocks[0].children[0]
-
-            component.edit()
-            component_editor = ComponentEditorView(self.browser, component.locator)
-            component_editor.set_field_value_and_save('Problem Weight', 5)
-
-    def _rescore_for_all(self):
-        """
-        Triggers a rescore for all students. Currently unimplemented.
-        """
-        pass
-
-    def _edit_problem_content(self):
-        """
-        Replaces the content of a problem with other html.
-        Should not affect persisted grades.
-        """
-        with self._logged_in_session(staff=True):
-            self.course_outline.visit()
-            self.course_outline.section_at(0).subsection_at(0).expand_subsection()
-            unit = self.course_outline.section_at(0).subsection_at(0).unit(self.UNIT_NAME).go_to()
-            component = unit.xblocks[1]
-            edit_view = component.edit()
-
-            modified_content = "<p>modified content</p>"
-            # Set content in the CodeMirror editor.
-            type_in_codemirror(self, 0, modified_content)
-
-            edit_view.q(css='.action-save').click()
-
-    @ddt.data(
-        _edit_problem_content,
-        _change_subsection_structure,
-        _change_weight_for_problem,
-        _rescore_for_all
-    )
-    def test_content_changes_do_not_change_score(self, edit):
-        with self._logged_in_session():
-            self.assertEqual(self._get_scores(), [(0, 1)])
-            self.assertEqual(self._get_section_score(), (0, 1))
-            self.courseware_page.visit()
-            self._answer_problem_correctly()
-            self.assertEqual(self._get_scores(), [(1, 1)])
-            self.assertEqual(self._get_section_score(), (1, 1))
-
-        edit(self)
-
-        with self._logged_in_session():
-            self.assertEqual(self._get_scores(), [(1, 1)])
-            self.assertEqual(self._get_section_score(), (1, 1))
-
-    def test_visibility_change_does_affect_score(self):
-        with self._logged_in_session():
-            self.assertEqual(self._get_scores(), [(0, 1)])
-            self.assertEqual(self._get_section_score(), (0, 1))
-            self.courseware_page.visit()
-            self._answer_problem_correctly()
-            self.assertEqual(self._get_scores(), [(1, 1)])
-            self.assertEqual(self._get_section_score(), (1, 1))
-
-        self._set_staff_lock_on_subsection(True)
-
-        with self._logged_in_session():
-            self.assertEqual(self._get_scores(), None)
-            self.assertEqual(self._get_section_score(), None)
-
-        self._set_staff_lock_on_subsection(False)
-
-        with self._logged_in_session():
-            self.assertEqual(self._get_scores(), [(1, 1)])
-            self.assertEqual(self._get_section_score(), (1, 1))
diff --git a/common/test/acceptance/tests/lms/test_progress_page.py b/common/test/acceptance/tests/lms/test_progress_page.py
new file mode 100644
index 0000000000..cad30b789c
--- /dev/null
+++ b/common/test/acceptance/tests/lms/test_progress_page.py
@@ -0,0 +1,273 @@
+# -*- coding: utf-8 -*-
+"""
+End-to-end tests for the LMS that utilize the
+progress page.
+"""
+
+from contextlib import contextmanager
+
+import ddt
+
+from ..helpers import UniqueCourseTest, auto_auth, create_multiple_choice_problem
+from ...fixtures.course import CourseFixture, XBlockFixtureDesc
+from ...pages.common.logout import LogoutPage
+from ...pages.lms.courseware import CoursewarePage
+from ...pages.lms.instructor_dashboard import InstructorDashboardPage
+from ...pages.lms.problem import ProblemPage
+from ...pages.lms.progress import ProgressPage
+from ...pages.studio.component_editor import ComponentEditorView
+from ...pages.studio.utils import type_in_codemirror
+from ...pages.studio.overview import CourseOutlinePage
+
+
+class ProgressPageBaseTest(UniqueCourseTest):
+    """
+    Provides utility methods for tests retrieving
+    scores from the progress page.
+    """
+    USERNAME = "STUDENT_TESTER"
+    EMAIL = "student101@example.com"
+    SECTION_NAME = 'Test Section 1'
+    SUBSECTION_NAME = 'Test Subsection 1'
+    UNIT_NAME = 'Test Unit 1'
+    PROBLEM_NAME = 'Test Problem 1'
+    PROBLEM_NAME_2 = 'Test Problem 2'
+
+    def setUp(self):
+        super(ProgressPageBaseTest, self).setUp()
+        self.courseware_page = CoursewarePage(self.browser, self.course_id)
+        self.problem_page = ProblemPage(self.browser)  # pylint: disable=attribute-defined-outside-init
+        self.progress_page = ProgressPage(self.browser, self.course_id)
+        self.logout_page = LogoutPage(self.browser)
+
+        self.course_outline = CourseOutlinePage(
+            self.browser,
+            self.course_info['org'],
+            self.course_info['number'],
+            self.course_info['run']
+        )
+
+        # Install a course with problems
+        self.course_fix = CourseFixture(
+            self.course_info['org'],
+            self.course_info['number'],
+            self.course_info['run'],
+            self.course_info['display_name']
+        )
+
+        self.course_fix.add_children(
+            XBlockFixtureDesc('chapter', self.SECTION_NAME).add_children(
+                XBlockFixtureDesc('sequential', self.SUBSECTION_NAME).add_children(
+                    XBlockFixtureDesc('vertical', self.UNIT_NAME).add_children(
+                        create_multiple_choice_problem(self.PROBLEM_NAME),
+                        create_multiple_choice_problem(self.PROBLEM_NAME_2)
+                    )
+                )
+            )
+        ).install()
+
+        # Auto-auth register for the course.
+        auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+
+    def _answer_problem_correctly(self):
+        """
+        Submit a correct answer to the problem.
+        """
+        self.courseware_page.go_to_sequential_position(1)
+        self.problem_page.click_choice('choice_choice_2')
+        self.problem_page.click_check()
+
+    def _get_section_score(self):
+        """
+        Return a list of scores from the progress page.
+        """
+        self.progress_page.visit()
+        return self.progress_page.section_score(self.SECTION_NAME, self.SUBSECTION_NAME)
+
+    def _get_problem_scores(self):
+        """
+        Return a list of scores from the progress page.
+        """
+        self.progress_page.visit()
+        return self.progress_page.scores(self.SECTION_NAME, self.SUBSECTION_NAME)
+
+    def _check_progress_page_with_scored_problem(self):
+        """
+        Checks the progress page before and after answering
+        the course's first problem correctly.
+        """
+        with self._logged_in_session():
+            self.assertEqual(self._get_problem_scores(), [(0, 1), (0, 1)])
+            self.assertEqual(self._get_section_score(), (0, 2))
+            self.courseware_page.visit()
+            self._answer_problem_correctly()
+            self.assertEqual(self._get_problem_scores(), [(1, 1), (0, 1)])
+            self.assertEqual(self._get_section_score(), (1, 2))
+
+    @contextmanager
+    def _logged_in_session(self, staff=False):
+        """
+        Ensure that the user is logged in and out appropriately at the beginning
+        and end of the current test.
+        """
+        self.logout_page.visit()
+        try:
+            if staff:
+                auto_auth(self.browser, "STAFF_TESTER", "staff101@example.com", True, self.course_id)
+            else:
+                auto_auth(self.browser, self.USERNAME, self.EMAIL, False, self.course_id)
+            yield
+        finally:
+            self.logout_page.visit()
+
+
+class ProgressPageTest(ProgressPageBaseTest):
+    """
+    Test that the progress page reports scores from completed assessments.
+    """
+    def test_progress_page_shows_scored_problems(self):
+        self._check_progress_page_with_scored_problem()
+
+
+@ddt.ddt
+class PersistentGradesTest(ProgressPageBaseTest):
+    """
+    Test that grades for completed assessments are persisted
+    when various edits are made.
+    """
+    def setUp(self):
+        super(PersistentGradesTest, self).setUp()
+        self.instructor_dashboard_page = InstructorDashboardPage(self.browser, self.course_id)
+
+    def _change_subsection_structure(self):
+        """
+        Adds a unit to the subsection, which
+        should not affect a persisted subsection grade.
+        """
+        with self._logged_in_session(staff=True):
+            self.course_outline.visit()
+            subsection = self.course_outline.section(self.SECTION_NAME).subsection(self.SUBSECTION_NAME)
+            subsection.expand_subsection()
+            subsection.add_unit()
+
+    def _set_staff_lock_on_subsection(self, locked):
+        """
+        Sets staff lock for a subsection, which should hide the
+        subsection score from students on the progress page.
+        """
+        with self._logged_in_session(staff=True):
+            self.course_outline.visit()
+            subsection = self.course_outline.section_at(0).subsection_at(0)
+            subsection.set_staff_lock(locked)
+            self.assertEqual(subsection.has_staff_lock_warning, locked)
+
+    def _change_weight_for_problem(self):
+        """
+        Changes the weight of the problem, which should not affect
+        persisted grades.
+        """
+        with self._logged_in_session(staff=True):
+            self.course_outline.visit()
+            self.course_outline.section_at(0).subsection_at(0).expand_subsection()
+            unit = self.course_outline.section_at(0).subsection_at(0).unit(self.UNIT_NAME).go_to()
+            component = unit.xblocks[1]
+            component.edit()
+            component_editor = ComponentEditorView(self.browser, component.locator)
+            component_editor.set_field_value_and_save('Problem Weight', 5)
+
+    def _edit_problem_content(self):
+        """
+        Replaces the content of a problem with other html.
+        Should not affect persisted grades.
+        """
+        with self._logged_in_session(staff=True):
+            self.course_outline.visit()
+            self.course_outline.section_at(0).subsection_at(0).expand_subsection()
+            unit = self.course_outline.section_at(0).subsection_at(0).unit(self.UNIT_NAME).go_to()
+            component = unit.xblocks[1]
+            modal = component.edit()
+
+            # Set content in the CodeMirror editor.
+            modified_content = "<p>modified content</p>"
+            type_in_codemirror(self, 0, modified_content)
+            modal.q(css='.action-save').click()
+
+    @ddt.data(
+        _edit_problem_content,
+        _change_subsection_structure,
+        _change_weight_for_problem
+    )
+    def test_content_changes_do_not_change_score(self, edit):
+        with self._logged_in_session():
+            self._check_progress_page_with_scored_problem()
+
+        edit(self)
+
+        with self._logged_in_session():
+            self.assertEqual(self._get_problem_scores(), [(1, 1), (0, 1)])
+            self.assertEqual(self._get_section_score(), (1, 2))
+
+    def test_visibility_change_does_affect_score(self):
+        with self._logged_in_session():
+            self._check_progress_page_with_scored_problem()
+
+        self._set_staff_lock_on_subsection(True)
+
+        with self._logged_in_session():
+            self.assertEqual(self._get_problem_scores(), None)
+            self.assertEqual(self._get_section_score(), None)
+
+        self._set_staff_lock_on_subsection(False)
+
+        with self._logged_in_session():
+            self.assertEqual(self._get_problem_scores(), [(1, 1), (0, 1)])
+            self.assertEqual(self._get_section_score(), (1, 2))
+
+
+class SubsectionGradingPolicyTest(ProgressPageBaseTest):
+    """
+    Tests changing a subsection's 'graded' field
+    and the effect it has on the progress page.
+    """
+    def setUp(self):
+        super(SubsectionGradingPolicyTest, self).setUp()
+        self._set_policy_for_subsection("Homework")
+
+    def _set_policy_for_subsection(self, policy):
+        """
+        Set the grading policy for the
+        subsection in the test.
+        """
+        with self._logged_in_session(staff=True):
+            self.course_outline.visit()
+            modal = self.course_outline.section_at(0).subsection_at(0).edit()
+            modal.policy = policy
+            modal.save()
+
+    def _check_scores_and_page_text(self, problem_scores, section_score, text):
+        """
+        Asserts that the given problem and section scores, and text,
+        appear on the progress page.
+        """
+        self.assertEqual(self._get_problem_scores(), problem_scores)
+        self.assertEqual(self._get_section_score(), section_score)
+        self.assertTrue(self.progress_page.text_on_page(text))
+
+    def test_subsection_grading_policy_on_progress_page(self):
+        with self._logged_in_session():
+            self._check_scores_and_page_text([(0, 1), (0, 1)], (0, 2), "Homework 1 - Test Subsection 1 - 0% (0/2)")
+            self.courseware_page.visit()
+            self._answer_problem_correctly()
+            self._check_scores_and_page_text([(1, 1), (0, 1)], (1, 2), "Homework 1 - Test Subsection 1 - 50% (1/2)")
+
+        self._set_policy_for_subsection("Not Graded")
+
+        with self._logged_in_session():
+            self.progress_page.visit()
+            self.assertEqual(self._get_problem_scores(), [(1, 1), (0, 1)])
+            self.assertEqual(self._get_section_score(), (1, 2))
+            self.assertFalse(self.progress_page.text_on_page("Homework 1 - Test Subsection 1"))
+
+        self._set_policy_for_subsection("Homework")
+        with self._logged_in_session():
+            self._check_scores_and_page_text([(1, 1), (0, 1)], (1, 2), "Homework 1 - Test Subsection 1 - 50% (1/2)")
diff --git a/common/test/acceptance/tests/video/test_video_module.py b/common/test/acceptance/tests/video/test_video_module.py
index 56e18a198b..6d300d30e5 100644
--- a/common/test/acceptance/tests/video/test_video_module.py
+++ b/common/test/acceptance/tests/video/test_video_module.py
@@ -4,6 +4,7 @@
 Acceptance tests for Video.
 """
 import os
+from ddt import ddt, unpack, data
 
 from mock import patch
 from nose.plugins.attrib import attr
@@ -199,6 +200,7 @@ class VideoBaseTest(UniqueCourseTest):
 
 
 @attr(shard=4)
+@ddt
 class YouTubeVideoTest(VideoBaseTest):
     """ Test YouTube Video Player """
 
@@ -491,15 +493,16 @@ class YouTubeVideoTest(VideoBaseTest):
         self.assertTrue(self.video.is_button_shown('transcript_button'))
         self._verify_caption_text('Welcome to edX.')
 
-    def test_download_transcript_button_works_correctly(self):
+    @data(('srt', '00:00:00,260'), ('txt', 'Welcome to edX.'))
+    @unpack
+    def test_download_transcript_links_work_correctly(self, file_type, search_text):
         """
-        Scenario: Download Transcript button works correctly
+        Scenario: Download 'srt' transcript link works correctly.
+        Download 'txt' transcript link works correctly.
         Given the course has Video components A and B in "Youtube" mode
         And Video component C in "HTML5" mode
         And I have defined downloadable transcripts for the videos
         Then I can download a transcript for Video A in "srt" format
-        And I can download a transcript for Video A in "txt" format
-        And I can download a transcript for Video B in "txt" format
         And the Download Transcript menu does not exist for Video C
         """
 
@@ -524,19 +527,7 @@ class YouTubeVideoTest(VideoBaseTest):
         self.navigate_to_video()
 
         # check if we can download transcript in "srt" format that has text "00:00:00,260"
-        self.assertTrue(self.video.downloaded_transcript_contains_text('srt', '00:00:00,260'))
-
-        # select the transcript format "txt"
-        self.assertTrue(self.video.select_transcript_format('txt'))
-
-        # check if we can download transcript in "txt" format that has text "Welcome to edX."
-        self.assertTrue(self.video.downloaded_transcript_contains_text('txt', 'Welcome to edX.'))
-
-        # open vertical containing video "B"
-        self.course_nav.go_to_vertical('Test Vertical-1')
-
-        # check if we can download transcript in "txt" format that has text "Equal transcripts"
-        self.assertTrue(self.video.downloaded_transcript_contains_text('txt', 'Equal transcripts'))
+        self.assertTrue(self.video.downloaded_transcript_contains_text(file_type, search_text))
 
         # open vertical containing video "C"
         self.course_nav.go_to_vertical('Test Vertical-2')
diff --git a/conf/locale/ar/LC_MESSAGES/django.mo b/conf/locale/ar/LC_MESSAGES/django.mo
index c02847767c..f9a97e8e12 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 871cef7c7d..d31a8b08e5 100644
--- a/conf/locale/ar/LC_MESSAGES/django.po
+++ b/conf/locale/ar/LC_MESSAGES/django.po
@@ -150,8 +150,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
-"PO-Revision-Date: 2016-07-26 14:02+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
+"PO-Revision-Date: 2016-09-18 17:18+0000\n"
 "Last-Translator: Soha Assali <soha+transifex@qordoba.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -1184,6 +1184,13 @@ msgstr ""
 "إذا جرى تحديد هذا الخيار، لن يُطلب من المستخدمين تأكيد صحّة بريدهم "
 "الإلكتروني بل سيُفعّل حسابهم على الفور بمجرّد التسجيل."
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1707,14 +1714,18 @@ msgstr "هذه الإجابة خاطئة."
 msgid "This answer is partially correct."
 msgstr "هذه الإجابة صحيحة جزئيًا"
 
-#: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
-msgstr "لم تجري الإجابة عن هذه الإجابة."
-
 #: common/lib/capa/capa/inputtypes.py
 msgid "This answer is being processed."
 msgstr "هذه الإجابة قيد المعالجة."
 
+#: common/lib/capa/capa/inputtypes.py
+msgid "Not yet answered."
+msgstr ""
+
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "تحديد خيار"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1796,6 +1807,11 @@ msgstr ""
 "كان من المتوقَّع استلام وسم {expected_tag}؛ جرى تلقّي وسم {given_tag} بدلًا "
 "منه."
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr "صحيح"
@@ -3317,18 +3333,6 @@ msgstr ""
 "فرعي لحين حصول المتعلّمين على أدنى مجموع علامات في قسم متطلبات أساسية فرعي "
 "آخر."
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr "تمكين درجات الأقسام الفرعية المحفوظة  "
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-"أدخل صح أو خطأ. إذا كانت هذه القيمة حقيقية، يتم تمكين ميزة الدرجات القوية "
-"لدرجات القسم الفرعي المحفوظة لهذه الدورة التدريبية.  "
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr "معلومات عن تعلم الدورة التدريبية"
@@ -5420,10 +5424,6 @@ msgstr ""
 "محدّد بالثواني. فعّل ميزة الاحتفاظ بالبيانات في الذاكرة المؤقتة Cache بتعيين"
 " هذه القيمة لتصبح أكبر من 0."
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr "صفحة رابط لطلب الاستلام."
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -9722,6 +9722,10 @@ msgstr "هل تريد إظهار صفحات تفاصيل البرنامج "
 msgid "Enable course home page improvements."
 msgstr "فعّل ميزة تحسين الصفحة الرئيسية للمساق."
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr "صفحة رابط لطلب الاستلام."
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr "لا يمكن تعديل الحقل '{field_name}'."
@@ -9909,27 +9913,39 @@ msgstr "الشركة"
 msgid "Please select your Country."
 msgstr "يُرجى تحديد بلدك."
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "شروط الخدمة وميثاق الشرف الأكاديمي"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
-msgstr "أوافق على {terms_of_service} الخاصين بمنصّة {platform_name}. "
+msgid "Review the Terms of Service and Honor Code"
+msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
-msgstr "يجب الموافقة على {terms_of_service} الخاصين بمنصّة {platform_name}. "
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
+msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -10493,7 +10509,8 @@ msgstr "المحتوى"
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -10686,8 +10703,9 @@ msgstr "اختر لغة"
 msgid "Account"
 msgstr "الحساب"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "المساعدة"
 
@@ -10820,6 +10838,10 @@ msgstr "يرجى تحديث الصفحة لمشاهدة التغييرات ال
 msgid "Discussion - {course_number}"
 msgstr "مناقشة - {course_number} "
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -11070,6 +11092,10 @@ msgstr "تغيير السر الخاصة بي"
 msgid "Email is incorrect."
 msgstr "عنوان البريد الإلكتروني غير صحيح"
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "المساعدة الخاصة بمنصّة {platform_name}"
@@ -18119,11 +18145,9 @@ msgstr "من أستطيع الاتصال به إذا كان لدي أسئلة؟"
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
-"إذا كان لديك أي أسئلة حول المساق أو هذه الاستمارة، يُرجى الاتصال بـ <a "
-"href=\"{mail_to_link}\"\">{mail_to_link}</a>."
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -22071,10 +22095,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "لم تجرِ أي تغييرات. لا يوجد شيء ليُحفَّظ. "
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "تحديد خيار"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "عنوان مختصر"
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.mo b/conf/locale/ar/LC_MESSAGES/djangojs.mo
index 2bb9b2ba24..c0b03a7d34 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 03be3cc7c7..5bd3b3b360 100644
--- a/conf/locale/ar/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ar/LC_MESSAGES/djangojs.po
@@ -110,9 +110,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-08-24 20:16+0000\n"
-"Last-Translator: AR C2 <e2f458fd4s512@outlook.com>\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-18 17:40+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1530,14 +1530,9 @@ msgstr ""
 "يبدو أن الرابط الذي أدخلته عبارة عن رابط خارجي، هل تريد إضافة البادئة "
 "http:// اللازمة؟"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/course-instructor-details.underscore
-#: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
 msgstr "العنوان"
 
@@ -2025,7 +2020,6 @@ msgstr ""
 "بعد، ثمّ أعد تحميل الصفحة."
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr "نأسف لحدوث مشكلة في معالجة طلبك. يُرجى إعادة المحاولة."
 
@@ -6293,6 +6287,12 @@ msgstr "السابق"
 msgid "Status"
 msgstr "الحالة"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr "كبير "
@@ -6432,6 +6432,10 @@ msgstr "إلغاء الإبلاغ"
 msgid "Vote for this post,"
 msgstr "صوّت لهذا المنشور"
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr "مرئيٍّ لـ:"
@@ -6449,16 +6453,18 @@ msgstr ""
 "مرئيّة لجميع الطلاب أو لشعب معيّنة يحدّدوها."
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr "العنوان:"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr "أضِف عنوانًا واضحًا ومعبّرًا لتشجيع المشاركة."
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
-msgstr "أَدخِل سؤالك أو تعليقك"
+msgid "Enter your question or comment."
+msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -6514,8 +6520,8 @@ msgid "Editing post"
 msgstr "تعديل المنشور "
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
-msgstr "تعديل عنوان المنشور "
+msgid "Edit your post below."
+msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Update post"
@@ -9422,11 +9428,6 @@ msgid "Last published %(last_published_date)s by %(publish_username)s"
 msgstr ""
 "نُشرت آخر مرّة في %(last_published_date)s من قِبل %(publish_username)s."
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr "رسالة"
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po
index 3bf847fbbe..9fca33d7de 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: 2016-09-15 11:17+0000\n"
-"PO-Revision-Date: 2016-09-15 11:17:57.818689\n"
+"POT-Creation-Date: 2016-09-22 14:31+0000\n"
+"PO-Revision-Date: 2016-09-22 14:31:50.606322\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -8756,18 +8756,18 @@ msgstr ""
 msgid "Please select your Country."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr ""
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
+msgid "Review the Terms of Service and Honor Code"
 msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
@@ -8775,7 +8775,19 @@ msgstr ""
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
 msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
@@ -8951,7 +8963,7 @@ msgstr ""
 msgid "HTML"
 msgstr ""
 
-#: cms/djangoapps/contentstore/views/component.py
+#: cms/djangoapps/contentstore/views/component.py lms/templates/video.html
 msgid "Video"
 msgstr ""
 
@@ -9934,10 +9946,7 @@ msgid "Tell us the details"
 msgstr ""
 
 #: lms/templates/help_modal.html
-msgid ""
-"Describe what you were doing when you encountered the issue. Include any "
-"details that will help us to troubleshoot, including error messages that you"
-" saw."
+msgid "Include error messages, steps which lead to the issue, etc"
 msgstr ""
 
 #: lms/templates/help_modal.html
@@ -9965,7 +9974,9 @@ msgid "Brief description of the problem"
 msgstr ""
 
 #: lms/templates/help_modal.html
-msgid "Details of the problem you are encountering{asterisk}"
+msgid ""
+"Details of the problem you are encountering{asterisk}{begin_span}Include "
+"error messages, steps which lead to the issue, etc.{end_span}"
 msgstr ""
 
 #: lms/templates/help_modal.html
@@ -10981,13 +10992,29 @@ msgid "No playable video sources found."
 msgstr ""
 
 #: lms/templates/video.html
-msgid "Download video"
+msgid "Downloads and transcripts"
+msgstr ""
+
+#: lms/templates/video.html
+msgid "Download video file"
+msgstr ""
+
+#: lms/templates/video.html
+msgid "Transcripts"
+msgstr ""
+
+#: lms/templates/video.html
+msgid "Download {file}"
 msgstr ""
 
 #: lms/templates/video.html
 msgid "Download transcript"
 msgstr ""
 
+#: lms/templates/video.html
+msgid "Handouts"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Download Handout"
 msgstr ""
diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po
index b3989fc02d..dd68da0ed3 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: 2016-09-15 11:16+0000\n"
-"PO-Revision-Date: 2016-09-15 11:17:58.277591\n"
+"POT-Creation-Date: 2016-09-22 14:30+0000\n"
+"PO-Revision-Date: 2016-09-22 14:31:51.058301\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -1884,7 +1884,6 @@ msgstr ""
 #: common/static/coffee/src/discussion/utils.js
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 #: common/static/common/js/discussion/utils.js
-#: common/static/common/js/discussion/views/discussion_topic_menu_view.js
 #: common/static/common/templates/discussion/pagination.underscore
 msgid "…"
 msgstr ""
@@ -6128,14 +6127,6 @@ msgstr ""
 msgid "Topic Area:"
 msgstr ""
 
-#: common/static/common/templates/discussion/topic.underscore
-msgid "Discussion topics; currently listing: "
-msgstr ""
-
-#: common/static/common/templates/discussion/topic.underscore
-msgid "Filter topics"
-msgstr ""
-
 #: common/static/common/templates/discussion/topic.underscore
 msgid "Add your post to a relevant topic to help others find it."
 msgstr ""
@@ -8655,6 +8646,10 @@ msgstr ""
 msgid "Clear Value"
 msgstr ""
 
+#: cms/templates/js/metadata-editor.underscore
+msgid "Component Location ID"
+msgstr ""
+
 #: cms/templates/js/metadata-file-uploader-item.underscore
 #: cms/templates/js/video/metadata-translations-item.underscore
 msgid "Download"
diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo
index 4ebd99e568..279eeb1489 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 0d8cc3be17..72bfae236e 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: 2016-09-15 11:17+0000\n"
-"PO-Revision-Date: 2016-09-15 11:17:57.818689\n"
+"POT-Creation-Date: 2016-09-22 14:31+0000\n"
+"PO-Revision-Date: 2016-09-22 14:31:50.606322\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -11337,31 +11337,45 @@ msgstr "Çömpäný Ⱡ'σяєм ιρѕυм #"
 msgid "Please select your Country."
 msgstr "Pléäsé séléçt ýöür Çöüntrý. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#"
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr "Révïéw thé Hönör Çödé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "Térms öf Sérvïçé änd Hönör Çödé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
+msgid "Review the Terms of Service and Honor Code"
 msgstr ""
-"Ì ägréé tö thé {platform_name} {terms_of_service}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
-"αмєт, ¢σ#"
+"Révïéw thé Térms öf Sérvïçé änd Hönör Çödé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя #"
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
+msgid "I agree to the {platform_name} {terms_of_service}"
 msgstr ""
-"Ýöü müst ägréé tö thé {platform_name} {terms_of_service}. Ⱡ'σяєм ιρѕυм ∂σłσя"
-" ѕιт αмєт, ¢σηѕє¢т#"
+"Ì ägréé tö thé {platform_name} {terms_of_service} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
+"αмєт, ¢#"
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+"Ýöü müst ägréé tö thé {platform_name} {terms_of_service} Ⱡ'σяєм ιρѕυм ∂σłσя "
+"ѕιт αмєт, ¢σηѕє¢#"
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
+msgstr "Révïéw thé Térms öf Sérvïçé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#"
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -11569,7 +11583,7 @@ msgstr "{platform_name} Süppört Lévéls: Ⱡ'σяєм ιρѕυм ∂σłσя
 msgid "HTML"
 msgstr "HTML Ⱡ'σяєм ι#"
 
-#: cms/djangoapps/contentstore/views/component.py
+#: cms/djangoapps/contentstore/views/component.py lms/templates/video.html
 msgid "Video"
 msgstr "Vïdéö Ⱡ'σяєм ιρѕ#"
 
@@ -12690,19 +12704,10 @@ msgid "Tell us the details"
 msgstr "Téll üs thé détäïls Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
 
 #: lms/templates/help_modal.html
-msgid ""
-"Describe what you were doing when you encountered the issue. Include any "
-"details that will help us to troubleshoot, including error messages that you"
-" saw."
+msgid "Include error messages, steps which lead to the issue, etc"
 msgstr ""
-"Désçrïßé whät ýöü wéré döïng whén ýöü énçöüntéréd thé ïssüé. Ìnçlüdé äný "
-"détäïls thät wïll hélp üs tö tröüßléshööt, ïnçlüdïng érrör méssägés thät ýöü"
-" säw. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ "
-"єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм"
-" νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα "
-"¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт"
-" єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт "
-"¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυηт мσłł#"
+"Ìnçlüdé érrör méssägés, stéps whïçh léäd tö thé ïssüé, étç Ⱡ'σяєм ιρѕυм "
+"∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
 
 #: lms/templates/help_modal.html
 msgid "Thank You!"
@@ -12738,10 +12743,13 @@ msgstr ""
 "Brïéf désçrïptïön öf thé prößlém Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
 
 #: lms/templates/help_modal.html
-msgid "Details of the problem you are encountering{asterisk}"
+msgid ""
+"Details of the problem you are encountering{asterisk}{begin_span}Include "
+"error messages, steps which lead to the issue, etc.{end_span}"
 msgstr ""
-"Détäïls öf thé prößlém ýöü äré énçöüntérïng{asterisk} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт"
-" αмєт, ¢σηѕє¢тєтυя α#"
+"Détäïls öf thé prößlém ýöü äré énçöüntérïng{asterisk}{begin_span}Ìnçlüdé "
+"érrör méssägés, stéps whïçh léäd tö thé ïssüé, étç.{end_span} Ⱡ'σяєм ιρѕυм "
+"∂σłσя #"
 
 #: lms/templates/help_modal.html
 msgid "suggestion"
@@ -13974,13 +13982,29 @@ msgstr ""
 "Nö pläýäßlé vïdéö söürçés föünd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
 
 #: lms/templates/video.html
-msgid "Download video"
-msgstr "Döwnlöäd vïdéö Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+msgid "Downloads and transcripts"
+msgstr "Döwnlöäds änd tränsçrïpts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
+
+#: lms/templates/video.html
+msgid "Download video file"
+msgstr "Döwnlöäd vïdéö fïlé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
+
+#: lms/templates/video.html
+msgid "Transcripts"
+msgstr "Tränsçrïpts Ⱡ'σяєм ιρѕυм ∂σłσя #"
+
+#: lms/templates/video.html
+msgid "Download {file}"
+msgstr "Döwnlöäd {file} Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
 #: lms/templates/video.html
 msgid "Download transcript"
 msgstr "Döwnlöäd tränsçrïpt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
 
+#: lms/templates/video.html
+msgid "Handouts"
+msgstr "Händöüts Ⱡ'σяєм ιρѕυм ∂#"
+
 #: lms/templates/video.html
 msgid "Download Handout"
 msgstr "Döwnlöäd Händöüt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo
index 58f8f771b9..819f1b0aff 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 b0d344e0e6..6971a4ebb0 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: 2016-09-15 11:16+0000\n"
-"PO-Revision-Date: 2016-09-15 11:17:58.277591\n"
+"POT-Creation-Date: 2016-09-22 14:30+0000\n"
+"PO-Revision-Date: 2016-09-22 14:31:51.058301\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -1963,7 +1963,6 @@ msgstr ""
 #: common/static/coffee/src/discussion/utils.js
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 #: common/static/common/js/discussion/utils.js
-#: common/static/common/js/discussion/views/discussion_topic_menu_view.js
 #: common/static/common/templates/discussion/pagination.underscore
 msgid "…"
 msgstr "… Ⱡ#"
@@ -7175,16 +7174,6 @@ msgstr "Çölläpsé dïsçüssïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт
 msgid "Topic Area:"
 msgstr "Töpïç Àréä: Ⱡ'σяєм ιρѕυм ∂σłσя #"
 
-#: common/static/common/templates/discussion/topic.underscore
-msgid "Discussion topics; currently listing: "
-msgstr ""
-"Dïsçüssïön töpïçs; çürréntlý lïstïng:  Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тєтυя#"
-
-#: common/static/common/templates/discussion/topic.underscore
-msgid "Filter topics"
-msgstr "Fïltér töpïçs Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
-
 #: common/static/common/templates/discussion/topic.underscore
 msgid "Add your post to a relevant topic to help others find it."
 msgstr ""
@@ -10174,6 +10163,10 @@ msgstr "Àdd Ⱡ'σяєм#"
 msgid "Clear Value"
 msgstr "Çléär Välüé Ⱡ'σяєм ιρѕυм ∂σłσя #"
 
+#: cms/templates/js/metadata-editor.underscore
+msgid "Component Location ID"
+msgstr "Çömpönént Löçätïön ÌD Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
+
 #: cms/templates/js/metadata-file-uploader-item.underscore
 #: cms/templates/js/video/metadata-translations-item.underscore
 msgid "Download"
diff --git a/conf/locale/es_419/LC_MESSAGES/django.mo b/conf/locale/es_419/LC_MESSAGES/django.mo
index e17fd66350..4efbf7d5b0 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 6d9559e940..1f49f60d1a 100644
--- a/conf/locale/es_419/LC_MESSAGES/django.po
+++ b/conf/locale/es_419/LC_MESSAGES/django.po
@@ -186,8 +186,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
-"PO-Revision-Date: 2016-05-09 11:27+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
+"PO-Revision-Date: 2016-09-15 14:35+0000\n"
 "Last-Translator: Laura Silva <lingison@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"
@@ -1211,6 +1211,13 @@ msgstr ""
 "Si se selecciona esta opción, los usuarios no tendrán que confirmar su "
 "correo, y sus cuentas estarán activadas inmediatamente después del registro."
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1723,14 +1730,18 @@ msgstr "Esta respuesta es incorrecta."
 msgid "This answer is partially correct."
 msgstr "Esta respuesta es parcialmente correcta."
 
-#: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
-msgstr "Este problema no está contestado."
-
 #: common/lib/capa/capa/inputtypes.py
 msgid "This answer is being processed."
 msgstr "Esta respuesta está siendo procesada."
 
+#: common/lib/capa/capa/inputtypes.py
+msgid "Not yet answered."
+msgstr ""
+
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "Seleccione una opción"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1812,6 +1823,11 @@ msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr ""
 "Esperaba una etiqueta {expected_tag} pero recibí una de tipo {given_tag}"
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr "Correcto"
@@ -3377,19 +3393,6 @@ msgstr ""
 "hasta que los estudiantes obtengan un puntaje mínimo en una subsección que "
 "sea prerequisito."
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr "Habilitar calificaciones de subsección grabadas."
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-"Ingrese true o false. Cuando ingrese true, la funcionalidad de "
-"calificaciones robustas para que se guarden las calificaciones de subsección"
-" quedará activada para este curso."
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr "Información sobre Aprendizaje en el Curso"
@@ -5514,10 +5517,6 @@ msgstr ""
 "Especificado en segundos. Habilite el cache configurando este campo en un "
 "valor mayor que 0."
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr "Ruta para la página de recibo de la orden."
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -9920,6 +9919,10 @@ msgstr "Queremos mostrar las páginas con los detalles de los programas"
 msgid "Enable course home page improvements."
 msgstr "Habilitar las mejoras a la página de inicio del curso."
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr "Ruta para la página de recibo de la orden."
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr "El campo '{field_name}' no puede ser editado."
@@ -10109,28 +10112,39 @@ msgstr "Empresa"
 msgid "Please select your Country."
 msgstr "Por favor seleccione su país."
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "Términos del servicio y código de honor"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
-msgstr "Estoy de acuerdo en el {platform_name} {terms_of_service}."
+msgid "Review the Terms of Service and Honor Code"
+msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
 msgstr ""
-"Usted debe estar de acuerdo con la  {platform_name} {terms_of_service}."
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -10706,7 +10720,8 @@ msgstr "Contenido"
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -10897,8 +10912,9 @@ msgstr "Seleccionar idioma"
 msgid "Account"
 msgstr "Cuenta"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "Ayuda"
 
@@ -11032,6 +11048,10 @@ msgstr "Por favor recargue la página para que los cambios sean aplicados."
 msgid "Discussion - {course_number}"
 msgstr "Discusión - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -11287,6 +11307,10 @@ msgstr "Restablecer mi contraseña"
 msgid "Email is incorrect."
 msgstr "La dirección de correo electrónico no es válida"
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "Ayuda de {platform_name}"
@@ -18481,11 +18505,9 @@ msgstr "¿A quién puedo contactar si tengo más preguntas?"
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
-"Si tiene preguntas sobre este curso o formulario, puede contactar a <a "
-"href=\"{mail_to_link}\"\">{mail_to_link}</a>."
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -22553,10 +22575,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "No se han realizado cambios."
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "Seleccione una opción"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "Slug"
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.mo b/conf/locale/es_419/LC_MESSAGES/djangojs.mo
index e7ffd59d58..2d7fc17fc1 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 a8e5a1daf5..5346edf81a 100644
--- a/conf/locale/es_419/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_419/LC_MESSAGES/djangojs.po
@@ -117,8 +117,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-08-18 15:48+0000\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-15 14:39+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"
@@ -1532,14 +1532,9 @@ msgstr ""
 "La URL que introdujo parece ser un vínculo externo. ¿Desea agregarle el "
 "prefijo requerido http://?"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/course-instructor-details.underscore
-#: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
 msgstr "Título"
 
@@ -2017,7 +2012,6 @@ msgstr ""
 "su trabajo y luego recargue la página."
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr ""
 "Ocurrió un problema al procesar su solicitud. Por favor intente nuevamente."
@@ -6264,6 +6258,12 @@ msgstr "Anterior"
 msgid "Status"
 msgstr "Estado"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr "Largo"
@@ -6404,6 +6404,10 @@ msgstr "No reportar"
 msgid "Vote for this post,"
 msgstr "Vote por esta publicación"
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr "Visible para:"
@@ -6421,16 +6425,18 @@ msgstr ""
 "visibles a todos los estudiantes o para un grupo común específico."
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr "Título:"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr "Añade un título claro y descriptivo para fomentar la participación."
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
-msgstr "Ingresa tu pregunta o comentario"
+msgid "Enter your question or comment."
+msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -6486,8 +6492,8 @@ msgid "Editing post"
 msgstr "Editando entrada"
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
-msgstr "Editar el título de la publicación"
+msgid "Edit your post below."
+msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Update post"
@@ -9445,11 +9451,6 @@ msgid "Last published %(last_published_date)s by %(publish_username)s"
 msgstr ""
 "Publicado por última vez el %(last_published_date)s por %(publish_username)s"
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr "mensaje"
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/conf/locale/fr/LC_MESSAGES/django.mo b/conf/locale/fr/LC_MESSAGES/django.mo
index a4faa6f7e2..1e0b6281bf 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 e5f2b4b88a..c639cc087a 100644
--- a/conf/locale/fr/LC_MESSAGES/django.po
+++ b/conf/locale/fr/LC_MESSAGES/django.po
@@ -249,7 +249,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
 "PO-Revision-Date: 2016-08-30 15:36+0000\n"
 "Last-Translator: Matthieu Falce <falce.matthieu@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/open-edx/edx-platform/language/fr/)\n"
@@ -1275,6 +1275,13 @@ msgstr ""
 "leur adresse mail, et leur compte sera activé immédiatement après "
 "inscription."
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1787,14 +1794,18 @@ msgstr "Cette réponse est fausse."
 msgid "This answer is partially correct."
 msgstr "Cette réponse est partiellement correcte."
 
-#: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
-msgstr "Il n'a pas été répondu à cette question."
-
 #: common/lib/capa/capa/inputtypes.py
 msgid "This answer is being processed."
 msgstr "Cette réponse est en cours de traitement."
 
+#: common/lib/capa/capa/inputtypes.py
+msgid "Not yet answered."
+msgstr ""
+
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "Sélectionnez une option"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1873,6 +1884,11 @@ msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr ""
 "La balise {expected_tag} était attendue ; {given_tag} a été reçue à la place"
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr "Correct"
@@ -3339,16 +3355,6 @@ msgid ""
 "learners earn a minimum score in another, prerequisite subsection."
 msgstr ""
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr "Information sur l'apprentissage dans ce cours"
@@ -5396,10 +5402,6 @@ msgstr ""
 "Indiqués en secondes. Active la mise en cache en réglant à une valeur plus "
 "grande que 0."
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr "Chemin vers la page de reçu de la commande"
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -9436,6 +9438,10 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr ""
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr "Chemin vers la page de reçu de la commande"
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Le champ '{field_name}' ne peut pas être modifié."
@@ -9622,27 +9628,39 @@ msgstr "Entreprise"
 msgid "Please select your Country."
 msgstr "Sélectionnez votre pays, s'il vous plaît."
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "Conditions générales du service et code d'honneur"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
-msgstr "J'accepte les {terms_of_service} {platform_name}."
+msgid "Review the Terms of Service and Honor Code"
+msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
-msgstr "Vous devez accepter les {terms_of_service} {platform_name}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
+msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -10216,7 +10234,8 @@ msgstr "Contenu"
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -10408,8 +10427,9 @@ msgstr "Choisir la langue"
 msgid "Account"
 msgstr "Compte"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "Aide"
 
@@ -10543,6 +10563,10 @@ msgstr ""
 msgid "Discussion - {course_number}"
 msgstr "Discussion - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -10795,6 +10819,10 @@ msgstr "Réinitialiser mon mot de passe"
 msgid "Email is incorrect."
 msgstr "L’adresse e-mail est incorrecte."
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "{platform_name} Aide"
@@ -17588,11 +17616,9 @@ msgstr "Qui puis-je contacter si j'ai une question?"
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
-"Si vous avez une question à propos de ce cours ou de ce questionnaire, vous "
-"pouvez contacter <a href=\"{mail_to_link}\"\">{mail_to_link}</a>."
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -21303,10 +21329,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "Aucun changement. Rien n'a été sauvé."
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "Sélectionnez une option"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "Slug"
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.mo b/conf/locale/fr/LC_MESSAGES/djangojs.mo
index aaf2a3b8bf..4f296c2183 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 da1b4df12f..9b4f2c103b 100644
--- a/conf/locale/fr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fr/LC_MESSAGES/djangojs.po
@@ -163,9 +163,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-09-05 12:38+0000\n"
-"Last-Translator: laurentFUN <laurent.at.fun@gmail.com>\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-15 13:50+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1579,14 +1579,9 @@ msgstr ""
 "L'URL que vous avez entrée semble être un lien externe. Voulez-vous ajouter "
 "le préfixe http:// requis ?"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/course-instructor-details.underscore
-#: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
 msgstr "Titre"
 
@@ -2067,7 +2062,6 @@ msgstr ""
 "rechargez la page."
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr ""
 "Nous ne parvenons pas à réaliser votre requête. Merci de réessayer plus "
@@ -6317,6 +6311,12 @@ msgstr "Précédent"
 msgid "Status"
 msgstr "Statut"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr "Grand"
@@ -6457,6 +6457,10 @@ msgstr "Ne plus dénoncer"
 msgid "Vote for this post,"
 msgstr "Voter pour ce message, "
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr "Visible par :"
@@ -6475,16 +6479,18 @@ msgstr ""
 "uniquement une cohorte."
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr "Titre :"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr "Ajouter un titre clair et explicite pour encourager la participation."
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
-msgstr "Saisir votre question ou commentaire"
+msgid "Enter your question or comment."
+msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -6540,8 +6546,8 @@ msgid "Editing post"
 msgstr "Message en cours d'édition"
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
-msgstr "Éditer le titre du message"
+msgid "Edit your post below."
+msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Update post"
@@ -9389,11 +9395,6 @@ msgstr "Jamais publié"
 msgid "Last published %(last_published_date)s by %(publish_username)s"
 msgstr "Dernière publication %(last_published_date)s par %(publish_username)s"
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr "message"
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/conf/locale/he/LC_MESSAGES/django.mo b/conf/locale/he/LC_MESSAGES/django.mo
index fb203d696d..a139b97574 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 d080cefabc..0b506d91b1 100644
--- a/conf/locale/he/LC_MESSAGES/django.po
+++ b/conf/locale/he/LC_MESSAGES/django.po
@@ -73,8 +73,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
-"PO-Revision-Date: 2016-08-08 13:56+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
+"PO-Revision-Date: 2016-09-19 21:27+0000\n"
 "Last-Translator: qualityalltext <quality@alltext.co.il>\n"
 "Language-Team: Hebrew (http://www.transifex.com/open-edx/edx-platform/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -779,7 +779,7 @@ msgid ""
 "The company identifier for the LinkedIn Add-to-Profile button e.g "
 "0_0dPSPyS070e0HsE9HNz_13_d11_"
 msgstr ""
-"מזהה החברה עבור לחצן 'הוסף לפרופיל' ב-LinkedIn  לדוגמה "
+"מזהה החברה עבור לחצן 'הוסף לפרופיל' בלינקדאין  לדוגמה "
 "0_0dPSPyS070e0HsE9HNz_13_d11_"
 
 #: common/djangoapps/student/models.py
@@ -788,8 +788,8 @@ msgid ""
 "(Example: 'edx')  If no value is provided, tracking codes will not be sent "
 "to LinkedIn."
 msgstr ""
-"מזהה קצר בקוד מעקב עבור שותף  LinkedIn (דוגמה: 'edX'). אם לא יסופק ערך, לא "
-"ישלח קוד מעקב ל-LinkedIn.  "
+"מזהה קצר בקוד מעקב עבור שותף  לינקדאין (דוגמה: 'edX'). אם לא יסופק ערך, לא "
+"ישלח קוד מעקב ללינקדאין.  "
 
 #: common/djangoapps/student/models.py
 msgid "{platform_name} Certificate for {course_name}"
@@ -1012,7 +1012,7 @@ msgstr "לא קיים משתמש לא-פעיל עבור כתובת דואר אל
 
 #: common/djangoapps/student/views.py
 msgid "Unable to send reactivation email"
-msgstr "אין אפשרות לשלוח דוא\"ל הפעלה"
+msgstr "אין אפשרות לשלוח דואר אלקטרוני הפעלה"
 
 #: common/djangoapps/student/views.py
 msgid "Valid e-mail address required."
@@ -1028,7 +1028,8 @@ msgstr "קיים חשבון בעל דואר אלקטרוני זה."
 
 #: common/djangoapps/student/views.py
 msgid "Unable to send email activation link. Please try again later."
-msgstr "לא ניתן לשלוח את קישור ההפעלה לתיבת הדואר . אנא נסה מאוחר יותר."
+msgstr ""
+"לא ניתן לשלוח את קישור ההפעלה לתיבת הדואר אלקטרוני. אנא נסה מאוחר יותר."
 
 #: common/djangoapps/third_party_auth/models.py
 msgid "Authentication with {} is currently unavailable."
@@ -1059,6 +1060,13 @@ msgstr ""
 "אם אפשרות זו נבחרה, לא יתבקשו המשתמשים לאשר את כתובת הדואר האלקטרוני שלהם "
 "וחשבונם יופעל מיד עם הרשמתם."
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1229,7 +1237,7 @@ msgstr "יום א'"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Jan"
-msgstr "ינואר"
+msgstr "ינו"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Feb 10, 2014". It is used for the %b
@@ -1237,7 +1245,7 @@ msgstr "ינואר"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Feb"
-msgstr "פברואר"
+msgstr "פבר"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Mar 10, 2014". It is used for the %b
@@ -1253,7 +1261,7 @@ msgstr "מרץ"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Apr"
-msgstr "אפריל"
+msgstr "אפר"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "May 10, 2014". It is used for the %b
@@ -1269,7 +1277,7 @@ msgstr "מאי"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Jun"
-msgstr "יוני"
+msgstr "יונ"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Jul 10, 2014". It is used for the %b
@@ -1277,7 +1285,7 @@ msgstr "יוני"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Jul"
-msgstr "יולי"
+msgstr "יול"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Aug 10, 2014". It is used for the %b
@@ -1285,7 +1293,7 @@ msgstr "יולי"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Aug"
-msgstr "אוגוסט"
+msgstr "אוג"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Sep 10, 2014". It is used for the %b
@@ -1293,7 +1301,7 @@ msgstr "אוגוסט"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Sep"
-msgstr "ספטמבר"
+msgstr "ספט"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Oct 10, 2014". It is used for the %b
@@ -1301,7 +1309,7 @@ msgstr "ספטמבר"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Oct"
-msgstr "אוקטובר"
+msgstr "אוק"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Nov 10, 2014". It is used for the %b
@@ -1309,7 +1317,7 @@ msgstr "אוקטובר"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Nov"
-msgstr "נובמבר"
+msgstr "נוב"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Dec 10, 2014". It is used for the %b
@@ -1317,7 +1325,7 @@ msgstr "נובמבר"
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Dec"
-msgstr "דצמבר"
+msgstr "דצמ"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "January 10, 2014". It is used for the %B directive in
@@ -1575,18 +1583,22 @@ msgstr "התשובה שגויה."
 msgid "This answer is partially correct."
 msgstr "התשובה נכונה בחלקה."
 
-#: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
-msgstr "לא ניתנה תשובה."
-
 #: common/lib/capa/capa/inputtypes.py
 msgid "This answer is being processed."
 msgstr "התשובה נמצאת בתהליך עיבוד."
 
+#: common/lib/capa/capa/inputtypes.py
+msgid "Not yet answered."
+msgstr ""
+
+#: common/lib/capa/capa/inputtypes.py wiki/forms.py
+msgid "Select an option"
+msgstr "בחר אפשרות"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
-msgstr "בחירה מרובה: תג לא צפוי {tag_name}"
+msgstr "בחירה מרובה: תגית לא צפויה {tag_name}"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Answer received."
@@ -1597,7 +1609,7 @@ msgstr "התשובה התקבלה."
 #: common/lib/capa/capa/inputtypes.py
 msgid "Expected a <choice> or <compoundhint> tag; got {given_tag} instead"
 msgstr ""
-"ציפיתי לתג <choice> או <compoundhint>; במקום זאת קיבלתי תג {given_tag}"
+"צפויה לתגית <choice> או <compoundhint>; במקום זאת התקבלה תג {given_tag}"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid ""
@@ -1635,7 +1647,7 @@ msgstr "לא פורטה נוסחה."
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Couldn't parse formula: {error_msg}"
-msgstr "אינו יכול לעבד את נוסחת: {error_msg}"
+msgstr "אינו יכול לנתח את נוסחת: {error_msg}"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Error while rendering preview"
@@ -1643,17 +1655,22 @@ msgstr "שגיאה בזמן ביצוע תצוגה מקדימה"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Sorry, couldn't parse formula"
-msgstr "צר לנו, לא ניתן לעבד נוסחה"
+msgstr "מצטערים, לא ניתן לנתח נוסחה"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "{input_type}: unexpected tag {tag_name}"
-msgstr "{input_type}: תג לא צפוי {tag_name}"
+msgstr "{input_type}: תגית לא צפויה {tag_name}"
 
 #. Translators: a "tag" is an XML element, such as "<b>" in HTML
 #: common/lib/capa/capa/inputtypes.py
 msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr "צפויה תגית {expected_tag}; במקום זאת התקבלה תגית {given_tag}"
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr "נכון"
@@ -1737,7 +1754,7 @@ msgstr "אין להשתמש במשתנים ({bad_variables}) בבעיות מספ
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "factorial function evaluated outside its domain:'{student_answer}'"
-msgstr "פונקציית factorial משוערכת מחוץ לתחום הגדרה: '{student_answer}'"
+msgstr "פונקציית עצרת משוערכת מחוץ לתחום הגדרה: '{student_answer}'"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Invalid math syntax: '{student_answer}'"
@@ -1854,16 +1871,16 @@ msgid ""
 "factorial function not permitted in answer for this problem. Provided answer"
 " was: {bad_input}"
 msgstr ""
-"פונקציות factorial אינן חוקיות בתשובה עבור בעיה זו. התשובה שניתנה הייתה: "
+"פונקציות עצרת אינן חוקיות בתשובה עבור בעיה זו. התשובה שניתנה הייתה: "
 "{bad_input}"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Invalid input: Could not parse '{bad_input}' as a formula."
-msgstr "הזנת נתונים לא חוקים: לא ניתן לנסח '{bad_input}' כנוסחה."
+msgstr "הזנת נתונים לא חוקים: לא ניתן לנתח '{bad_input}' כנוסחה."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Invalid input: Could not parse '{bad_input}' as a formula"
-msgstr "הזנת נתונים לא חוקיים: לא ניתן לנסח  '{bad_input}' כנוסחה. "
+msgstr "הזנת נתונים לא חוקיים: לא ניתן לנתח  '{bad_input}' כנוסחה. "
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Circuit Schematic Builder"
@@ -1886,7 +1903,7 @@ msgstr "שגיאה בדירוג {image_input_id} (קלט={user_input})"
 #. Translators: {sr_coords} are the coordinates of a rectangle
 #: common/lib/capa/capa/responsetypes.py
 msgid "Error in problem specification! Cannot parse rectangle in {sr_coords}"
-msgstr "שגיאה בפירוט הבעיה! לא ניתן לנסח מלבן ב{sr_coords}"
+msgstr "שגיאה בפירוט הבעיה! לא ניתן לנתח מלבן ב{sr_coords}"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Annotation Input"
@@ -2010,18 +2027,18 @@ msgstr "לעולם"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether to force the save button to appear on the page"
-msgstr "האם לחייב שיופיע כפתור השמירה בעמוד"
+msgstr "האם לחייב הופעת לחצן 'שמירה' בעמוד"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Show Reset Button"
-msgstr "הצג כפתור איפוס"
+msgstr "הצג לחצן 'איפוס'"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Determines whether a 'Reset' button is shown so the user may reset their "
 "answer. A default value can be set in Advanced Settings."
 msgstr ""
-"קובע אם כפתור 'אתחל' מוצג כדי שמשתמשים יוכלו לאתחל את תשובותיהם. ניתן לקבוע "
+"קובע אם לחצן 'אתחל' מוצג כדי שמשתמשים יוכלו לאתחל את תשובותיהם. ניתן לקבוע "
 "ערך ברירת מחדל בהגדרות מתקדמות."
 
 #: common/lib/xmodule/xmodule/capa_base.py
@@ -2075,7 +2092,7 @@ msgstr "זמן הגשה אחרונה"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Timer Between Attempts"
-msgstr "טיימר בין ניסיונות"
+msgstr "זמן בין ניסיונות"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
@@ -2129,7 +2146,7 @@ msgid ""
 "compromised. To obtain a key for your course, or to report an issue, please "
 "contact moocsupport@mathworks.com"
 msgstr ""
-"הזן את מפתח ה-API שסופק בידי MathWorks כדי לגשת לשירות המתארח של MATLAB. "
+"הזן את מפתח ה-API שסופק בידי MathWorks כדי לגשת לשירות המאוחסן של MATLAB. "
 "מפתח זה ניתן לשימוש בלעדי על ידי קורס זה לפרק הזמן שצוין. אל תשתף את מפתח "
 "ה-API עם קורסים אחרים והודע מיד ל-MathWorks אם אתה חושב שהמפתח נחשף או שנעשה"
 " בו שימוש לרעה. כדי להשיג מפתח עבור הקורס שלך או כדי לדווח על בעיה, צור קשר "
@@ -2253,7 +2270,8 @@ msgid ""
 "We're sorry, there was an error with processing your request. Please try "
 "reloading your page and trying again."
 msgstr ""
-"צר לנו, אירעה שגיאה בעיבוד בקשתך. אנא נסה לטעון מחדש את העמוד שלך ונסה שוב. "
+"מצטערים, אירעה שגיאה בעיבוד בקשתך. אנא נסה לטעון מחדש את העמוד שלך ונסה שוב."
+" "
 
 #: common/lib/xmodule/xmodule/capa_module.py
 msgid ""
@@ -2276,7 +2294,8 @@ msgstr "סיסמאות LTI"
 msgid ""
 "Enter the passports for course LTI tools in the following format: "
 "\"id:client_key:client_secret\"."
-msgstr "הזן את הסיסמאות עבור כלי LTI בפורמט הבא: \"id:client_key:client_secret\"."
+msgstr ""
+"הזן את ה-passports עבור כלי LTI בפורמט הבא: \"id:client_key:client_secret\"."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2287,7 +2306,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Slug that points to the wiki for this course"
-msgstr ""
+msgstr "גרור את הנקודות הללו ל-Wiki עבור קורס זה"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Date that enrollment for this class is opened"
@@ -2375,7 +2394,7 @@ msgstr "הזן את השיטה בה הקורס נערך  (\"XML\" או \"Studio\
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Survey URL"
-msgstr "כתובת URL לסקר קורס. "
+msgstr "כתובת URL לסקר הקורס. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2459,7 +2478,7 @@ msgid ""
 "as private to cohort members."
 msgstr ""
 "הזן מפתחות מדיניות וערכים על מנת לאפשר את תכונת קבוצת הלימוד, הגדר הקצאה "
-"אוטומטית של סטודנטים לקבוצה, או הגדר נושאי דיון כלל קורסיים כפרטיים לחברי "
+"אוטומטית של סטודנטים לקבוצה, או הגדר נושאי דיון כלליים בקורס כפרטיים לחברי "
 "קבוצת הלימוד."
 
 #: common/lib/xmodule/xmodule/course_module.py
@@ -2471,7 +2490,7 @@ msgid ""
 "Enter true or false. If true, the course appears in the list of new courses "
 "on edx.org, and a New! badge temporarily appears next to the course image."
 msgstr ""
-"הזן כן או לא. אם כן, הקורס מופיע ברשימה של קורסים חדשים ב-edx.org, וסמל חדש "
+"הזן כן או לא. אם כן, הקורס מופיע ברשימה של קורסים חדשים ב-edx.org, ותג חדש "
 "יופיע באופן זמני ליד תמונת הקורס. "
 
 #: common/lib/xmodule/xmodule/course_module.py
@@ -2486,7 +2505,7 @@ msgstr "הזן כן או לא. אם כן, הקורס יהיה זמין למכש
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Video Upload Credentials"
-msgstr "אישורי העלאת וידאו"
+msgstr "אישורי העלאת סרטון וידאו"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2527,8 +2546,8 @@ msgid ""
 "name of the tab (usually the title of the book) as well as the URLs and "
 "titles of each chapter in the book."
 msgstr ""
-"עבור ספרי לימוד ב-HTML Vמופיעים ככרטיסיות נפרדות בקורס, הזן את שם הכרטיסייה "
-"(לרוב כותרת הספר) וכן את כתובות האתר והכותרות של כל פרק בספר."
+"עבור ספרי לימוד ב-HTML המופיעים ככרטיסיות נפרדות בקורס, הזן את שם הכרטיסייה "
+"(לרוב כותרת הספר) וכן את כתובות ה-URL והכותרות של כל פרק בספר."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Remote Gradebook"
@@ -2570,14 +2589,14 @@ msgstr ""
 #. course content.
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "CCX Connector URL"
-msgstr "כתובת אתר של CCX Connector"
+msgstr "כתובת URL של CCX Connector"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "URL for CCX Connector application for managing creation of CCXs. (optional)."
 " Ignored unless 'Enable CCX' is set to 'true'."
 msgstr ""
-"כתובת אתר לאפליקצית CCX Connector לניהול יצירת CCXs. (אופציונלי). יש להתעלם "
+"כתובת URL לאפליקצית CCX Connector לניהול יצירת CCXs. (אופציונלי). יש להתעלם "
 "אלא אם כן 'הפעל CCX' מוגדר כ'כן'."
 
 #: common/lib/xmodule/xmodule/course_module.py
@@ -2616,7 +2635,7 @@ msgstr "הזן את שמות המודולים המתקדמים שישמשו בק
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Home Sidebar Name"
-msgstr "שם סרגל הצד של דף הבית של הקורס"
+msgstr "שם סרגל הצד של עמוד הבית של הקורס"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2807,14 +2826,13 @@ msgstr "הזן פרטי הגדרת תצורה ספציפיים לקורס כאן
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "CSS Class for Course Reruns"
-msgstr "CSS Class עבור שידורים חוזרים של הקורס"
+msgstr "CSS Class עבור הרצות חוזרות של הקורס"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Allows courses to share the same css class across runs even if they have "
 "different numbers."
-msgstr ""
-"מאפשר לקורסים לשתף את אותו כיתת CSS בשידורים גם אם יש להם מספרים שונים."
+msgstr "מאפשר לקורסים לשתף את אותו כיתת CSS בהרצות גם אם יש להם מספרים שונים."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Discussion Forum External Link"
@@ -2826,11 +2844,11 @@ msgstr "מאפשר מפרט של קישור חיצוני על מנת להחלי
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Hide Progress Tab"
-msgstr "הסתר גרף התקדמות"
+msgstr "הסתר כרטיסיית התקדמות"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Allows hiding of the progress tab."
-msgstr "אפשר הסתרה של גרף ההתקדמות."
+msgstr "אפשר הסתרה של כרטיסיית ההתקדמות."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Organization Display String"
@@ -2910,6 +2928,8 @@ msgid ""
 "course content. If you set this value to true, you must add a name for the "
 "survey to the Course Survey Name setting above."
 msgstr ""
+"פרט אם סטודנטים חייבים להשלים את הסקר לפני שיוכלו לצפות בתוכן הקורס שלך. אם "
+"הנך קובע ערך זה כ-כן, חובה להוסיף שם בהגדרת שם סקר הקורס מעלה."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Visibility In Catalog"
@@ -2952,6 +2972,8 @@ msgid ""
 " your course content. Note, you must enable Entrance Exams for this course "
 "setting to take effect."
 msgstr ""
+"ציין אם סטודנטים חייבים להשלים בחינת כניסה לפני שיוכלו לצפות בתוכן הקורס. "
+"שים לב, עליך לאפשר בחינות כניסה לקורס זה על מנת שההגדרות ייכנסו לתוקף."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Entrance Exam Minimum Score (%)"
@@ -2963,6 +2985,8 @@ msgid ""
 "view your course content. Note, you must enable Entrance Exams for this "
 "course setting to take effect."
 msgstr ""
+"קבע אחוז ציוני מינימלי לבחינת כניסה, לפני שסטודנטים יוכלו לצפות בתוכן הקורס."
+" שים לב, יש לאפשר מבחני כניסה על מנת שהגדרה זו תיכנס לתוקף.  "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Entrance Exam ID"
@@ -2983,6 +3007,10 @@ msgid ""
 "sites can link to. URLs must be fully qualified. For example: "
 "http://www.edx.org/course/Introduction-to-MOOCs-ITM001"
 msgstr ""
+"אם בלוח הבקרה מופעלות כתובות ה-URL של שיתוף חברתי וקורס מותאם אישית, "
+"באפשרותך לספק כתובת אתר (כגון כתובת אתר לעמוד 'אודות הקורס') על מנת שאתרי "
+"מדיה חברתית יוכלו לקשר אליה. על כתובות האתר להיות מוסמכות לחלוטין. לדוגמה: "
+"http://www.edx.org/course/Introduction-to-MOOCs-ITM001"
 
 #: common/lib/xmodule/xmodule/course_module.py cms/templates/settings.html
 msgid "Course Language"
@@ -3024,6 +3052,8 @@ msgid ""
 "your course. Note that enabling proctored exams will also enable timed "
 "exams."
 msgstr ""
+"הזן כן או לא. אם הערך הוא כן, מבחנים תחת פיקוח מאופשרים בקורס שלך. שים לב "
+"שאיפשור מבחנים תחת פיקוח יאפשר גם מבחנים מתוזמנים."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Create Zendesk Tickets For Suspicious Proctored Exam Attempts"
@@ -3043,7 +3073,7 @@ msgstr "אפשר מבחנים מתוזמנים"
 msgid ""
 "Enter true or false. If this value is true, timed exams are enabled in your "
 "course."
-msgstr ""
+msgstr "הזן כן או לא. אם הערך הוא כן, מבחנים מתוזמנים מאופשרים בקורס שלך."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Minimum Grade for Credit"
@@ -3069,6 +3099,8 @@ msgid ""
 "do not have due dates for assignments, and students can progress through the"
 " course at any rate before the course ends."
 msgstr ""
+"הגדר זאת ל\"כן\" כדי לסמן את הקורס כקצב אישי. בקורסים בקצב אישי אין תאריכי "
+"יעד למטלות והסטודנטים יכולים להתקדם בקורס בכל קצב לפני סיום הקורס."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Bypass Course Home"
@@ -3091,16 +3123,8 @@ msgid ""
 "Enter true or false. If this value is true, you can hide a subsection until "
 "learners earn a minimum score in another, prerequisite subsection."
 msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr "הפעלת ציוני תת הפרק נשמרה"
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
+"הזן כן או לא. אם הערך הוא 'כן', באפשרותך להסתיר תת-פרק עד שהלומדים יזכו "
+"בציון מינימלי בתת-פרק אחר בעל דרישה מוקדמת."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
@@ -3130,6 +3154,9 @@ msgid ""
 "requirements, such as testing, accessibility, internationalization, and "
 "documentation."
 msgstr ""
+"הזן כן או לא. אם כן, תוכל להוסיף בעיות וכלים לא נתמכים לקורס שלך בסטודיו. "
+"בעיות וכלים לא נתמכים אינם מומלצים לשימוש בקורסים בשל אי ציות לאחת או יותר "
+"מהדרישות הבסיסיות, כגון בחינה, נגישות, אינטרנציונליזציה ותיעוד."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
@@ -3240,7 +3267,7 @@ msgstr ""
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Email for 'Instructor' Annotations"
-msgstr "דוא\"ל עבור הסברי 'מדריך'"
+msgstr "דואר אלקטרוני עבור הסברי 'מדריך'"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
@@ -3404,7 +3431,7 @@ msgid ""
 "Enter the name that students see for this component.  Analytics reports may "
 "also use the display name to identify this component."
 msgstr ""
-"הזן את השם שרואים הסטודנטים עבור רכיב זה. ניתן להשתמש בשם התצוגה כדי לזהות "
+"הזן את השם שרואים הסטודנטים עבור רכיב זה. ניתן להשתמש בשם קמפוס כדי לזהות "
 "מרכיב זה בדוחות אנליטיקס. "
 
 #: common/lib/xmodule/xmodule/lti_module.py
@@ -3433,7 +3460,7 @@ msgid ""
 "{docs_anchor_open}the edX LTI documentation{anchor_close} for more details "
 "on this setting."
 msgstr ""
-"הזן את כתובת האתר של הכלי החיצוני שרכיב זה מפעיל. הגדרה זו משמשת רק כאשר "
+"הזן את כתובת ה-URL של הכלי החיצוני שרכיב זה מפעיל. הגדרה זו משמשת רק כאשר "
 "'הסתרת כלי חיצוני' מוגדר ל'לא'.<br />ראה {docs_anchor_open}תיעוד ה-LTI של "
 "edX{anchor_close} לקבלת פרטים נוספים על הגדרה זו."
 
@@ -3506,7 +3533,7 @@ msgid ""
 "setting hides the Launch button and any IFrames for this component."
 msgstr ""
 "בחר 'כן' אם ברצונך להשתמש ברכיב זה כמראה מקום לסנכרון עם מערכת דירוג חיצונית"
-" מאשר להפעיל כלי חיצוני.  הגדרה זו מסתירה את לחצן ההפעלה וכל IFrame שברכיב "
+" במקום להפעיל כלי חיצוני.  הגדרה זו מסתירה את לחצן ההפעלה וכל IFrame שברכיב "
 "זה."
 
 #: common/lib/xmodule/xmodule/lti_module.py
@@ -3545,7 +3572,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Button Text"
-msgstr "טקסט הלחצן"
+msgstr "טקסט שעל הלחצן"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -3566,7 +3593,7 @@ msgid ""
 "Could not parse custom parameter: {custom_parameter}. Should be \"x=y\" "
 "string."
 msgstr ""
-"לא ניתן לפצל משתנה מותאם אישית: {custom_parameter}. צריכה להיות מחרוזת "
+"לא ניתן לנתח משתנה מותאם אישית: {custom_parameter}. צריכה להיות מחרוזת "
 "\"x=y\"."
 
 #: common/lib/xmodule/xmodule/lti_module.py
@@ -3574,7 +3601,7 @@ msgid ""
 "Could not parse LTI passport: {lti_passport}. Should be \"id:key:secret\" "
 "string."
 msgstr ""
-"לא ניתן לפצל סיסמת LTI: {lti_passport}. צריכה להיות מחרוזת "
+"לא ניתן לנתח LTI passport: {lti_passport}. צריכה להיות מחרוזת "
 "\"id:key:secret\"."
 
 #: common/lib/xmodule/xmodule/mixin.py
@@ -3584,7 +3611,7 @@ msgstr "רישיון"
 #: common/lib/xmodule/xmodule/mixin.py
 msgid ""
 "A license defines how the contents of this block can be shared and reused."
-msgstr "רישיון מגדיר כיצד ניתן לשתף ולעשות שימוש חוזר בתוכן של חוסם זה."
+msgstr "רישיון מגדיר כיצד ניתן לשתף ולעשות שימוש חוזר בתוכן של בלוק זה."
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 #: common/lib/xmodule/xmodule/seq_module.py lms/templates/ccx/schedule.html
@@ -3663,7 +3690,7 @@ msgid ""
 "\"never\", and \"per_student\"."
 msgstr ""
 "ציין את ברירת המחדל עבור מספר הפעמים שערכים משתנים בבעיה מוצגים אקראית. "
-"הגדרה זו צריכה להיות מוגדרת ל-\"never\" אלא אם כן הינך מתכנן לספק תסריט "
+"הגדרה זו צריכה להיות מוגדרת ל-\"never\" אלא אם כן הנך מתכנן לספק תסריט "
 "Python כדי לזהות ערכים אקראיים ברוב הבעיות שבקורס שלך. ערכים חוקיים הם "
 "\"always\", \"onreset\", \"never\", and \"per_student\"."
 
@@ -3734,7 +3761,7 @@ msgid ""
 "obtain a key for your course, or to report an issue, please contact "
 "moocsupport@mathworks.com"
 msgstr ""
-"הזן את מפתח ה-API שסופק על ידי MathWorks על מנת לגשת לשירות המתארח של "
+"הזן את מפתח ה-API שסופק על ידי MathWorks על מנת לגשת לשירות המאוחסן של "
 "MATLAB. מפתח זה ניתן לשימוש בלעדי בקורס זה לפרק הזמן שצוין. אל תשתף את מפתח "
 "ה-API עם קורסים אחרים. הודע מיד ל-MathWorks אם הנך סבור כי המפתח נחשף או "
 "שנעשה בו שימוש לרעה. כדי להשיג מפתח עבור הקורס שלך או כדי לדווח על בעיה, צור"
@@ -3754,12 +3781,13 @@ msgstr "הזן את ההגדרות ששולטות בדרך בה סטודנטים
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Enable video caching system"
-msgstr "אפשר מערכת מטמון וידאו"
+msgstr "אפשר אחסון מטמון וידאו"
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
 "Enter true or false. If true, video caching will be used for HTML5 videos."
-msgstr "הזן כן או לא. כאשר כן, יעשה שימוש במטמון וידאו עבור וידאו של HTML5."
+msgstr ""
+"הזן כן או לא. אם כן, יתבצע אחסון במטמון וידאו עבור סרטוני וידאו של HTML5."
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Video Pre-Roll"
@@ -3787,7 +3815,7 @@ msgid ""
 "settings. All existing problems are affected when this course-wide setting "
 "is changed."
 msgstr ""
-"הזן כן או לא. אם כן, בעיות בברירת המחדל של הקורס יציגו תמיד כפתור 'אתחל'. "
+"הזן כן או לא. אם כן, בעיות בברירת המחדל של הקורס יציגו תמיד לחצן 'אתחל'. "
 "ניתן לעקוף הגדרה זו בכל הגדרה של בעיה. כל הבעיות הקיימות בקורס מושפעות כאשר "
 "משתנה הגדרה כלל קורסית זו."
 
@@ -3817,7 +3845,7 @@ msgid ""
 "Enter true or false. If true, answer submissions for problem modules will be"
 " considered in the Entrance Exam scoring/gating algorithm."
 msgstr ""
-"הזן כן או לא. אם כן, תשובות ההגשה עבור מודUלי הבעיות יילקחו בחשבון במסגרת "
+"הזן כן או לא. אם כן, תשובות ההגשה עבור מודולי הבעיות יילקחו בחשבון במסגרת "
 "דירוג מבחן הכניסה/אלגוריתם הכניסה. "
 
 #: common/lib/xmodule/xmodule/seq_module.py
@@ -4054,7 +4082,7 @@ msgid ""
 "Can't receive transcripts from Youtube for {youtube_id}. Status code: "
 "{status_code}."
 msgstr ""
-"לא ניתן לקבל תעתיקים מ-Youtube עבור {youtube_id}. קוד סטטוס: {status_code}."
+"לא ניתן לקבל תעתיקים מיוטיוב עבור {youtube_id}. קוד סטטוס: {status_code}."
 
 #: common/lib/xmodule/xmodule/video_module/transcripts_utils.py
 msgid "We support only SubRip (*.srt) transcripts format."
@@ -4090,12 +4118,12 @@ msgid ""
 "The URL for your video. This can be a YouTube URL or a link to an .mp4, "
 ".ogg, or .webm video file hosted elsewhere on the Internet."
 msgstr ""
-"כתובת ה- URL של סרטונך. זו יכולה להיות כתובת URL ב- YouTube או קישור לקובץ "
-"mp4 , .ogg. או webm. המתארחים במקום אחר באינטרנט.  "
+"כתובת ה-URL של סרטונך. זו יכולה להיות כתובת URL ביוטיוב או קישור לקובץ mp4 ,"
+" .ogg. או webm. המתארחים במקום אחר באינטרנט.  "
 
 #: common/lib/xmodule/xmodule/video_module/video_module.py
 msgid "Default Video URL"
-msgstr "כתובת ברירת מחדל לווידאו"
+msgstr "כתובת URL כברירת מחדל לסרטון וידאו"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid ""
@@ -4110,48 +4138,46 @@ msgstr "שם תצורה לרכיב"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Current position in the video."
-msgstr "מיקום נוכחי בווידאו"
+msgstr "מיקום נוכחי בסרטון הווידאו"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid ""
 "Optional, for older browsers: the YouTube ID for the normal speed video."
 msgstr ""
-"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה YouTube לסרטונים בעלי מהירות "
-"רגילה."
+"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה יוטיוב לסרטונים בעלי מהירות רגילה."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "YouTube ID"
-msgstr "מזהה YouTube "
+msgstr "מזהה יוטיוב"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Optional, for older browsers: the YouTube ID for the .75x speed video."
 msgstr ""
-"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה YouTube לסרטונים בעלי מהירות ‎.75x"
+"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה יוטיוב לסרטונים בעלי מהירות ‎.75x"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "YouTube ID for .75x speed"
-msgstr "מזהה YouTube למהירות של ‎.75x"
+msgstr "מזהה יוטיוב למהירות של ‎.75x"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid ""
 "Optional, for older browsers: the YouTube ID for the 1.25x speed video."
 msgstr ""
-"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה YouTube לסרטונים בעלי מהירות "
+"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה יוטיוב לסרטונים בעלי מהירות "
 "‎1.25x."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "YouTube ID for 1.25x speed"
-msgstr "מזהה YouTube למהירות של ‎1.25x"
+msgstr "מזהה יוטיוב למהירות של ‎1.25x"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Optional, for older browsers: the YouTube ID for the 1.5x speed video."
 msgstr ""
-"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה YouTube לסרטונים בעלי מהירות "
-"‎1.5x."
+"זוהי אפשרות עבור דפדפנים ישנים יותר: מזהה יוטיוב לסרטונים בעלי מהירות ‎1.5x."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "YouTube ID for 1.5x speed"
-msgstr "מזהה YouTube למהירות של ‎1.5x"
+msgstr "מזהה יוטיוב למהירות של ‎1.5x"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid ""
@@ -4196,8 +4222,8 @@ msgid ""
 "must add at least one non-YouTube URL in the Video File URLs field."
 msgstr ""
 "אפשר לסטודנטים להוריד גרסאות של סרטון וידאו זה בפורמטים שונים במידה ואינם "
-"יכולים להשתמש בנגן וידאו של edX או שאין להם גישה ל-YouTube. עלייך להוסיף "
-"לפחות כתובת URL אחת שאיננה כתובת של YouTube בשדה \"כתובות URL לקבצי וידאו\"."
+"יכולים להשתמש בנגן וידאו של edX או שאין להם גישה ליוטיוב. עלייך להוסיף לפחות"
+" כתובת URL אחת שאיננה כתובת של יוטיוב בשדה \"כתובות URL לקבצי וידאו\"."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Video Download Allowed"
@@ -4212,16 +4238,16 @@ msgid ""
 "the student's computer. To allow students to download these videos, set "
 "Video Download Allowed to True."
 msgstr ""
-"כתובת האתר או כתובות האתרים שבהם פרסמת גרסאות של סרטון הווידאו שאינן "
-"YouTube. כל כתובת אתר חייבת להסתיים בסיומת ‎.mpeg‏, ‎.mp4‏, ‎.ogg‏ או "
-"‎.webm‏ ואינה יכולה להיות כתובת אתר של YouTube. (עבור תאימות דפדפן, אנו "
-"ממליצים בחום על פורמט ‎.mp4 ו-‎.webm) הסטודנטים יוכלו להציג את סרטון הווידאו"
-" הראשון שברשימה והתואם למחשב הסטודנט. כדי לאפשר לסטודנטים להוריד את סרטוני "
-"הווידאו הללו, הגדר את 'הורדת סרטון וידאו מותרת' ל'כן'."
+"כתובת ה-URL או כתובות האתרים שבהם פרסמת גרסאות של סרטון הווידאו שאינן "
+"יוטיוב. כל כתובת אתר חייבת להסתיים בסיומת ‎.mpeg‏, ‎.mp4‏, ‎.ogg‏ או ‎.webm‏"
+" ואינה יכולה להיות כתובת אתר של יוטיוב. (עבור תאימות דפדפן, אנו ממליצים בחום"
+" על פורמט ‎.mp4 ו-‎.webm) הסטודנטים יוכלו להציג את סרטון הווידאו הראשון "
+"שברשימה והתואם למחשב הסטודנט. כדי לאפשר לסטודנטים להוריד את סרטוני הווידאו "
+"הללו, הגדר את 'הורדת סרטון וידאו מותרת' ל'כן'."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Video File URLs"
-msgstr "כתובות URL לקבצי וידיאו "
+msgstr "כתובות URL לקבצי וידאו "
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid ""
@@ -4237,12 +4263,12 @@ msgstr ""
 "תמליל בפורמטים  srt. או txt. אם ברצונך לספק תמליל הניתן להורדה בפורמט שונה, "
 "אנו ממליצים להעלות את התמליל באמצעות שדה 'העלה דף מידע'. אם אין זה אפשרי, יש"
 " באפשרותך לכתוב קובץ תמליל בעמוד 'הקבצים והעלאות' או באינטרנט, ולאחר מכן "
-"להוסיף את כתובת האתר לתמליל שכאן. סטודנטים יראו את קישור להורדת תמליל הנמצא "
-"בתחתית סרטון הווידאו."
+"להוסיף את כתובת ה-URL לתמליל שכאן. סטודנטים יראו את קישור להורדת תמליל הנמצא"
+" בתחתית סרטון הווידאו."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Downloadable Transcript URL"
-msgstr "כתובת תמליל הניתן להורדה"
+msgstr "כתובת URL תמליל הניתן להורדה"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid ""
@@ -4324,7 +4350,7 @@ msgstr "מהירות ברירת המחדל עבור סרטו הווידאו."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Specify whether YouTube is available for the user."
-msgstr "ציין אם YouTube זמין למשתמש."
+msgstr "ציין אם יוטיוב זמין למשתמש."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid ""
@@ -4359,13 +4385,13 @@ msgid ""
 "this field."
 msgstr ""
 "אם edX הקצתה בעבורך מזהה וידאו כדי להפעילו ברכיב זה, הזן את המזהה כאן. במקרה"
-" כזה, אל תזין ערכים בשדות 'כתובת האתר של סרטון הווידאו המשמש כברירת מחדל', "
-"'כתובות אתרי קובץ הווידאו' וב'מזהה YouTube'. אם לא הוקצה בעבורך מזהה וידאו, "
+" כזה, אל תזין ערכים בשדות 'כתובת ה-URL של סרטון הווידאו המשמש כברירת מחדל', "
+"'כתובות URL קובץ הווידאו' וב'מזהה יוטיוב'. אם לא הוקצה בעבורך מזהה וידאו, "
 "הזן ערכים בשדות האחרים והתעלם משדה זה."
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Date of the last view of the bumper"
-msgstr "תאריך הצפייה האחרונה בבאמפר"
+msgstr "תאריך הצפיה האחרונה בבאמפר"
 
 #: common/lib/xmodule/xmodule/video_module/video_xfields.py
 msgid "Do not show bumper again"
@@ -4385,15 +4411,15 @@ msgstr "כתובת URL של מקור"
 
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Poster Image URL"
-msgstr "כתובת URL של תמונת מקור"
+msgstr "כתובת URL של פוסטר"
 
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Poster URL"
-msgstr ""
+msgstr "כתובת URL של פוסטר"
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "The label for this word cloud on the course page."
-msgstr "התווית לענן מילים זה בעמוד הקורס."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 #: lms/templates/annotatable.html lms/templates/imageannotation.html
@@ -4408,8 +4434,6 @@ msgid ""
 "Clear instructions are important, especially for learners who have "
 "accessibility requirements."
 msgstr ""
-"הוסף הוראות על מנת לעזור ללומדים להבין כיצד להשתמש בענן המילים. הוראות "
-"ברורות הן חשובות, במיוחד עבור לומדים בעלי דרישות נגישוּת. "
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "Inputs"
@@ -4418,7 +4442,7 @@ msgstr "הכנסת נתונים"
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid ""
 "The number of text boxes available for learners to add words and sentences."
-msgstr "מספר תיבות הטקסט הזמינות עבור לומדים להוספת מילים ומשפטים."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "Maximum Words"
@@ -4426,7 +4450,7 @@ msgstr "מספר מילים מרבי"
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "The maximum number of words displayed in the generated word cloud."
-msgstr "מספר המילים המרבי המוצג בענן מחולל המילים."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "Show Percents"
@@ -4438,7 +4462,7 @@ msgstr "נתוני סטטיסטיקה, המוצגים עבור מילים, מו
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "Whether this learner has posted words to the cloud."
-msgstr "האם העלה הלומד מילים לענן."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "Student answer."
@@ -4446,7 +4470,7 @@ msgstr "תשובת הסטודנט."
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "All possible words from all learners."
-msgstr "כל המילים האפשריות מכל הלומדים."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "Top num_top_words words for word cloud."
@@ -4660,7 +4684,7 @@ msgid ""
 "You cannot create a CCX from a course using a deprecated id. Please create a"
 " rerun of this course in the studio to allow this action."
 msgstr ""
-"לא ניתן ליצור CCX מקורס באמצעות מזהה מיושן. צור שידור חוזר של קורס זה "
+"לא ניתן ליצור CCX מקורס באמצעות מזהה מיושן. צור הרצה חוזרת של קורס זה "
 "ב-Studio על מנת לאפשר פעולה זו."
 
 #: lms/djangoapps/certificates/models.py wiki/admin.py wiki/models/article.py
@@ -5096,18 +5120,18 @@ msgstr "הקורס {course_id} אינו קיים."
 
 #: lms/djangoapps/commerce/models.py
 msgid "Use the checkout page hosted by the E-Commerce service."
-msgstr "השתמש בעמוד היציאה המתארח בשירות מסחר אלקטרוני."
+msgstr "השתמש בעמוד היציאה המאוחסן בשירות מסחר אלקטרוני."
 
 #: lms/djangoapps/commerce/models.py
 msgid "Path to single course checkout page hosted by the E-Commerce service."
-msgstr "נתיב לקורס יחיד בעמוד היציאה המתארח בשירות מסחר אלקטרוני."
+msgstr "נתיב לקורס יחיד בעמוד היציאה המאוחסן בשירות מסחר אלקטרוני."
 
 #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py
 #: openedx/core/djangoapps/credentials/models.py
 #: openedx/core/djangoapps/credit/models.py
 #: openedx/core/djangoapps/programs/models.py
 msgid "Cache Time To Live"
-msgstr ""
+msgstr "זמן חיים למטמון"
 
 #: lms/djangoapps/commerce/models.py
 #: openedx/core/djangoapps/credentials/models.py
@@ -5118,10 +5142,6 @@ msgid ""
 " 0."
 msgstr "מצוין בשניות. אפשר אחסון במטמון על ידי הגדרת הערך לגדול מ-0."
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr "נתיב לעמוד הקבלה להזמנה."
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -5725,7 +5745,7 @@ msgstr "התקבלו נתונים שגויים מממשק ה-API של הרשימ
 
 #: lms/djangoapps/edxnotes/helpers.py
 msgid "No endpoint was provided for EdxNotes."
-msgstr ""
+msgstr "לא סופקה נקודת קצה עבור EdxNotes."
 
 #: lms/djangoapps/edxnotes/plugins.py lms/templates/edxnotes/edxnotes.html
 msgid "Notes"
@@ -5762,7 +5782,7 @@ msgstr "תבנית Sailthru לשימוש בתזכורת לעגלה שנשכחה.
 #: lms/djangoapps/email_marketing/models.py
 msgid ""
 "Sailthru minutes to wait before sending abandoned cart message. Deprecated."
-msgstr "דקות Sailthru להמתנה לפני שליחת הודעה על עגלה שנשכחה. מיושן."
+msgstr "דקות Sailthru להמתנה לפני שליחת הודעה על עגלת קניות שנשכחה. מיושן."
 
 #: lms/djangoapps/email_marketing/models.py
 msgid "Sailthru send template to use on enrolling for audit. "
@@ -5849,7 +5869,7 @@ msgstr "משתמש אינו קיים."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Task is already running."
-msgstr "המשימה פועלת כבר."
+msgstr "המשימה רצה כבר."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
@@ -5908,8 +5928,7 @@ msgid ""
 "The problem responses report is being created. To view the status of the "
 "report, see Pending Tasks below."
 msgstr ""
-"דוח התשובות לבעיה נוצר כעת. כדי להציג את סטטוס הדוח, ראה 'משימות בהמתנה' "
-"להלן."
+"דוח התשובות לבעיה נוצר כעת. כדי להציג את מצב הדוח, ראה 'משימות בהמתנה' להלן."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
@@ -6053,7 +6072,7 @@ msgid ""
 "The enrolled learner profile report is being created. To view the status of "
 "the report, see Pending Tasks below."
 msgstr ""
-"דוח פרופיל הלומד שנרשם נוצר. כדי להציג את סטטוס הדוח, ראה 'משימות בהמתנה' "
+"דוח פרופיל הלומד שנרשם נוצר. כדי להציג את מצב הדוח, ראה 'משימות בהמתנה' "
 "להלן."
 
 #: lms/djangoapps/instructor/views/api.py
@@ -6062,7 +6081,7 @@ msgid ""
 " report, see Pending Tasks below. You will be able to download the report "
 "when it is complete."
 msgstr ""
-"דוח הרשמה זה נוצר כרגע. כדי להציג את סטטוס הדוח, ראה 'משימות בהמתנה' להלן. "
+"דוח הרשמה זה נוצר כרגע. כדי להציג את מצב הדוח, ראה 'משימות בהמתנה' להלן. "
 "לאחר השלמתו, תוכל להוריד את הדוח."
 
 #: lms/djangoapps/instructor/views/api.py
@@ -6072,11 +6091,11 @@ msgid ""
 "report, see Pending Tasks below."
 msgstr ""
 "דוח ההרשמה נוצר. דוח זה כולל מידע על לומדים היכולים להירשם לקורס. כדי להציג "
-"את סטטוס הדוח, ראה 'משימות בהמתנה' להלן."
+"את מצב הדוח, ראה 'משימות בהמתנה' להלן."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "The file must contain a 'cohort' column containing cohort names."
-msgstr ""
+msgstr "על הקובץ להכיל טור 'קבוצת לימוד' המכיל את שמות קבוצות הלימוד."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "The file must contain a 'username' column, an 'email' column, or both."
@@ -6133,7 +6152,7 @@ msgid ""
 "The detailed enrollment report is being created. To view the status of the "
 "report, see Pending Tasks below."
 msgstr ""
-"דוח ההרשמה המפורט נוצר כעת. על מנת להציג את סטטוס הדוח, ראה 'משימות בהמתנה' "
+"דוח ההרשמה המפורט נוצר כעת. על מנת להציג את מצב הדוח, ראה 'משימות בהמתנה' "
 "להלן."
 
 #: lms/djangoapps/instructor/views/api.py
@@ -6142,7 +6161,7 @@ msgid ""
 "report, see Pending Tasks below. You will be able to download the report "
 "when it is complete."
 msgstr ""
-"דוח ההרשמה המפורט נוצר כעת. על מנת להציג את סטטוס הדוח, ראה 'משימות בהמתנה' "
+"דוח ההרשמה המפורט נוצר כעת. על מנת להציג את מצב הדוח, ראה 'משימות בהמתנה' "
 "להלן. לאחר השלמתו, תוכל להוריד את הדוח."
 
 #: lms/djangoapps/instructor/views/api.py
@@ -6150,7 +6169,7 @@ msgid ""
 "The executive summary report is being created. To view the status of the "
 "report, see Pending Tasks below."
 msgstr ""
-"דוח תקציר המנהלים נוצר כעת. על מנת להציג את סטטוס הדוח, ראה 'משימות בהמתנה' "
+"דוח תקציר המנהלים נוצר כעת. על מנת להציג את מצב הדוח, ראה 'משימות בהמתנה' "
 "להלן."
 
 #: lms/djangoapps/instructor/views/api.py
@@ -6159,7 +6178,7 @@ msgid ""
 "of the report, see Pending Tasks below. You will be able to download the "
 "report when it is complete."
 msgstr ""
-"דוח תקציר המנהלים נוצר כעת. על מנת להציג את סטטוס הדוח, ראה 'משימות בהמתנה' "
+"דוח תקציר המנהלים נוצר כעת. על מנת להציג את מצב הדוח, ראה 'משימות בהמתנה' "
 "להלן. לאחר השלמתו, תוכל להוריד את הדוח."
 
 #: lms/djangoapps/instructor/views/api.py
@@ -6167,7 +6186,7 @@ msgid ""
 "The survey report is being created. To view the status of the report, see "
 "Pending Tasks below."
 msgstr ""
-"דוח הסקר נוצר כעת. על מנת להציג את סטטוס הדוח, ראה 'משימות בהמתנה' להלן."
+"דוח הסקר נוצר כעת. על מנת להציג את מצב הדוח, ראה 'משימות בהמתנה' להלן."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
@@ -6175,15 +6194,15 @@ msgid ""
 "report, see Pending Tasks below. You will be able to download the report "
 "when it is complete."
 msgstr ""
-"דוח הסקר נוצר כעת. על מנת להציג את סטטוס הדוח, ראה 'משימות בהמתנה' להלן. "
-"לאחר השלמתו, תוכל להוריד את הדוח."
+"דוח הסקר נוצר כעת. על מנת להציג את מצב הדוח, ראה 'משימות בהמתנה' להלן. לאחר "
+"השלמתו, תוכל להוריד את הדוח."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
 "The proctored exam results report is being created. To view the status of "
 "the report, see Pending Tasks below."
 msgstr ""
-"דוח תוצאות מבחן תחת פיקוח נוצר. על מנת להציג את סטטוס הדוח, ראה 'משימות "
+"דוח תוצאות מבחן תחת פיקוח נוצר. על מנת להציג את מצב הדוח, ראה 'משימות "
 "בהמתנה' להלן."
 
 #: lms/djangoapps/instructor/views/api.py
@@ -6192,12 +6211,12 @@ msgid ""
 "status of the report, see Pending Tasks below. You will be able to download "
 "the report when it is complete."
 msgstr ""
-"דוח תוצאות מבחן תחת פיקוח נוצר כעת. על מנת להציג את סטטוס הדוח, ראה 'משימות "
+"דוח תוצאות מבחן תחת פיקוח נוצר כעת. על מנת להציג את מצב הדוח, ראה 'משימות "
 "בהמתנה' להלן. לאחר השלמתו, תוכל להוריד את הדוח."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Could not parse amount as a decimal"
-msgstr "לא ניתן היה לנסח מספר עשרוני"
+msgstr "לא ניתן היה לנתח מספר עשרוני"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Unable to generate redeem codes because of course misconfiguration."
@@ -6420,8 +6439,8 @@ 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/djangoapps/instructor/views/api.py
 msgid ""
@@ -6491,7 +6510,7 @@ msgid ""
 "To gain insights into student enrollment and participation {link_start}visit"
 " {analytics_dashboard_name}, our new course analytics product{link_end}."
 msgstr ""
-"בכדי לקבל תובנות אודות רישום והשתתפות סטודנטים {link_start}בקר "
+"על מנת לקבל תובנות אודות רישום והשתתפות סטודנטים {link_start}בקר "
 "ב{analytics_dashboard_name}, מוצר הניתוח המידע של הקורס{link_end}."
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -6514,7 +6533,7 @@ msgstr "אנא הזן את הערך המספרי של מחיר הקורס "
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "CourseMode with the mode slug({mode_slug}) DoesNotExist"
-msgstr "מצב קורס כאשר שורת-הסדר ({mode_slug}) אינה קיימת"
+msgstr "מצב קורס כאשר הסלאג ({mode_slug}) אינו קיים"
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "CourseMode price updated successfully"
@@ -6555,7 +6574,7 @@ msgstr "הורדת מידע"
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "Analytics"
-msgstr ""
+msgstr "אנליטיקס"
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "Metrics"
@@ -6613,7 +6632,7 @@ msgstr "לא ניתן לאתר סטודנט התואם למזהה: {student_iden
 
 #: lms/djangoapps/instructor/views/tools.py
 msgid "Unable to parse date: "
-msgstr "לא ניתן לנסח תאריך:"
+msgstr "לא ניתן לנתח תאריך:"
 
 #: lms/djangoapps/instructor/views/tools.py
 msgid "Couldn't find module for url: {0}"
@@ -6660,7 +6679,7 @@ msgstr "לא כל הבעיות בכניסה לבחינה תומכות באפשר
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
 msgid "rescored"
-msgstr ""
+msgstr "תן ציון מחדש"
 
 #. Translators: This is a past-tense verb that is inserted into task progress
 #. messages as {action}.
@@ -6762,7 +6781,7 @@ msgstr "מקור הרשמה"
 
 #: lms/djangoapps/instructor_task/tasks_helper.py
 msgid "Manual (Un)Enrollment Reason"
-msgstr ""
+msgstr "סיבה ל(אי)רישום ידני"
 
 #: lms/djangoapps/instructor_task/tasks_helper.py
 msgid "Enrollment Role"
@@ -6802,11 +6821,11 @@ msgstr "לא נמצא מידע task_output עבור instructor_task {0}"
 
 #: lms/djangoapps/instructor_task/views.py
 msgid "No parsable task_output information found for instructor_task {0}: {1}"
-msgstr ""
+msgstr "לא נמצא מידע הניתן לפיצול task_output עבור instructor_task {0}: {1}"
 
 #: lms/djangoapps/instructor_task/views.py
 msgid "No parsable status information available"
-msgstr ""
+msgstr "אין מידע סטטוס הניתן לפיצול זמין"
 
 #: lms/djangoapps/instructor_task/views.py
 msgid "No message provided"
@@ -6953,6 +6972,11 @@ msgid ""
 "\"accordion\" -- to use the accordion only; or \n"
 "\"tabs,accordion\" -- to use tabs and the accordion."
 msgstr ""
+"הזן את דפדפן ה-hrome, או את כלי הניווט על מנת להשתמש בהם עבור XBlock ב-LMS. ערכים חוקיים הם: \n"
+"\"chromeless\" -- על מנת לא להשתמש בכרטיסיות או באקורדיון; \n"
+"\"tabs\" -- לשימוש בכרטיסיות בלבד; \n"
+"\"accordion\" -- לשימוש באקורדיון בלבד; או \n"
+"\"tabs,accordion\" -- לשימוש בכרטיסיות ובאקורדיון."
 
 #: lms/djangoapps/lms_xblock/mixin.py
 msgid "Default Tab"
@@ -7012,7 +7036,7 @@ msgstr "קודי אישור ורישום עבור הקורסים הבאים: {co
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Trying to add a different currency into the cart"
-msgstr "מנסה להוסיף מטבע זר אחר לסל"
+msgstr "מנסה להוסיף מטבע זר אחר לעגלת הקניות"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Internal reference code for this invoice."
@@ -7050,53 +7074,57 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "The number of items sold."
-msgstr ""
+msgstr "מספר הפריטים שנמכרו."
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "The price per item sold, including discounts."
-msgstr ""
+msgstr "המחיר לפריט שנמכר, כולל הנחות"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Registration for Course: {course_name}"
-msgstr ""
+msgstr "רישום לקורס: {course_name}"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid ""
 "Please visit your {link_start}dashboard{link_end} to see your new course."
-msgstr ""
+msgstr "בקר ב{link_start}לוח הבקרה{link_end} על מנת לראות את הקורס החדש שלך."
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Enrollment codes for Course: {course_name}"
-msgstr ""
+msgstr "קודי הרשמה עבור קורס: {course_name}"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Mode {mode} does not exist for {course_id}"
-msgstr ""
+msgstr "המצב {mode} אינו קיים עבור {course_id}"
 
 #. Translators: In this particular case, mode_name refers to a
 #. particular mode (i.e. Honor Code Certificate, Verified Certificate, etc)
 #. by which a user could enroll in the given course.
 #: lms/djangoapps/shoppingcart/models.py
 msgid "{mode_name} for course {course}"
-msgstr ""
+msgstr "{mode_name} עבור קורס {course}"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid ""
 "You can unenroll in the course and receive a full refund for 14 days after "
 "the course start date. "
 msgstr ""
+"באפשרות לבטל הרשמה בקורס ולקבל החזר כספי מלא במשך 14 יום לאחר תאריך תחילת "
+"הקורס. "
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid ""
 "If you haven't verified your identity yet, please start the verification "
 "process ({verification_url})."
-msgstr ""
+msgstr "אם טרם אימתת את זהותך, אנא התחל בתהליך האימות ({verification_url})."
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid ""
 "You can unenroll in the course and receive a full refund for 2 days after "
 "the course start date. "
 msgstr ""
+"באפשרותך לבטל הרשמה בקורס ולקבל החזר כספי מלא במשך יומיים לאחר תאריך תחילת "
+"הקורס. "
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid ""
@@ -7104,6 +7132,8 @@ msgid ""
 " include your order number in your email. Please do NOT include your credit "
 "card information."
 msgstr ""
+"{refund_reminder_msg}כדי לקבל החזר כספי, צור קשר עם {billing_email}. כלול את"
+" מספר הזמנתך בהודעת הדואר האלקטרוני. אל תכלול את פרטי כרטיס האשראי שלך."
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid ""
@@ -7112,60 +7142,68 @@ msgid ""
 "contributions for tax purposes.  We confirm that neither goods nor services "
 "were provided in exchange for this gift."
 msgstr ""
+"אנו מעריכים את התרומה הנדיבה הזו ואת תמיכתך במשימת {platform_name}. קבלה זו "
+"הוכנה כדי לתמוך במיזמי צדקה למטרות מס. אנו מאשרים שלא סופקו טובין או שירותים"
+" בתמורה למתנה זו."
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Could not find a course with the ID '{course_id}'"
-msgstr ""
+msgstr "לא ניתן למצוא קורס עם המזהה '{course_id}'"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Donation for {course}"
-msgstr ""
+msgstr "תרומה לקורס {course}"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Donation for {platform_name}"
-msgstr ""
+msgstr "תרומה עבור {platform_name}"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "Page {page_number} of {page_count}"
-msgstr ""
+msgstr "עמוד {page_number} מתוך {page_count}"
 
-#: lms/templates/shoppingcart/receipt.html
+#: lms/djangoapps/shoppingcart/pdf.py lms/templates/shoppingcart/receipt.html
 msgid "Invoice"
 msgstr "חשבונית"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "Order"
-msgstr ""
+msgstr "סדר"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "{id_label} # {item_id}"
-msgstr ""
+msgstr "{id_label} # {item_id}"
 
+#: lms/djangoapps/shoppingcart/pdf.py
 #: lms/templates/emails/registration_codes_sale_invoice_attachment.txt
 msgid "Date: {date}"
 msgstr "תאריך: {date}"
 
 #: lms/djangoapps/shoppingcart/pdf.py lms/djangoapps/shoppingcart/reports.py
 msgid "Quantity"
-msgstr ""
+msgstr "כמות"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid ""
 "List Price\n"
 "per item"
 msgstr ""
+"מחיר מחירון\n"
+"לפריט"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid ""
 "Discount\n"
 "per item"
 msgstr ""
+"הנחה\n"
+"לפריט"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "Amount"
-msgstr ""
+msgstr "כמות"
 
-#: lms/templates/courseware/gradebook.html
+#: lms/djangoapps/shoppingcart/pdf.py lms/templates/courseware/gradebook.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 #: lms/templates/shoppingcart/billing_details.html
 #: lms/templates/shoppingcart/receipt.html
@@ -7174,43 +7212,43 @@ msgstr "סה\"כ"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "Payment Received"
-msgstr ""
+msgstr "תשלום התקבל"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "Balance"
-msgstr ""
+msgstr "מאזן"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "Billing Address"
-msgstr ""
+msgstr "כתובת לחיוב"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "Disclaimer"
-msgstr ""
+msgstr "כתב ויתור"
 
 #: lms/djangoapps/shoppingcart/pdf.py
 msgid "TERMS AND CONDITIONS"
-msgstr ""
+msgstr "תנאים והתניות"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid "The payment processor did not return a required parameter: {0}"
-msgstr ""
+msgstr "מעבד התשלום לא החזיר פרמטר רצוי: {0}"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid "The payment processor returned a badly-typed value {0} for param {1}."
-msgstr ""
+msgstr "מעבד התשלום החזיר ערך שהוקלד באופן לא תקין {0} עבור פרמטר {1}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "The payment processor accepted an order whose number is not in our system."
-msgstr ""
+msgstr "מעבד התשלום קיבל הזמנה שמספרה אינו במערכת שלנו."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "The amount charged by the processor {0} {1} is different than the total cost"
 " of the order {2} {3}."
-msgstr ""
+msgstr "הסכום שהמעבד חייב {0} {1} שונה מסך עלות ההזמנה {2} {3}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7219,6 +7257,9 @@ msgid ""
 " charged. Please try a different form of payment. Contact us with payment-"
 "related questions at {email}."
 msgstr ""
+"מצטערים, מעבד התשלומים שלנו לא קיבל את תשלומך. ההחלטה שהוחזרה הייתה "
+"{decision_text}, והסיבה לכך הייתה {reason_text}. לא חויבת. אנא נסה אמצעי "
+"תשלום אחר. לשאלות הקשורות לתשלום, צור איתנו קשר בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7228,6 +7269,10 @@ msgid ""
 "is: {error_message}. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
+"מצטערים, מעבד התשלום שלנו שלח לנו חזרה אישור תשלום בעל נתונים לא עקביים! אנו"
+" מתנצלים שלא יכולנו לאמת אם התשלום עבר ולנקוט פעולה בנוגע להזמנתך. הודעת "
+"השגיאה הספציפית היא: {error_message}. ייתכן שכרטיס האשראי שלך חויב. לשאלות "
+"הקשורות לתשלום, צור איתנו קשר בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7236,6 +7281,9 @@ msgid ""
 "credit card has probably been charged. Contact us with payment-specific "
 "questions at {email}."
 msgstr ""
+"מצטערים! בשל שגיאה, הרכישה שלך חויבה בסכום שונה מסך ההזמנה! הודעת השגיאה "
+"הספציפית היא: {error_message}. ככל הנראה כרטיס האשראי שלך חויב. לשאלות "
+"הקשורות ספציפית לתשלום צור איתנו קשר בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7246,21 +7294,26 @@ msgid ""
 "further action on your order. Your credit card may possibly have been "
 "charged. Contact us with payment-specific questions at {email}."
 msgstr ""
+"מצטערים, מעבד התשלום שלנו שלח לנו חזרה הודעה פגומה בנוגע לחיובך, לכן אין אנו"
+" יכולים לאמת שההודעה אכן הגיעה ממעבד התשלום. הודעת השגיאה הספציפית היא: "
+"{error_message}. אנו מתנצלים שאין ביכולתנו לאמת אם החיוב עבר ולנקוט פעולה "
+"נוספת בנוגע להזמנתך. ייתכן שכרטיס האשראי שלך חויב. לשאלות הקשורות  לתשלום, "
+"צור איתנו קשר בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "Successful transaction."
-msgstr ""
+msgstr "העסקה עברה בהצלחה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The request is missing one or more required fields."
-msgstr ""
+msgstr "הבקשה חסרה אחד או יותר שדות חובה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "One or more fields in the request contains invalid data."
-msgstr ""
+msgstr "שדה אחד או יותר בבקשתך מכיל נתונים לא חוקיים."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7270,12 +7323,17 @@ msgid ""
 "            Possible fix: retry the payment after 15 minutes.\n"
 "            "
 msgstr ""
+"\n"
+"            ה-merchantReferenceCode שנשלח עם בקשת אישור זו תואם ל-\n"
+"            merchantReferenceCode של בקשת אישור אחרת ששלחת ברבע שעה האחרונה.\n"
+"            תיקון אפשרי: נסה לשלם שוב לאחר 15 דקות.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "Error: General system failure. Possible fix: retry the payment after a few "
 "minutes."
-msgstr ""
+msgstr "שגיאה: כשל כללי במערכת. תיקון אפשרי: נסה לשלם שוב לאחר מספר דקות."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7285,6 +7343,11 @@ msgid ""
 "            Possible fix: retry the payment after some time.\n"
 "            "
 msgstr ""
+"\n"
+"            שגיאה: הבקשה התקבלה אך השרת היה מושבת.\n"
+"            שגיאה זו אינה כוללת זמני השבתה בין הלקוח לשרת.\n"
+"            תיקון אפשרי: נסה לשלם שוב לאחר זמן מה\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7293,12 +7356,17 @@ msgid ""
 "            Possible fix: retry the payment after some time.\n"
 "            "
 msgstr ""
+"\n"
+"            שגיאה: הבקשה התקבלה, אך שירות לא סיים את ההרצה בזמן\n"
+"            תיקון אפשרי: נסה לשלם שוב לאחר זמן מה.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "The issuing bank has questions about the request. Possible fix: retry with "
 "another form of payment"
 msgstr ""
+"לבנק המנפיק יש שאלות בנוגע לבקשה. תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7308,6 +7376,11 @@ msgid ""
 "            Possible fix: retry with another form of payment\n"
 "            "
 msgstr ""
+"\n"
+"            הכרטיס פג תוקף. ייתכן שהנך מקבל הודעה זאת אם תאריך התפוגה\n"
+"            שסיפקת אינו תואם לתאריך המופיע לבנק בקובץ.\n"
+"            תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7316,21 +7389,25 @@ msgid ""
 "            Possible fix: retry with another form of payment\n"
 "            "
 msgstr ""
+"\n"
+"            דחייה כללית של הכרטיס. הבנק המנפיק לא סיפק מידע אחר.\n"
+"            תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "Insufficient funds in the account. Possible fix: retry with another form of "
 "payment"
-msgstr ""
+msgstr "אין מספיק כסף בחשבון. אנא נסה שוב עם אמצעי תשלום אחר"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid "Unknown reason"
-msgstr ""
+msgstr "סיבה לא ידועה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "Issuing bank unavailable. Possible fix: retry again after a few minutes"
-msgstr ""
+msgstr "הבנק המנפיק אינו זמין. תיקון אפשרי: נסה שוב לאחר מספר דקות"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7339,23 +7416,27 @@ msgid ""
 "            Possible fix: retry with another form of payment\n"
 "            "
 msgstr ""
+"\n"
+"            כרטיס לא פעיל או כרטיס לא מורשה לעסקאות טלפוניות.\n"
+"            תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "The card has reached the credit limit. Possible fix: retry with another form"
 " of payment"
-msgstr ""
+msgstr "הכרטיס הגיע למגבלת האשראי. תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "Invalid card verification number. Possible fix: retry with another form of "
 "payment"
-msgstr ""
+msgstr "מספר אימות הכרטיס אינו חוקי. תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "Invalid account number. Possible fix: retry with another form of payment"
-msgstr ""
+msgstr "מספר חשבון לא חוקי. תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7364,36 +7445,40 @@ msgid ""
 "            Possible fix: retry with another form of payment\n"
 "            "
 msgstr ""
+"\n"
+"            מעבד התשלם אינו מקבל את סוג הכרטיס.\n"
+"            תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "General decline by the processor.  Possible fix: retry with another form of "
 "payment"
-msgstr ""
+msgstr "המעבד דחה באופן כללי.  תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "There is a problem with our CyberSource merchant configuration.  Please let "
 "us know at {0}"
-msgstr ""
+msgstr "קיימת בעיה בתצורת המסחר CyberSource.  אנא דווח לנו על כך ב-{0}"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid "The requested amount exceeds the originally authorized amount."
-msgstr ""
+msgstr "הסכום המבוקש חורג מהסכום שקיבל הרשאה במקור."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid "Processor Failure.  Possible fix: retry the payment"
-msgstr ""
+msgstr "כשל במעבד.  תיקון אפשרי: נסה לשלם שוב"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid "The authorization has already been captured"
-msgstr ""
+msgstr "ההרשאה כבר נקלטה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "The requested transaction amount must match the previous transaction amount."
-msgstr ""
+msgstr "סכום העסקה המבוקשת חייב להתאים לסכום העסקה הקודמת."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7402,11 +7487,15 @@ msgid ""
 "            Possible fix: retry with the same card or another form of payment\n"
 "            "
 msgstr ""
+"\n"
+"            סוג הכרטיס שנשלח אינו חוקי או אינו תואם למספר כרטיס האשראי.\n"
+"            תיקון אפשרי: נסה שוב עם אותו כרטיס או עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The request ID is invalid."
-msgstr ""
+msgstr "מזהה הבקשה אינו חוקי."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7414,11 +7503,14 @@ msgid ""
 "            You requested a capture through the API, but there is no corresponding, unused authorization record.\n"
 "            "
 msgstr ""
+"\n"
+"            ביקשת צילום דרך ממשק ה-API, אך אין התכתבות, רשומת הרשאה שלא נעשה בה שימוש.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The transaction has already been settled or reversed."
-msgstr ""
+msgstr "העסקה כבר הוסדרה או הוחזרה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7427,10 +7519,14 @@ msgid ""
 "            submitted to your processor. Or, you requested a void for a type of transaction that cannot be voided.\n"
 "            "
 msgstr ""
+"\n"
+"            הצילום או האשראי אינם ניתנים לביטול משום שפרטי הצילום או האשראי             נשלחו כבר\n"
+"למעבד או שביקשת ביטול עבור סוג עסקה שלא ניתן לבטלה.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid "You requested a credit for a capture that was previously voided"
-msgstr ""
+msgstr "ביקשת אשראי לצילום שבוטל קודם לכן"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7439,6 +7535,10 @@ msgid ""
 "            Possible fix: retry the payment.\n"
 "            "
 msgstr ""
+"\n"
+"            שגיאה: הבקשה התקבלה אך אירע זמן השבתה במעבד התשלום.\n"
+"            תיקון אפשרי: נסה לשלם שוב.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
@@ -7447,23 +7547,28 @@ msgid ""
 "            Possible fix: retry with a different form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            בקשת ההרשאה אושרה על ידי הבנק המנפיק אך נדחתה על ידי CyberSource.'\n"
+"            תיקון אפשרי: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #. Translators: this text appears when an unfamiliar error code occurs during
 #. payment,
 #. for which we don't know a user-friendly message to display in advance.
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "UNKNOWN REASON"
-msgstr ""
+msgstr "סיבה לא ידועה"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The payment processor did not return a required parameter: {parameter}"
-msgstr ""
+msgstr "מעבד התשלום לא החזיר פרמטר רצוי: {parameter}"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "The payment processor returned a badly-typed value {value} for parameter "
 "{parameter}."
 msgstr ""
+"מעבד התשלום החזיר ערך שהוקלד באופן לא תקין {value} עבור פרמטר {parameter}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7471,6 +7576,8 @@ msgid ""
 "{charged_amount_currency} is different than the total cost of the order "
 "{total_cost} {total_cost_currency}."
 msgstr ""
+"הסכום שהמעבד חייב {charged_amount} {charged_amount_currency} שונה מסך עלות "
+"ההזמנה {total_cost} {total_cost_currency}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7479,6 +7586,9 @@ msgid ""
 "charged. Please try a different form of payment.  Contact us with payment-"
 "related questions at {email}."
 msgstr ""
+"מצטערים, מעבד התשלום שלנו לא קיבל את התשלום. ההחלטה שבגללה חזר התשלום היתה "
+"{decision}, והסיבה היתה {reason}.  לא חויבת. אנא נסה אמצעי תשלום אחר. לשאלות"
+" הקשורות לתשלום, צור איתנו קשר בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7488,6 +7598,10 @@ msgid ""
 "message is: {msg} Your credit card may possibly have been charged.  Contact "
 "us with payment-specific questions at {email}."
 msgstr ""
+"מצטערים, מעבד התשלום שלנו שלח לנו חזרה אישור תשלום שיש בו נתונים לא עקביים! "
+"אנו מתנצלים שאין ביכולתנו לאמת אם החיוב עבר ולנקוט פעולה נוספת בנוגע "
+"להזמנתך. הודעת השגיאה הספציפית היא: {msg}ייתכן שכרטיס האשראי שלך חויב.  "
+"לשאלות הקשורות לתשלום, צור איתנו קשר בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7496,6 +7610,9 @@ msgid ""
 " probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
+"מצטערים, בשל שגיאה, רכישתך חויבה בסכום שונה מסך ההזמנה! הודעת השגיאה "
+"הספציפית היא: {msg}. ככל הנראה, כרטיס האשראי שלך חויב. לשאלות הקשורות "
+"לתשלום, צור איתנו קשר בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7506,6 +7623,11 @@ msgid ""
 "action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
+"מצטערים, מעבד התשלום שלנו שלח לנו חזרה הודעה פגומה בנוגע לחיובך, לכן אין אנו"
+" יכולים לאמת שההודעה אכן הגיעה ממעבד התשלום. הודעת השגיאה הספציפית היא: "
+"{msg}. אנו מתנצלים שאין ביכולתנו לאמת אם החיוב עבר ולנקוט פעולה נוספת בנוגע "
+"להזמנתך. ייתכן שכרטיס האשראי שלך חויב. לשאלות הקשורות לתשלום, צור איתנו קשר "
+"בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7514,6 +7636,9 @@ msgid ""
 "future purchase. If you feel that this is in error, please contact us with "
 "payment-specific questions at {email}."
 msgstr ""
+"מצטערים, מעבד התשלום שלנו שלח לנו חזרה הודעה ובה כתוב שביטלת עסקה זו. "
+"הפריטים בעגלת הקניות שלך ימשיכו להופיע גם ברכישה עתידית. אם לדעתך נעשה הדבר "
+"בשוגג, צור איתנו קשר בנגוע לשאלות ספציפיות לתשלום בכתובת {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7521,12 +7646,16 @@ msgid ""
 "have been saved. If you have any questions about this transaction, please "
 "contact us at {email}."
 msgstr ""
+"מצטערים, אך תשלום זה סורב. הפריטים בעגלת הקניות נשמרו. אנא צרו עמנו קשר "
+"{email} במידה וישנן שאלות כלשהן בנוגע לעסקה. "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Your payment could not be processed because an unexpected exception "
 "occurred. Please contact us at {email} for assistance."
 msgstr ""
+"מצטערים, אין אפשרות לבצע תשלום, התרחשה שגיאת תוכנה לא צפויה. אנא צור איתנו "
+"קשר בדואר אלקטרוני {email} לקבלת סיוע."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7536,14 +7665,19 @@ msgid ""
 "            Possible action: Resend the request with a unique merchant reference code.\n"
 "            "
 msgstr ""
+"\n"
+"            קוד הסימוכין של הסוחר לבקשת הרשאה זו תואם לקוד הסימוכין של הסוחר\n"
+"            לבקשת הרשאה אחרת ששלחת ברבע שעה האחרונה.\n"
+"            פעולה אפשרית: שלח מחדש את הבקשה עם קוד סימוכין של סוחר ייחודי.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "Only a partial amount was approved."
-msgstr ""
+msgstr "רק כמות חלקית אושרה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "General system failure."
-msgstr ""
+msgstr "כשל כללי במערכת."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7552,11 +7686,15 @@ msgid ""
 "            client and the server.\n"
 "            "
 msgstr ""
+"\n"
+"           הבקשה התקבלה אך השרת היה מושבת. שגיאה זו אינה כוללת זמני השבתה בין\n"
+"            הלקוח לשרת.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "The request was received, but a service did not finish running in time."
-msgstr ""
+msgstr "הבקשה התקבלה אך השירות לא סיים את ההרצה בזמן."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7565,6 +7703,10 @@ msgid ""
 "            because it did not pass the Address Verification System (AVS).\n"
 "            "
 msgstr ""
+"\n"
+"            בקשת ההרשאה אושרה על ידי הבנק המנפיק אך נדחתה על ידי CyberSource.\n"
+"           משום שהיא לא עברה את מערכת אימות הכתובת (AVS).\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7574,6 +7716,11 @@ msgid ""
 "            Possible action: retry with another form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            ‎לבנק המנפיק יש שאלות בנוגע לבקשה. לא קיבלת\n"
+"            קוד הרשאה באמצעות התוכנה, אך ייתכן שתקבל הרשאה בעל פה על ידי התקשרות למעבד.\n"
+"            פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7583,6 +7730,11 @@ msgid ""
 "            Possible action: retry with another form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            כרטיס פג תוקף. ייתכן שתקבל גם הודעה זאת אם תאריך התפוגה\n"
+"            שסיפקת אינו תואם לתאריך המופיע לבנק בקובץ.\n"
+"            פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7591,21 +7743,25 @@ msgid ""
 "            Possible action: retry with another form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            דחייה כללית של הכרטיס. הבנק המנפיק לא סיפק מידע אחר.\n"
+"            פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Insufficient funds in the account. Possible action: retry with another form "
 "of payment."
-msgstr ""
+msgstr "אין מספיק כסף בחשבון. אנא נסה שוב עם אמצעי תשלום אחר."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "Stolen or lost card."
-msgstr ""
+msgstr "כרטיס שנגנב או אבד."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Issuing bank unavailable. Possible action: retry again after a few minutes."
-msgstr ""
+msgstr "הבנק המנפיק אינו זמין. פעולה אפשרית: נסה שוב לאחר כמה דקות."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7614,30 +7770,35 @@ msgid ""
 "            Possible action: retry with another form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            כרטיס לא פעיל או כרטיס לא מורשה לעסקאות טלפוניות.\n"
+"            פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "CVN did not match."
-msgstr ""
+msgstr "ה-CVN לא תאם."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "The card has reached the credit limit. Possible action: retry with another "
 "form of payment."
-msgstr ""
+msgstr "הכרטיס הגיע למגבלת האשראי. פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Invalid card verification number (CVN). Possible action: retry with another "
 "form of payment."
 msgstr ""
+"מספר אימות הכרטיס אינו חוקי (CVN). פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The customer matched an entry on the processors negative file."
-msgstr ""
+msgstr "הלקוח התאים כניסה בקובץ השלילי של המעבדים."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "Account frozen. Possible action: retry with another form of payment."
-msgstr ""
+msgstr "החשבון הוקפא. פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7647,11 +7808,16 @@ msgid ""
 "            Possible action: retry with another form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            בקשת ההרשאה אושרה על ידי הבנק המנפיק עך נדחתה על ידי\n"
+"          CyberSource משום שהיא לא עברה את בדיקת ה-CVN.\n"
+"            פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Invalid account number. Possible action: retry with another form of payment."
-msgstr ""
+msgstr "מספר חשבון אינו חוקי. פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7660,34 +7826,38 @@ msgid ""
 "            Possible action: retry with another form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            מעבד התשלם אינו מקבל את סוג הכרטיס.\n"
+"            פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "General decline by the processor.  Possible action: retry with another form "
 "of payment."
-msgstr ""
+msgstr "המעבד דחה באופן כללי.  פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "There is a problem with the information in your CyberSource account.  Please"
 " let us know at {0}"
-msgstr ""
+msgstr "קיימת בעיה עם המידע שבחשבון ה-CyberSource.  אנא דווח לנו על כך ב-{0}"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The requested capture amount exceeds the originally authorized amount."
-msgstr ""
+msgstr "סכום הצילום המבוקש חורג מהסכום שקיבל הרשאה במקור."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "Processor Failure.  Possible action: retry the payment"
-msgstr ""
+msgstr "כשל במעבד.  פעולה אפשרית: נסה שוב לשלם "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The authorization has already been reversed."
-msgstr ""
+msgstr "ההרשאה כבר בוטלה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The authorization has already been captured."
-msgstr ""
+msgstr "ההרשאה כבר נקלטה."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7696,6 +7866,10 @@ msgid ""
 "            Possible action: retry with the same card or another form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            סוג הכרטיס שנשלח אינו חוקי או אינו תואם למספר כרטיס האשראי.\n"
+"            פעולה אפשרית: נסה שוב עם אותו כרטיס או עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7705,6 +7879,11 @@ msgid ""
 "            been used by another capture request.\n"
 "            "
 msgstr ""
+"\n"
+"ביקשת קליטה אך אין התכתבות ורשומת הרשאה שלא נעשה בה שימוש. הדבר מתרחש אם לא היתה\n"
+"            בקשה מוצלחת להרשאה או אם כבר נעשה שימוש בהרשאה המוצלחת הקודמת \n"
+"            על ידי בקשת קליטה אחרת.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7713,27 +7892,31 @@ msgid ""
 "            submitted to your processor, or you requested a void for a type of transaction that cannot be voided.\n"
 "            "
 msgstr ""
+"\n"
+"           הצילום או האשראי אינם ניתנים לביטול משום שפרטי הצילום או האשראי \n"
+"            נשלחו כבר למעבד או שביקשת ביטול לסוג עסקה שלא ניתן לבטלה.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "You requested a credit for a capture that was previously voided."
-msgstr ""
+msgstr "ביקשת אשראי לצילום שבוטל קודם לכן."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "The request was received, but there was a timeout at the payment processor."
-msgstr ""
+msgstr "הבקשה התקבלה אך מעבד התשלום היה מושבת."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "Stand-alone credits are not allowed."
-msgstr ""
+msgstr "לא ניתן לשלם בכרטיסי אשראי חוץ-בנקאיים."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "The cardholder is enrolled for payer authentication"
-msgstr ""
+msgstr "בעל הכרטיס רשום עבור אימות משלם."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid "Payer authentication could not be authenticated"
-msgstr ""
+msgstr "לא ניתן לאמת את אימות משלם. "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7743,6 +7926,11 @@ msgid ""
 "            Possible action: retry with a different form of payment.\n"
 "            "
 msgstr ""
+"\n"
+"            בקשת האישור אושרה על ידי הבנק המנפיק אך נדחתה על ידי CyberSource\n"
+"            בהגדרות ההרשאה החכמה מדור קודם.\n"
+"            פעולה אפשרית: נסה שוב עם אמצעי תשלום אחר.\n"
+"            "
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Order Number"
@@ -7766,7 +7954,7 @@ msgstr "סכום ההחזר הכספי"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Service Fees (if any)"
-msgstr ""
+msgstr "עמלות שירות (אם קיימות)"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Purchase Time"
@@ -7774,7 +7962,7 @@ msgstr "זמן רכישה"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Order ID"
-msgstr ""
+msgstr "מזהה הזמנה"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Unit Cost"
@@ -7830,17 +8018,18 @@ msgstr "הרשמה על בסיס קוד אתי"
 msgid "Verified Enrollment"
 msgstr "הרשמה מאומתת"
 
+#: lms/djangoapps/shoppingcart/reports.py
 #: lms/templates/instructor/instructor_dashboard_2/executive_summary.html
 msgid "Gross Revenue"
-msgstr "‏‫הכנסה גולמית"
+msgstr "הכנסות ברוטו"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Gross Revenue over the Minimum"
-msgstr ""
+msgstr "הכנסות ברוטו מעל המינימום"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Number of Verified Students Contributing More than the Minimum"
-msgstr ""
+msgstr "מספר הסטודנטים המאומתים התורמים מעל המינימום"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Number of Refunds"
@@ -7860,7 +8049,7 @@ msgstr "סה\"כ תשלומים שנאספו"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Number of Successful Refunds"
-msgstr ""
+msgstr "מספר ההחזרים הכספיים שעברו בהצלחה"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Total Amount of Refunds"
@@ -7868,7 +8057,7 @@ msgstr "סה\"כ כמות החזרים"
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "You must be logged-in to add to a shopping cart"
-msgstr "עליך להיות מחובר למערכת כדי להוסיף לסל קניות"
+msgstr "עליך להיות מחובר למערכת כדי להוסיף לעגלת הקניות"
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "The course you requested does not exist."
@@ -7876,7 +8065,7 @@ msgstr "הקורס שביקשת אינו קיים."
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "The course {course_id} is already in your cart."
-msgstr "הקורס {course_id} כבר בסל שלך."
+msgstr "הקורס {course_id} כבר בעגלת הקניות שלך."
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "You are already registered in course {course_id}."
@@ -7884,7 +8073,7 @@ msgstr "הנך רשום כבר לקורס {course_id}. "
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "Course added to cart."
-msgstr "קורס התווסף לסל."
+msgstr "קורס התווסף לעגלת הקניות."
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "Discount does not exist against code '{code}'."
@@ -7901,13 +8090,13 @@ msgstr "קוד הרשמה זה ({enrollment_code}) אינו תקף."
 #: lms/djangoapps/shoppingcart/views.py
 msgid ""
 "Code '{registration_code}' is not valid for any course in the shopping cart."
-msgstr ""
+msgstr "הקוד '{registration_code}' אינו תקף לאף קורס בעגלת הקניות."
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid ""
 "Cart item quantity should not be greater than 1 when applying activation "
 "code"
-msgstr ""
+msgstr "על כמות הפריטים בעגלת הקניות להיות קטנה מ-1 בעת החלת קוד הפעלה"
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "Only one coupon redemption is allowed against an order"
@@ -7966,23 +8155,23 @@ msgstr "משתמש לא נמצא"
 
 #: lms/djangoapps/support/views/refund.py
 msgid "Course {course_id} not past the refund window."
-msgstr ""
+msgstr "קורס {course_id} לא עבר את טווח הזמן להחזר."
 
 #: lms/djangoapps/support/views/refund.py
 msgid "No order found for {user} in course {course_id}"
-msgstr ""
+msgstr "לא נמצאה הזמנה עבור {user} בקורס {course_id}"
 
 #: lms/djangoapps/support/views/refund.py
 msgid "Unenrolled {user} from {course_id}"
-msgstr ""
+msgstr "בטל הרשמת {user} בקורס {course_id}"
 
 #: lms/djangoapps/support/views/refund.py
 msgid "Refunded {cost} for order id {order_id}"
-msgstr ""
+msgstr "הוחזר תשלום של {cost} עבור מזהה הזמנה {order_id}."
 
 #: lms/djangoapps/teams/models.py
 msgid "Optional language the team uses as ISO 639-1 code."
-msgstr ""
+msgstr "השפה האופציונלית שבה משתמש הצוות בקוד ISO 639-1."
 
 #: lms/djangoapps/teams/plugins.py
 #: lms/djangoapps/teams/templates/teams/teams.html
@@ -7991,23 +8180,23 @@ msgstr "צוותים"
 
 #: lms/djangoapps/teams/views.py
 msgid "The supplied course id {course_id} is not valid."
-msgstr ""
+msgstr "מזהה הקורס שסופק {course_id}אינו חוקי."
 
 #: lms/djangoapps/teams/views.py
 msgid "course_id must be provided"
-msgstr ""
+msgstr "יש לספק course_id"
 
 #: lms/djangoapps/teams/views.py
 msgid "text_search and order_by cannot be provided together"
-msgstr ""
+msgstr "לא ניתן לספק text_search ו-order_by"
 
 #: lms/djangoapps/teams/views.py
 msgid "The supplied topic id {topic_id} is not valid"
-msgstr ""
+msgstr "מזהה הנושא שסופק {topic_id} אינו חוקי"
 
 #: lms/djangoapps/teams/views.py
 msgid "Error connecting to elasticsearch"
-msgstr ""
+msgstr "שגיאה בעת התחברות ל-elasticsearch"
 
 #. Translators: 'ordering' is a string describing a way
 #. of ordering a list. For example, {ordering} may be
@@ -8015,83 +8204,83 @@ msgstr ""
 #. list by lower case name.
 #: lms/djangoapps/teams/views.py
 msgid "The ordering {ordering} is not supported"
-msgstr ""
+msgstr "ההזמנה {ordering} אינה נתמכת"
 
 #: lms/djangoapps/teams/views.py
 msgid "The supplied course_id {course_id} is not valid."
-msgstr ""
+msgstr "מזהה הקורס שסופק {course_id}אינו חוקי."
 
 #: lms/djangoapps/teams/views.py
 msgid "You are already in a team in this course."
-msgstr ""
+msgstr "אתה שייך כבר לצוות בקורס זה."
 
 #: lms/djangoapps/teams/views.py
 msgid "username or team_id must be specified."
-msgstr ""
+msgstr "יש לציין שם משתמש או team_id."
 
 #: lms/djangoapps/teams/views.py
 msgid "Username is required."
-msgstr ""
+msgstr "שם המשתמש הוא שדה חובה."
 
 #: lms/djangoapps/teams/views.py
 msgid "Team id is required."
-msgstr ""
+msgstr "מזהה הצוות הוא שדה חובה."
 
 #: lms/djangoapps/teams/views.py
 msgid "This team is already full."
-msgstr ""
+msgstr "הצוות הזה כבר מלא."
 
 #: lms/djangoapps/teams/views.py
 msgid "The user {username} is already a member of a team in this course."
-msgstr ""
+msgstr "המשתמש {username} כבר חבר של צוות בקורס זה."
 
 #: lms/djangoapps/teams/views.py
 msgid ""
 "The user {username} is not enrolled in the course associated with this team."
-msgstr ""
+msgstr "המשתמש {username} אינו רשום בקורס המשויך לצוות זה."
 
 #: lms/djangoapps/verified_track_content/models.py
 msgid "The course key for the course we would like to be auto-cohorted."
-msgstr ""
+msgstr "מפתח הקורס עבור הקורס שברצוננו להפוך לקבוצת לימוד אוטומטית."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "Your {platform_name} verification has expired."
-msgstr ""
+msgstr "אימות ל {platform_name} פג תוקף."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "No photo ID was provided."
-msgstr ""
+msgstr "לא סופקה תעודה מזהה."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "We couldn't read your name from your photo ID image."
-msgstr ""
+msgstr "לא הצלחנו לקרוא את שמך בתמונת התעודה מזהה."
 
 #: lms/djangoapps/verify_student/models.py
 msgid ""
 "The name associated with your account and the name on your ID do not match."
-msgstr ""
+msgstr "השם המשויך לחשבונך והשם בתעודת זהותך אינם תואמים."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "The image of your face was not clear."
-msgstr ""
+msgstr "תמונת פניך לא הייתה ברורה."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "Your face was not visible in your self-photo."
-msgstr ""
+msgstr "פנייך לא היו גלויים לעין בתמונה העצמית שלך."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "There was an error verifying your ID photos."
-msgstr ""
+msgstr "אירעה שגיאה באימות תמונת תעודת הזהות שלך."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "The course for which this deadline applies"
-msgstr ""
+msgstr "הקורס שעליו חל תאריך היעד"
 
 #: lms/djangoapps/verify_student/models.py
 msgid ""
 "The datetime after which users are no longer allowed to submit photos for "
 "verification."
-msgstr ""
+msgstr "התאריך והשעה שלאחריהם לא ניתן לשלוח תמונות לאימות."
 
 #: lms/djangoapps/verify_student/views.py
 msgid "Intro"
@@ -8131,13 +8320,13 @@ msgstr "קורס זה אינו תומך בתעודות בתשלום."
 
 #: lms/djangoapps/verify_student/views.py
 msgid "No selected price or selected price is below minimum."
-msgstr ""
+msgstr "לא נבחר מחיר או נבחר מחיר מתחת למינימום."
 
 #: lms/djangoapps/verify_student/views.py
 msgid ""
 "Photo ID image is required if the user does not have an initial verification"
 " attempt."
-msgstr ""
+msgstr "תמונת מזהה התמונה היא שדה חובה אם למשתמש אין ניסיון אימות ראשוני."
 
 #: lms/djangoapps/verify_student/views.py
 msgid "Missing required parameter face_image"
@@ -8149,15 +8338,15 @@ msgstr "מפתח קורס אינו חוקי"
 
 #: lms/djangoapps/verify_student/views.py
 msgid "Invalid checkpoint location"
-msgstr ""
+msgstr "מיקום נקודת ביקורת אינו חוקי"
 
 #: lms/djangoapps/verify_student/views.py
 msgid "No profile found for user"
-msgstr ""
+msgstr "לא נמצא פרופיל למשתמש "
 
 #: lms/djangoapps/verify_student/views.py
 msgid "Name must be at least {min_length} characters long."
-msgstr ""
+msgstr "על השם להיות לפחות באורך של {min_length} אותיות."
 
 #: lms/djangoapps/verify_student/views.py
 msgid "Image data is not valid."
@@ -8193,17 +8382,17 @@ msgstr "עקוב אחר {platform_name} בטוויטר"
 #. translate this the way that LinkedIn advertises in your language.
 #: lms/envs/common.py
 msgid "LinkedIn"
-msgstr "LinkedIn"
+msgstr "לינקדאין"
 
 #: lms/envs/common.py
 msgid "Follow {platform_name} on LinkedIn"
-msgstr ""
+msgstr "עקוב אחר {platform_name} בלינקדאין"
 
 #. Translators: This is the website name of plus.google.com.  Please
 #. translate this the way that Google+ advertises in your language.
 #: lms/envs/common.py
 msgid "Google+"
-msgstr "Google+"
+msgstr "גוגל+"
 
 #: lms/envs/common.py
 msgid "Follow {platform_name} on Google+"
@@ -8213,57 +8402,57 @@ msgstr "עקוב אחר {platform_name} ב-Google+‎"
 #. translate this the way that Tumblr advertises in your language.
 #: lms/envs/common.py
 msgid "Tumblr"
-msgstr ""
+msgstr "טאמבלר"
 
 #. Translators: This is the website name of www.meetup.com.  Please
 #. translate this the way that MeetUp advertises in your language.
 #: lms/envs/common.py
 msgid "Meetup"
-msgstr ""
+msgstr "מיטאפ"
 
 #. Translators: This is the website name of www.reddit.com.  Please
 #. translate this the way that Reddit advertises in your language.
 #: lms/envs/common.py
 msgid "Reddit"
-msgstr ""
+msgstr "רדאיט"
 
 #: lms/envs/common.py
 msgid "Subscribe to the {platform_name} subreddit"
-msgstr ""
+msgstr "הירשם כמנוי ל-subreddit של {platform_name}"
 
 #. Translators: This is the website name of https://vk.com.  Please
 #. translate this the way that VK advertises in your language.
 #: lms/envs/common.py
 msgid "VK"
-msgstr ""
+msgstr "VK"
 
 #. Translators: This is the website name of http://www.weibo.com.  Please
 #. translate this the way that Weibo advertises in your language.
 #: lms/envs/common.py
 msgid "Weibo"
-msgstr ""
+msgstr "וויבו"
 
 #. Translators: This is the website name of www.youtube.com.  Please
 #. translate this the way that YouTube advertises in your language.
 #: lms/envs/common.py
 msgid "Youtube"
-msgstr ""
+msgstr "יוטיוב"
 
 #: lms/envs/common.py
 msgid "Subscribe to the {platform_name} YouTube channel"
-msgstr ""
+msgstr "הירשם כמנוי של {platform_name} בערוץ יוטיוב"
 
 #: lms/envs/common.py
 msgid "Kosovo"
-msgstr ""
+msgstr "קוסובו"
 
 #: lms/templates/logout.html
 msgid "Signed Out"
-msgstr ""
+msgstr "התנתקת"
 
 #: lms/templates/logout.html
 msgid "You have signed out."
-msgstr ""
+msgstr "התנתקת."
 
 #: lms/templates/logout.html
 #, python-format
@@ -8272,8 +8461,12 @@ msgid ""
 "          If you are not redirected within 5 seconds, <a href=\"%(target)s\">click here to go to the home page</a>.\n"
 "        "
 msgstr ""
+"\n"
+"          Iאם אינך מופנה תוך 5 שניות,, <a href=\"%(target)s\">לחץ כאן כדי לעבור לעמוד הבית</a>.\n"
+"        "
 
-#: cms/templates/base.html lms/templates/main.html
+#: lms/templates/main_django.html cms/templates/base.html
+#: lms/templates/main.html
 msgid "Skip to main content"
 msgstr "דלג לתוכן ראשי"
 
@@ -8283,108 +8476,121 @@ 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."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Please go to the following page and choose a new password:"
-msgstr ""
+msgstr "נא לעבור לעמוד הבא ולבחור סיסמה חדשה:"
 
 #: lms/templates/registration/password_reset_email.html
 msgid ""
 "If you didn't request this change, you can disregard this email - we have "
 "not yet reset your password."
 msgstr ""
+"אם לא ביקשת שינוי זה, יש באפשרותך להתעלם מהודעת דואר אלקטרוני זו - לא איפסנו"
+" עדיין את סיסמתך."
 
 #: lms/templates/registration/password_reset_email.html
 msgid "Thanks for using our site!"
-msgstr ""
+msgstr "תודה על שימוש באתר שלנו!"
 
 #: lms/templates/registration/password_reset_email.html
 #, python-format
 msgid "The %(platform_name)s Team"
-msgstr ""
+msgstr "צוות %(platform_name)s "
 
 #: lms/templates/wiki/article.html
 msgid "Last modified:"
-msgstr ""
+msgstr "עדכון אחרון:"
 
 #: lms/templates/wiki/article.html
 msgid "See all children"
-msgstr ""
+msgstr "הראה את כל הילדים"
 
 #: lms/templates/wiki/article.html
 msgid "This article was last modified:"
-msgstr ""
+msgstr "מאמר זה שונה לאחרונה:"
 
 #: lms/templates/wiki/create.html lms/templates/wiki/create.html.py
 msgid "Add new article"
-msgstr ""
+msgstr "הוסף מאמר חדש"
 
 #: lms/templates/wiki/create.html
 msgid "Create article"
-msgstr ""
+msgstr "צור מאמר"
 
 #: lms/templates/wiki/create.html lms/templates/wiki/delete.html
 #: lms/templates/wiki/delete.html.py
 msgid "Go back"
-msgstr ""
+msgstr "חזור"
 
 #: lms/templates/wiki/delete.html lms/templates/wiki/delete.html.py
 #: lms/templates/wiki/edit.html
 msgid "Delete article"
-msgstr ""
+msgstr "מחק מאמר"
 
+#: lms/templates/wiki/delete.html
+#: lms/templates/wiki/plugins/attachments/index.html
 #: cms/templates/component.html cms/templates/studio_xblock_wrapper.html
 msgid "Delete"
 msgstr "מחק"
 
 #: lms/templates/wiki/delete.html
 msgid "You cannot delete a root article."
-msgstr ""
+msgstr "אין אפשרות למחוק מאמר ראשי."
 
 #: lms/templates/wiki/delete.html
 msgid ""
 "You cannot delete this article because you do not have permission to delete "
 "articles with children. Try to remove the children manually one-by-one."
 msgstr ""
+"אינך יכול למחוק את המאמר הזה כיוון שאין לך הרשאה למחוק מאמרים בעלי מאמרי "
+"משנה. נסה להסיר את מאמרי המשנה באופן ידני אחד-אחד."
 
 #: lms/templates/wiki/delete.html
 msgid ""
 "You are deleting an article. This means that its children will be deleted as"
 " well. If you choose to purge, children will also be purged!"
 msgstr ""
+"הנך עומד למחוק את המאמר. משמעות דבר היא כי כל מאמרי המשנה יימחקו גם כן. אם "
+"תבחר למחוק, מאמרי המשנה של המאמר יימחקו גם הם!"
 
 #: lms/templates/wiki/delete.html
 msgid "Articles that will be deleted"
-msgstr ""
+msgstr "מאמרים שיימחקו"
 
 #: lms/templates/wiki/delete.html
 msgid "...and more!"
-msgstr ""
+msgstr "... ויותר!"
 
 #: lms/templates/wiki/delete.html
 msgid "You are deleting an article. Please confirm."
-msgstr ""
+msgstr "הנך עומד למחוק את המאמר. נא אשר."
 
-#: cms/templates/component.html cms/templates/container.html
-#: cms/templates/studio_xblock_wrapper.html
+#: lms/templates/wiki/edit.html cms/templates/component.html
+#: cms/templates/container.html cms/templates/studio_xblock_wrapper.html
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 #: lms/templates/wiki/includes/article_menu.html
 msgid "Edit"
 msgstr "עריכה"
 
+#: lms/templates/wiki/edit.html lms/templates/wiki/edit.html.py
 #: lms/templates/ccx/schedule.html
 msgid "Save changes"
 msgstr "שמור שינויים"
 
-#: cms/templates/container.html
+#: lms/templates/wiki/edit.html cms/templates/container.html
 msgid "Preview"
 msgstr "תצוגה מקדימה"
 
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a control to allow users to exit out of this modal
 #. interface (a menu or piece of UI that takes the full focus of the screen)
-#: lms/templates/dashboard.html lms/templates/forgot_password_modal.html
-#: lms/templates/help_modal.html lms/templates/signup_modal.html
-#: lms/templates/ccx/schedule.html
+#: lms/templates/wiki/edit.html lms/templates/wiki/history.html
+#: lms/templates/wiki/includes/cheatsheet.html lms/templates/dashboard.html
+#: lms/templates/forgot_password_modal.html lms/templates/help_modal.html
+#: lms/templates/signup_modal.html lms/templates/ccx/schedule.html
 #: lms/templates/instructor/instructor_dashboard_2/add_coupon_modal.html
 #: lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html
 #: lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
@@ -8399,11 +8605,13 @@ msgstr "סגור"
 
 #: lms/templates/wiki/edit.html
 msgid "Wiki Preview"
-msgstr ""
+msgstr "תצוגה מקדימה של Wiki"
 
+#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
 #. 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/dashboard.html
+#: lms/templates/wiki/edit.html lms/templates/wiki/history.html
+#: lms/templates/wiki/includes/cheatsheet.html lms/templates/dashboard.html
 #: lms/templates/modal/_modal-settings-language.html
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "window open"
@@ -8411,11 +8619,11 @@ msgstr "חלון פתוח"
 
 #: lms/templates/wiki/edit.html
 msgid "Back to editor"
-msgstr ""
+msgstr "חזרה לעורך"
 
 #: lms/templates/wiki/history.html
 msgid "History"
-msgstr ""
+msgstr "היסטוריה"
 
 #: lms/templates/wiki/history.html
 msgid ""
@@ -8424,64 +8632,69 @@ msgid ""
 " can change to a particular revision or merge an old revision with the "
 "current one."
 msgstr ""
+"לחץ על כל עדכון על מנת לראות רשימה של פרטים שנערכו. לחץ על 'תצוגה מקדימה' "
+"לצפות בתצוגת המאמר באותו השלב. בתחתית עמוד זה, ניתן להחליף לעדכון מסוים או "
+"למזג עדכון ישן עם הגרסה הנוכחית."
 
 #: lms/templates/wiki/history.html
 msgid "(no log message)"
-msgstr ""
+msgstr "(אין הודעת יומן)"
 
 #: lms/templates/wiki/history.html
 msgid "Preview this revision"
-msgstr ""
+msgstr "תצוגה מקדימה לעדכון זה"
 
 #: lms/templates/wiki/history.html
 msgid "Auto log:"
-msgstr ""
+msgstr "יומן אוטומטי:"
 
 #: lms/templates/wiki/history.html
 msgid "Change"
-msgstr ""
+msgstr "שינוי"
 
 #: lms/templates/wiki/history.html
 msgid "Merge selected with current..."
-msgstr ""
+msgstr "מזג גרסה שנבחרה עם נוכחית...."
 
 #: lms/templates/wiki/history.html
 msgid "Switch to selected version"
-msgstr ""
+msgstr "החלף לגרסה שנבחרה"
 
 #: lms/templates/wiki/history.html
 msgid "Wiki Revision Preview"
-msgstr ""
+msgstr "תצוגה מקדימה לעדכון Wiki"
 
 #: lms/templates/wiki/history.html
 msgid "Back to history view"
-msgstr ""
+msgstr "חזרה לתצוגת היסטוריה"
 
 #: lms/templates/wiki/history.html
 msgid "Switch to this version"
-msgstr ""
+msgstr "החלף לגרסה זו"
 
 #: lms/templates/wiki/history.html
 msgid "Merge Revision"
-msgstr ""
+msgstr "מזג עדכון"
 
 #: lms/templates/wiki/history.html
 msgid "Merge with current"
-msgstr ""
+msgstr "מזג עם הנוכחי"
 
 #: lms/templates/wiki/history.html
 msgid ""
 "When you merge a revision with the current, all data will be retained from "
 "both versions and merged at its approximate location from each revision."
 msgstr ""
+"כאשר ממזגים עדכון עם גרסה נוכחית, כל המידע משתי הגרסאות ישמר וימוזג במיקומו "
+"המוערך בשתי הגרסאות. "
 
 #: lms/templates/wiki/history.html
 msgid "After this, it's important to do a manual review."
-msgstr ""
+msgstr "לאחר מכן, חשוב לבצע סקירה ידנית."
 
 #: lms/templates/wiki/history.html
 msgid "Create new merged version"
-msgstr ""
+msgstr "צור גרסה ממוזגת חדשה"
 
 #: lms/templates/wiki/includes/anonymous_blocked.html
 #, python-format
@@ -8490,110 +8703,116 @@ msgid ""
 "  You need to <a href=\"%(login_url)s\">log in</a> or <a href=\"%(signup_url)s\">sign up</a> to use this function.\n"
 "  "
 msgstr ""
+"\n"
+"צריך <a href=\"%(login_url)s\">להתחבר</a> או <a href=\"%(signup_url)s\">להירשם</a> על מנת להשתמש בפונקציה זו."
 
 #: lms/templates/wiki/includes/anonymous_blocked.html
 msgid "You need to log in or sign up to use this function."
-msgstr ""
+msgstr "עלייך להתחבר או להירשם על מנת להשתמש בפונקציה זו."
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Wiki Cheatsheet"
-msgstr ""
+msgstr "דף עזר של Wiki"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Wiki Syntax Help"
-msgstr ""
+msgstr "עזרה בתחביר Wiki"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid ""
 "This wiki uses <strong>Markdown</strong> for styling. There are several "
 "useful guides online. See any of the links below for in-depth details:"
 msgstr ""
+"ויקי משתמשת ב-<strong>Markdown</strong> לעיצוב. ניתן למצוא מדריכים שימושיים "
+"באינטרנט. ראה כל אחד מהקישורים הבאים לקבלת פרטים לעומק:"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Markdown: Basics"
-msgstr ""
+msgstr "שפת Markdown: בסיס"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Quick Markdown Syntax Guide"
-msgstr ""
+msgstr "מדריך מהיר לתחביר שפת Markdown"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Miniature Markdown Guide"
-msgstr ""
+msgstr "מדריך שפת Markdown מיניאטורי "
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid ""
 "To create a new wiki article, create a link to it. Clicking the link gives "
 "you the creation page."
 msgstr ""
+"כדי ליצור מאמר Wiki חדש, צור קישור אליו. לחיצה על הקישור מעבירה אותך לעמוד "
+"היצירה."
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "[Article Name](wiki:ArticleName)"
-msgstr ""
+msgstr "[Article Name](wiki:ArticleName)"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 #, python-format
 msgid "%(platform_name)s Additions:"
-msgstr ""
+msgstr "תוספות של %(platform_name)s:"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Math Expression"
-msgstr ""
+msgstr "ביטוי מתמטי"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Useful examples:"
-msgstr ""
+msgstr "דוגמאות שימושיות:"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Wikipedia"
-msgstr ""
+msgstr "ויקיפדיה"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 #, python-format
 msgid "%(platform_name)s Wiki"
-msgstr ""
+msgstr "ויקי של %(platform_name)s "
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Huge Header"
-msgstr ""
+msgstr "כותרת ענקית"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Smaller Header"
-msgstr ""
+msgstr "כותרת קטנה יותר"
 
 #. Translators: Leave the punctuation, but translate "emphasis"
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "*emphasis* or _emphasis_"
-msgstr ""
+msgstr "*מודגש* או _מודגש_"
 
 #. Translators: Leave the punctuation, but translate "strong"
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "**strong** or __strong__"
-msgstr ""
+msgstr "**חזק** או __חזק__"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Unordered List"
-msgstr ""
+msgstr "רשימה לא מסודרת"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Sub Item 1"
-msgstr ""
+msgstr "תת פריט 1"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Sub Item 2"
-msgstr ""
+msgstr "תת פריט 2"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Ordered"
-msgstr ""
+msgstr "מסודר"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "List"
-msgstr ""
+msgstr "רשימה"
 
 #: lms/templates/wiki/includes/cheatsheet.html
 msgid "Quotes"
-msgstr ""
+msgstr "ציטוטים"
 
 #: lms/templates/wiki/includes/editor_widget.html
 #, python-format
@@ -8602,37 +8821,43 @@ msgid ""
 "        Markdown syntax is allowed. See the %(start_link)scheatsheet%(end_link)s for help.\n"
 "    "
 msgstr ""
+"\n"
+"ניתן להשתמש בתחביר שפת Markdown. ראה %(start_link)s דף עזר %(end_link)s למידע נוסף."
 
+#: lms/templates/wiki/plugins/attachments/index.html
 #: wiki/plugins/attachments/wiki_plugin.py
 msgid "Attachments"
 msgstr "קבצים מצורפים"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Upload new file"
-msgstr ""
+msgstr "העלה קובץ חדש"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Search and add file"
-msgstr ""
+msgstr "חפש והוסף קובץ"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Upload File"
-msgstr ""
+msgstr "העלה קובץ"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Upload file"
-msgstr ""
+msgstr "העלה קובץ"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Search files and articles"
-msgstr ""
+msgstr "חיפוש קבצים ומאמרים"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid ""
 "You can reuse files from other articles. These files are subject to updates "
 "on other articles which may or may not be a good thing."
 msgstr ""
+"הנך יכול לעשות שימוש חוזר בקבצים ממאמרים אחרים. קבצים אלה כפופים לעדכונים של"
+" מאמרים אחרים העשויים או לא עשויים להיות טובים."
 
+#: lms/templates/wiki/plugins/attachments/index.html
 #: lms/templates/dashboard.html lms/templates/index.html
 #: lms/templates/api_admin/catalogs/search.html
 #: lms/templates/courseware/courses.html
@@ -8648,129 +8873,133 @@ msgid ""
 "The following files are available for this article. Copy the markdown tag to"
 " directly refer to a file from the article text."
 msgstr ""
+"להלן קבצים הזמינים למאמר זה. העתק את תגית שפת markdown על מנת להתייחס ישירות"
+" לקובץ מטקסט המאמר."
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Markdown tag"
-msgstr ""
+msgstr "תגית שפת Markdown"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Uploaded by"
-msgstr ""
+msgstr "הועלה על ידי"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Size"
-msgstr ""
+msgstr "גודל"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "File History"
-msgstr ""
+msgstr "היסטורית קובץ"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Detach"
-msgstr ""
+msgstr "נתק"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Replace"
-msgstr ""
+msgstr "החלף"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "Restore"
-msgstr ""
+msgstr "שחזר"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "anonymous (IP logged)"
-msgstr ""
+msgstr "אנונימי (IP נרשם במערכת)"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "File history"
-msgstr ""
+msgstr "היסטוריית קובץ"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "revisions"
-msgstr ""
+msgstr "גרסאות"
 
 #: lms/templates/wiki/plugins/attachments/index.html
 msgid "There are no attachments for this article."
-msgstr ""
+msgstr "לא קיימים קבצים מצורפים למאמר זה."
 
 #: lms/templates/wiki/preview_inline.html
 msgid "Previewing revision:"
-msgstr ""
+msgstr "תצוגה מקדימה לעדכון:"
 
 #: lms/templates/wiki/preview_inline.html
 msgid "Previewing a merge between two revisions:"
-msgstr ""
+msgstr "תצוגה מקדימה למיזוג של שני עדכונים:"
 
 #: lms/templates/wiki/preview_inline.html
 msgid "This revision has been deleted."
-msgstr ""
+msgstr "הגרסה נמחקה."
 
 #: lms/templates/wiki/preview_inline.html
 msgid "Restoring to this revision will mark the article as deleted."
-msgstr ""
+msgstr "שחזור לעדכון זה ימחק את המאמר."
 
 #: openedx/core/djangoapps/api_admin/admin.py
 msgid ""
 "Once you have approved this request, go to {catalog_admin_url} to set up a "
 "catalog for this user."
 msgstr ""
+"לאחר שאישרת בקשה זו, עבור אל {catalog_admin_url} על מנת להגדיר קטלוג עבור "
+"משתמש זה."
 
 #: openedx/core/djangoapps/api_admin/forms.py
 msgid "Company Address"
-msgstr ""
+msgstr "כתובת החברה"
 
 #: openedx/core/djangoapps/api_admin/forms.py
 msgid "Describe what your application does."
-msgstr ""
+msgstr "תאר מה עושה האפליקציה שלך."
 
 #: openedx/core/djangoapps/api_admin/forms.py
 msgid "The URL of your company's website."
-msgstr ""
+msgstr "כתובת ה-URL של אתר האינטרנט של החברה שלך."
 
 #: openedx/core/djangoapps/api_admin/forms.py
 msgid "The name of your company."
-msgstr ""
+msgstr "שם החברה שלך."
 
 #: openedx/core/djangoapps/api_admin/forms.py
 msgid "The contact address of your company."
-msgstr ""
+msgstr "כתובת איש הקשר של החברה שלך."
 
 #: openedx/core/djangoapps/api_admin/forms.py
 msgid "The following users do not exist: {usernames}."
-msgstr ""
+msgstr "המשתמשים הבאים אינם קיימים: {usernames}."
 
 #: openedx/core/djangoapps/api_admin/forms.py
 msgid ""
 "Comma-separated list of usernames which will be able to view this catalog."
-msgstr ""
+msgstr "רשימה מופרדת בפסיקים של שמות משתמשים שיקבלו גישה לצפייה בקטלוג זה."
 
-#: cms/templates/index.html
+#: openedx/core/djangoapps/api_admin/models.py cms/templates/index.html
 msgid "Denied"
 msgstr "נדחתה"
 
 #: openedx/core/djangoapps/api_admin/models.py
 msgid "Approved"
-msgstr ""
+msgstr "אושר"
 
 #: openedx/core/djangoapps/api_admin/models.py
 msgid "Status of this API access request"
-msgstr ""
+msgstr "סטטוס בקשת גישה לממשק API זה"
 
 #: openedx/core/djangoapps/api_admin/models.py
 msgid "The URL of the website associated with this API user."
-msgstr ""
+msgstr "כתובת ה-URL של אתר האינטרנט המשויך למשתמש API זה."
 
 #: openedx/core/djangoapps/api_admin/models.py
 msgid "The reason this user wants to access the API."
-msgstr ""
+msgstr "הסיבה שמשתמש זה רוצה לגשת ל-API."
 
 #: openedx/core/djangoapps/api_admin/models.py
 msgid "API access request from {company}"
-msgstr ""
+msgstr "בקשת גישה ל-API מ-{company}"
 
 #: openedx/core/djangoapps/api_admin/models.py
 msgid "API access request"
-msgstr ""
+msgstr "בקשת גישה ל-API"
 
 #. Translators: link_start and link_end are HTML tags for a link to the terms
 #. of service.
@@ -8780,69 +9009,76 @@ msgid ""
 "I, and my company, accept the {link_start}{platform_name} API Terms of "
 "Service{link_end}."
 msgstr ""
+"אני והחברה שלי, מקבלים את {link_start}{platform_name} תנאי השירות של "
+"API{link_end}."
 
 #: openedx/core/djangoapps/bookmarks/views.py
 msgid "An error has occurred. Please try again."
-msgstr ""
+msgstr "אירעה שגיאה. אנא נסה שוב."
 
 #: openedx/core/djangoapps/bookmarks/views.py
 msgid "No data provided."
-msgstr ""
+msgstr "לא סופקו נתונים."
 
 #: openedx/core/djangoapps/bookmarks/views.py
 msgid "Parameter usage_id not provided."
-msgstr ""
+msgstr "הפרמטר usage_id לא סופק."
 
 #: openedx/core/djangoapps/bookmarks/views.py
 msgid "Invalid usage_id: {usage_id}."
-msgstr ""
+msgstr "usage_id לא חוקי: {usage_id}."
 
 #: openedx/core/djangoapps/bookmarks/views.py
 msgid "Block with usage_id: {usage_id} not found."
-msgstr ""
+msgstr "בלוק עם usage_id: {usage_id} לא נמצא."
 
 #: openedx/core/djangoapps/bookmarks/views.py
 msgid ""
 "You can create up to {max_num_bookmarks_per_course} bookmarks. You must "
 "remove some bookmarks before you can add new ones."
 msgstr ""
+"באפשרותך ליצור עד {max_num_bookmarks_per_course} סימניות. עליך להסיר מספר "
+"סימניות לפני שתוכל להוסיף חדשות."
 
 #: openedx/core/djangoapps/bookmarks/views.py
 msgid "Bookmark with usage_id: {usage_id} does not exist."
-msgstr ""
+msgstr "סימון בסימניה עם usage_id: {usage_id} לא קיים."
 
 #: openedx/core/djangoapps/catalog/models.py
 msgid "Internal API URL"
-msgstr ""
+msgstr "כתובת URL ל-API פנימי"
 
 #: openedx/core/djangoapps/catalog/models.py
 msgid ""
 "API root to be used for server-to-server requests (e.g., https://catalog-"
 "internal.example.com/api/v1/)."
 msgstr ""
+"יש להשתמש בשורש API לבקשות שרת לשרת (למשל, https://catalog-"
+"internal.example.com/api/v1/)."
 
 #: openedx/core/djangoapps/catalog/models.py
 msgid ""
 "Specified in seconds. Enable caching of API responses by setting this to a "
 "value greater than 0."
 msgstr ""
+"מצוין בשניות. אפשר אחסון במטמון של תגובות API על ידי הגדרתו לערך גדול מ-0."
 
 #: openedx/core/djangoapps/course_groups/cohorts.py
 msgid "Default Group"
-msgstr ""
+msgstr "קבוצת ברירת מחדל"
 
 #: openedx/core/djangoapps/course_groups/cohorts.py
 msgid "You cannot create two cohorts with the same name"
-msgstr ""
+msgstr "אין אפשרות ליצור שתי קבוצות למידה בעלות אותו שם."
 
 #: openedx/core/djangoapps/course_groups/cohorts.py
 msgid ""
 "There must be one cohort to which students can automatically be assigned."
-msgstr ""
+msgstr "חייבת להיות קבוצת לימוד אחת שאליה ניתן לשייך סטודנטים באופן אוטומטי."
 
 #: openedx/core/djangoapps/course_groups/views.py
 msgid "A cohort with the same name already exists."
-msgstr ""
+msgstr "קבוצת לימוד בעלת אותו שם כבר קיימת."
 
 #: openedx/core/djangoapps/coursetalk/models.py
 msgid ""
@@ -8850,74 +9086,79 @@ msgid ""
 "Generally, it is the domain name for your platform. For example, if your "
 "platform is http://edx.org, the platform key is \"edx\"."
 msgstr ""
+"מפתח הפלטפורמה משייך את ישומוני CourseTalk לפלטפורמה שלך. לרוב, זהו שם "
+"הדומיין של הפלטפורמה. לדוגמה, אם הפלטפורמה שלך היא http://edx.org, מפתח "
+"הפלטפורמה הוא \"edx\"."
 
 #: openedx/core/djangoapps/credentials/models.py
 #: openedx/core/djangoapps/programs/models.py
 msgid "Internal Service URL"
-msgstr ""
+msgstr "כתובת URL לשירות פנימי"
 
 #: openedx/core/djangoapps/credentials/models.py
 #: openedx/core/djangoapps/programs/models.py
 msgid "Public Service URL"
-msgstr ""
+msgstr "כתובת URL לשירות ציבורי"
 
 #: openedx/core/djangoapps/credentials/models.py
 msgid "Enable Learner Issuance"
-msgstr ""
+msgstr "אפשר ניפוק לומד"
 
 #: openedx/core/djangoapps/credentials/models.py
 msgid "Enable issuance of credentials via Credential Service."
-msgstr ""
+msgstr "אפשר ניפוק הרשאות באמצעות שירות ההרשאות."
 
 #: openedx/core/djangoapps/credentials/models.py
 msgid "Enable Authoring of Credential in Studio"
-msgstr ""
+msgstr "אפשר חיבור של הרשאה ב-Studio"
 
 #: openedx/core/djangoapps/credentials/models.py
 msgid "Enable authoring of Credential Service credentials in Studio."
-msgstr ""
+msgstr "אפשר חיבור הרשאות של 'שירות הרשאות' ב-Studio."
 
 #: openedx/core/djangoapps/credit/email_utils.py
 msgid "Course Credit Eligibility"
-msgstr ""
+msgstr "כשירות לנקודות זכות בקורס"
 
 #: openedx/core/djangoapps/credit/email_utils.py
 msgid "You are eligible for credit from {providers_string}"
-msgstr ""
+msgstr "אתה כשיר לקבלת נקודות זכות מ-{providers_string}"
 
 #. Translators: The join of two university names (e.g., Harvard and MIT).
 #: openedx/core/djangoapps/credit/email_utils.py
 msgid "{first_provider} and {second_provider}"
-msgstr ""
+msgstr "{first_provider} וכן {second_provider}"
 
 #. Translators: The join of three or more university names. The first of these
 #. formatting strings
 #. represents a comma-separated list of names (e.g., MIT, Harvard, Dartmouth).
 #: openedx/core/djangoapps/credit/email_utils.py
 msgid "{first_providers}, and {last_provider}"
-msgstr ""
+msgstr "{first_providers} וכן {last_provider}"
 
 #: openedx/core/djangoapps/credit/exceptions.py
 msgid "[{username}] is not eligible for credit for [{course_key}]."
-msgstr ""
+msgstr "[{username}] אינו כשיר לקבלת נקודות זכות עבור [{course_key}]."
 
 #: openedx/core/djangoapps/credit/exceptions.py
 msgid "[{course_key}] is not a valid course key."
-msgstr ""
+msgstr "[{course_key}] אינו מפתח קורס חוקי."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid ""
 "Unique identifier for this credit provider. Only alphanumeric characters and"
 " hyphens (-) are allowed. The identifier is case-sensitive."
 msgstr ""
+"מזהה ייחודי עבור ספק נקודות זכות זה. מותרים רק תווים אלפאנומריים ומקפים (-)."
+" המזהה נרשם באותיות קטנות."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid "Whether the credit provider is currently enabled."
-msgstr ""
+msgstr "בין אם ספק נקודות הזכות מופעל כרגע."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid "Name of the credit provider displayed to users"
-msgstr ""
+msgstr "השם של ספק נקודות הזכות מוצג למשתמשים"
 
 #: openedx/core/djangoapps/credit/models.py
 msgid ""
@@ -8925,6 +9166,9 @@ msgid ""
 "credit. In order for this to work, a shared secret key MUST be configured "
 "for the credit provider in secure auth settings."
 msgstr ""
+"אם 'כן', תישלח הודעה אוטמטית לספק נקודות הזכות כאשר משתמש מבקש נקודות זכות. "
+"על מנת שפעולה זו תעבוד, מפתח סודי משותף חייב להיות מוגדר עבור ספק נקודות "
+"הזכות בהגדרות הרשאה מאובטחות."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid ""
@@ -8933,6 +9177,10 @@ msgid ""
 "request.  Otherwise, the user will be shown a link to this URL, so the user "
 "can request credit from the provider directly."
 msgstr ""
+"כתובת ה-URL של ספק נקודות הזכות.  אם מופעלת אינטגרציה אוטומטית, פעולה זו "
+"תהיה נקודת הקצה שבה אנו מפרסמים כדי להודיע לספק על בקשה לנקודות זכות.  אחרת,"
+" יוצג למשתמש קישור לכתובת URL זו, כך שהמשתמש יוכל לבקש נקודות זכות ישירות "
+"מהספק."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid ""
@@ -8940,10 +9188,12 @@ msgid ""
 "her request for credit.  This is displayed to students *after* they have "
 "requested credit."
 msgstr ""
+"כתובת URL מספק נקודות הזכות שבה המשתמש יכול לבדוק את סטטוס בקשתו לנקודות "
+"זכות.  אפשרות זו מוצגת לסטודנטים *לאחר* שביקשו נקודות זכות."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid "Description for the credit provider displayed to users."
-msgstr ""
+msgstr "תיאור לספק נקודות הזכות מוצג למשתמשים."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid ""
@@ -8951,6 +9201,8 @@ msgid ""
 "*after* paying for the credit to get credit for a credit course against a "
 "credit provider."
 msgstr ""
+"טקסט פשוט או תוכן html להצגת שלבים נוספים בעמוד הקבלה *לאחר* התשלום על "
+"נקודות הזכות על מנת לקבל נקודות זכות על קורס אל מול ספק נקודות הזכות."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid ""
@@ -8958,6 +9210,8 @@ msgid ""
 "eligibility email content which is sent when user has met all credit "
 "eligibility requirements."
 msgstr ""
+"טקסט פשוט או תוכן html להצגת הודעה מותאמת אישית בתוכן דואר אלקטרוני לכשירות "
+"לנקודות זכות, שנשלח כאשר משתמש עמד בכל דרישות הכשירות לנקודות זכות."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid ""
@@ -8965,157 +9219,169 @@ msgid ""
 "receipt email content which is sent *after* paying to get credit for a "
 "credit course."
 msgstr ""
+"טקסט פשוט או תוכן html להצגת הודעה מותאמת אישית בתוך תוכן הדואר האלקטרוני "
+"לקבלת נקודות זכות *לאחר* ביצוע תשלום על מנת לקבל נקודות זכות עבור קורס "
+"המזוכה בנקודות."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid "Thumbnail image url of the credit provider."
-msgstr ""
+msgstr "כתובת URL של תמונה ממוזערת של ספק נקודות הזכות."
 
 #: openedx/core/djangoapps/credit/models.py
 msgid "Credit requirement statuses"
-msgstr ""
+msgstr "מצבי דרישות לנקודות זכות"
 
 #: openedx/core/djangoapps/credit/models.py
 msgid "Deadline for purchasing and requesting credit."
-msgstr ""
+msgstr "תאריך היעד לרכישה ולבקשת נקודות זכות."
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid "The file must be smaller than {image_max_size} in size."
-msgstr ""
+msgstr "על גודל הקובץ להיות קטן יותר מ-{image_max_size}."
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid "The file must be at least {image_min_size} in size."
-msgstr ""
+msgstr "על גודל הקובץ להיות לפחות {image_min_size}."
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid "The file must be one of the following types: {valid_file_types}."
-msgstr ""
+msgstr "הקובץ חייב להיות אחד מהסוגים הבאים: {valid_file_types}."
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid ""
 "The Content-Type header for this file does not match the file data. The file"
 " may be corrupted."
 msgstr ""
+"כותרת סוג התוכן עבור קובץ זה אינה תואמת לנתוני הקובץ. ייתכן שהקובץ פגום."
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid ""
 "The file name extension for this file does not match the file data. The file"
 " may be corrupted."
-msgstr ""
+msgstr "תוסף שם הקובץ עבור קובץ זה אינו תואם לנתוני הקובץ. ייתכן שהקובץ פגום."
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid "bytes"
-msgstr ""
+msgstr "bytes"
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
 #: openedx/core/djangoapps/profile_images/images.py
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: openedx/core/djangoapps/profile_images/views.py
 msgid "No file provided for profile image"
-msgstr ""
+msgstr "לא סופק קובץ עבור תמונת פרופיל"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "API Version"
-msgstr ""
+msgstr "גרסת API"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Path used to construct URLs to programs marketing pages (e.g., \"/foo\")."
-msgstr ""
+msgstr "נתיב המשמש לבניית כתובות URL לדפי שיווק תכניות (לדוגמה,  \"/foo\")."
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Path to authoring app's JS"
-msgstr ""
+msgstr "נתיב לחיבור JS של האפליקציה"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid ""
 "This value is required in order to enable the Studio authoring interface."
-msgstr ""
+msgstr "ערך זה נדרש על מנת לאפשר את ממשק החיבור של Studio."
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Path to authoring app's CSS"
-msgstr ""
+msgstr "נתיב לחיבור CSS של האפליקציה"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Enable Student Dashboard Displays"
-msgstr ""
+msgstr "אפשר תצוגות לוח הבקרה של הסטודנטים"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Enable Studio Authoring Interface"
-msgstr ""
+msgstr "אפשר ממשק חיבור ל-Studio"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Enable Program Certificate Generation"
-msgstr ""
+msgstr "אפשר יצירת תעודת תכנית"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Maximum Certification Retries"
-msgstr ""
+msgstr "ניסיונות חוזרים מרביים ליצירת תעודה"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid ""
 "When making requests to award certificates, make at most this many attempts "
 "to retry a failing request."
 msgstr ""
+"בעת ביצוע בקשות להענקת תעודות, בצע כמה שיותר ניסיונות לשחזר בקשה שנכשלה."
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Do we want to show xseries program advertising"
-msgstr ""
+msgstr "האם ברצוננו להציג פרסום לתכנית xseries"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Do we want to show program listing page"
-msgstr ""
+msgstr "האם ברצוננו להציג את דף הרישום לתכנית"
 
 #: openedx/core/djangoapps/programs/models.py
 msgid "Do we want to show program details pages"
-msgstr ""
+msgstr "האם ברצוננו להציג דפי מידע לתכנית"
 
 #: openedx/core/djangoapps/self_paced/models.py
 msgid "Enable course home page improvements."
-msgstr ""
+msgstr "אפשר שיפורים בעמוד הבית של הקורס."
+
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr "נתיב לעמוד הקבלה להזמנה."
 
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
-msgstr ""
+msgstr "לא ניתן לערוך שדה '{field_name}'"
 
 #: openedx/core/djangoapps/user_api/preferences/api.py
 msgid "Delete failed for user preference '{preference_key}'."
-msgstr ""
+msgstr "נכשלה מחיקת העדפות משתמש '{preference_key}'."
 
 #: openedx/core/djangoapps/user_api/preferences/api.py
 msgid "Preference '{preference_key}' cannot be set to an empty value."
-msgstr ""
+msgstr "לא ניתן לקבוע ערך ריק להעדפה '{preference_key}'."
 
 #: openedx/core/djangoapps/user_api/preferences/api.py
 msgid "Invalid user preference key '{preference_key}'."
-msgstr ""
+msgstr "מפתח העדפות משתמש אינו חוקי '{preference_key}'."
 
 #: openedx/core/djangoapps/user_api/preferences/api.py
 msgid ""
 "Value '{preference_value}' is not valid for user preference "
 "'{preference_key}'."
 msgstr ""
+"ערך '{preference_value}' אינו תקף עבור העדפת משתמש '{preference_key}'."
 
 #: openedx/core/djangoapps/user_api/preferences/api.py
 msgid ""
 "Value '{preference_value}' not valid for preference '{preference_key}': Not "
 "in timezone set."
 msgstr ""
+"ערך '{preference_value}' אינו תקף עבור העדפת  '{preference_key}': אינו תקף "
+"בהגדרת אזור הזמן."
 
 #: openedx/core/djangoapps/user_api/preferences/api.py
 msgid "Value '{preference_value}' is not a valid time zone selection."
-msgstr ""
+msgstr "ערך '{preference_value}' אינו בחירת אזור זמן חוקית."
 
 #: openedx/core/djangoapps/user_api/preferences/api.py
 msgid "Save failed for user preference '{key}' with value '{value}'."
-msgstr ""
+msgstr "השמירה נכשלה עבור העדפת משתמש '{key}' בערך '{value}'."
 
 #: openedx/core/djangoapps/user_api/preferences/views.py
 msgid "No data provided for user preference update"
-msgstr ""
+msgstr "אין נתונים הניתנים לעדכון העדפות משתמש"
 
 #. Translators: This example email address is used as a placeholder in
 #. a field on the login form meant to hold the user's email address.
@@ -9125,7 +9391,7 @@ msgstr ""
 #. a field on the password reset form meant to hold the user's email address.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "username@domain.com"
-msgstr ""
+msgstr "username@domain.com"
 
 #. Translators: These instructions appear on the login form, immediately
 #. below a field meant to hold the user's email address.
@@ -9133,18 +9399,23 @@ msgstr ""
 #. immediately below a field meant to hold the user's email address.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "The email address you used to register with {platform_name}"
-msgstr ""
+msgstr "כתובת דואר אלקטרוני שהשתמשת בזמן רישום ל{platform_name}"
 
-#: cms/templates/login.html cms/templates/register.html
-#: lms/templates/login.html lms/templates/provider_login.html
-#: lms/templates/register-form.html lms/templates/signup_modal.html
-#: lms/templates/sysadmin_dashboard.html
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This label appears above a field on the login form
+#. meant to hold the user's password.
+#. Translators: This label appears above a field on the registration form
+#. meant to hold the user's password.
+#: openedx/core/djangoapps/user_api/views.py cms/templates/login.html
+#: cms/templates/register.html lms/templates/login.html
+#: lms/templates/provider_login.html lms/templates/register-form.html
+#: lms/templates/signup_modal.html lms/templates/sysadmin_dashboard.html
 #: themes/red-theme/cms/templates/login.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Password"
 msgstr "סיסמה"
 
-#: lms/templates/login.html
+#: openedx/core/djangoapps/user_api/views.py lms/templates/login.html
 msgid "Remember me"
 msgstr "זכור אותי"
 
@@ -9155,6 +9426,8 @@ msgid ""
 "It looks like {email_address} belongs to an existing account. Try again with"
 " a different email address."
 msgstr ""
+"נראה כי {email_address} שייך לחשבון קיים. נסה שוב עם כתובת דואר אלקטרוני "
+"אחרת."
 
 #. Translators: This message is shown to users who attempt to create a new
 #. account using a username associated with an existing account.
@@ -9162,30 +9435,34 @@ msgstr ""
 msgid ""
 "It looks like {username} belongs to an existing account. Try again with a "
 "different username."
-msgstr ""
+msgstr "נראה כי {username} שייך לחשבון קיים. נסה שוב עם שם משתמש אחר."
 
 #. Translators: This label appears above a field on the registration form
 #. meant to hold the user's full name.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Full name"
-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 Doe"
-msgstr ""
+msgstr "ישראלה ישראלי"
 
-#: lms/templates/register-form.html
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. 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 lms/templates/register-form.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Your legal name, used for any certificates you earn."
-msgstr "שמך החוקי ישמש בכל תעודה שתזכה."
+msgstr "השם החוקי שלך, ישמש בכל תעודה שתזכה."
 
 #. 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
 msgid "Public username"
-msgstr ""
+msgstr "שם קמפוס"
 
 #. Translators: These instructions appear on the registration form,
 #. immediately
@@ -9195,24 +9472,31 @@ msgid ""
 "The name that will identify you in your courses - {bold_start}(cannot be "
 "changed later){bold_end}"
 msgstr ""
+"השם שיזהה אותך בקורסים - {bold_start}(לא ניתן לשנות מאוחר יותר){bold_end}"
 
 #. 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 "JaneDoe"
-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.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Highest level of education completed"
-msgstr ""
+msgstr "רמת ההשכלה"
 
-#: lms/templates/signup_modal.html
+#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: This label appears above a dropdown menu on the registration
+#. form used to select the user's year of birth.
+#: openedx/core/djangoapps/user_api/views.py lms/templates/signup_modal.html
 msgid "Year of birth"
 msgstr "שנת לידה"
 
-#: 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 mailing address.
+#: openedx/core/djangoapps/user_api/views.py lms/templates/signup_modal.html
 msgid "Mailing address"
 msgstr "כתובת למשלוח דואר"
 
@@ -9220,29 +9504,37 @@ msgstr "כתובת למשלוח דואר"
 #. meant to hold the user's reasons for registering with edX.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Tell us why you're interested in {platform_name}"
-msgstr ""
+msgstr "ספר לנו מדוע אתה מתעניין ב{platform_name}"
 
 #. Translators: This label appears above a field on the registration form
 #. which allows the user to input the State/Province/Region in which they
 #. live.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "State/Province/Region"
-msgstr ""
+msgstr "ארץ/מחוז/אזור"
 
 #. Translators: This label appears above a field on the registration form
 #. which allows the user to input the Company
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Company"
-msgstr ""
+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 ""
 
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
+msgstr "תנאי שימוש וקוד אתי"
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service and Honor Code"
 msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
@@ -9250,7 +9542,7 @@ msgstr ""
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
+msgid "I agree to the {platform_name} {terms_of_service}"
 msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
@@ -9258,58 +9550,66 @@ msgstr ""
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
 msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
-msgstr ""
+msgstr "ערך זה אינו חוקי."
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This field is not editable"
-msgstr ""
+msgstr "שדה זה אינו ניתן לעריכה"
 
 #: openedx/core/lib/gating/api.py
 #, python-format
 msgid "%(min_score)s is not a valid grade percentage"
-msgstr ""
+msgstr "%(min_score)s אינו אחוז דירוג חוקי"
 
 #: openedx/core/lib/gating/api.py
 msgid "Gating milestone for {usage_key}"
-msgstr ""
+msgstr "קבלת אבן דרך עבור {usage_key}"
 
 #: openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
 msgid "Display name for this component"
-msgstr ""
+msgstr "שם תצוגה עבור רכיב זה"
 
 #: openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
 msgid "Category"
-msgstr ""
+msgstr "קטגוריה"
 
 #: openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
 msgid "Week 1"
-msgstr ""
+msgstr "שבוע 1"
 
 #: openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
 msgid ""
 "A category name for the discussion. This name appears in the left pane of "
 "the discussion forum for the course."
 msgstr ""
+"שם קטגוריה עבור הדיון. השם הזה מופיע בחלונית השמאלית של פורום הדיונים של "
+"הקורס."
 
 #: openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
 msgid "Subcategory"
-msgstr ""
+msgstr "תת קטגוריה"
 
 #: openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
 msgid ""
 "A subcategory name for the discussion. This name appears in the left pane of"
 " the discussion forum for the course."
 msgstr ""
+"שם תת קטגוריה עבור הדיון. השם הזה מופיע בחלונית השמאלית של פורום הדיונים של "
+"הקורס. "
 
 #: cms/djangoapps/contentstore/course_group_config.py
 #: cms/djangoapps/contentstore/views/certificates.py
 msgid "invalid JSON"
-msgstr "JSON לא תקף"
+msgstr "JSON לא חוקי"
 
 #: cms/djangoapps/contentstore/course_group_config.py
 msgid "must have name of the configuration"
@@ -9333,7 +9633,7 @@ msgstr "לא ניתן למפתח פריט: {}"
 
 #: cms/djangoapps/contentstore/courseware_index.py
 msgid "General indexing error occurred"
-msgstr "קרתה שגיאת מִפתוח כללית"
+msgstr "אירעה שגיאת מִפתוח כללית"
 
 #: cms/djangoapps/contentstore/courseware_index.py
 msgid "(Unnamed)"
@@ -9398,7 +9698,7 @@ msgstr "ניתן מיקום קורס שגוי"
 
 #: cms/djangoapps/contentstore/git_export_utils.py
 msgid "Missing branch on fresh clone"
-msgstr "ענף חסר בשכפול חדש"
+msgstr "חסר ענף בשכפול חדש"
 
 #: cms/djangoapps/contentstore/management/commands/git_export.py
 msgid ""
@@ -9496,8 +9796,8 @@ msgid ""
 "Organization you selected does not exist in the system, you will need to add"
 " it to the system"
 msgstr ""
-"עליכם לקשר קורס זה לארגון על מנת להמשיך. הארגון שבחרתם אינו קיים במערכת, "
-"עליכם להוסיף אותו למערכת"
+"עליך לקשר קורס זה לארגון על מנת להמשיך. הארגון שבחרת אינו קיים במערכת, עליך "
+"להוסיף אותו למערכת"
 
 #: cms/djangoapps/contentstore/views/course.py
 msgid "Invalid prerequisite course key"
@@ -9509,7 +9809,7 @@ msgstr "אירעה שגיאה בעת ניסיון לשמור על הלשוניו
 
 #: cms/djangoapps/contentstore/views/course.py
 msgid "Tabs Exception"
-msgstr "חריגה בלשוניות"
+msgstr "חריגה בכרטיסיות"
 
 #: cms/djangoapps/contentstore/views/course.py
 msgid "This group configuration is in use and cannot be deleted."
@@ -9541,7 +9841,7 @@ msgstr "ריק"
 
 #: cms/djangoapps/contentstore/views/import_export.py
 msgid "We only support uploading a .tar.gz file."
-msgstr "אנחנו תומכים בהעלאת קובץ .tar.gz בלבד."
+msgstr "אנו תומכים בהעלאת קובץ .tar.gz בלבד."
 
 #: cms/djangoapps/contentstore/views/import_export.py
 msgid "File upload corrupted. Please try again"
@@ -9574,7 +9874,7 @@ msgstr "העתקה של '{0}'"
 msgid ""
 "Students must score {score}{pct_sign} or higher to access course materials."
 msgstr ""
-"סטודנטים צריכים לקבל ציון {score}{pct_sign} או יותר על מנת לגשת לחומרי "
+"סטודנטים חייבים לקבל ציון {score}{pct_sign} או יותר על מנת לגשת לחומרי "
 "הקורס."
 
 #. Translators: This is the percent sign. It will be used to represent
@@ -9589,7 +9889,7 @@ msgstr "{section_or_subsection} \"{display_name}\""
 
 #: cms/djangoapps/contentstore/views/library.py
 msgid "Unable to create library - missing required field '{field}'"
-msgstr "לא ניתן ליצור ספריה - חסרים שדות דרושים '{field}'"
+msgstr "לא ניתן ליצור ספריה - חסרים שדות חובה '{field}'"
 
 #: cms/djangoapps/contentstore/views/library.py
 msgid ""
@@ -9607,12 +9907,12 @@ msgid ""
 "code. Please change your library code so that it is unique within your "
 "organization."
 msgstr ""
-"הוגדרה כבר ספריי בעלת אותו קוד ארגון וספריה. אנא שנו את קוד הספריה על מנת "
-"שיהיה ייחודי בארגונכם."
+"הוגדרה כבר ספריה בעלת אותו קוד ארגון וספריה. אנא שנה את קוד הספריה על מנת "
+"שיהיה ייחודי בארגונך."
 
 #: cms/djangoapps/contentstore/views/transcripts_ajax.py
 msgid "Incoming video data is empty."
-msgstr "נתוני וידאו נכנס ריקים."
+msgstr "נתוני סרטון וידאו נכנס ריקים."
 
 #: cms/djangoapps/contentstore/views/transcripts_ajax.py
 msgid "Can't find item by locator."
@@ -9620,7 +9920,7 @@ msgstr "לא ניתן לאתר פריט באמצעות מאתר."
 
 #: cms/djangoapps/contentstore/views/transcripts_ajax.py
 msgid "Transcripts are supported only for \"video\" modules."
-msgstr "תמלילים נתמכים רק ברכיבים מסוג \"וידאו\". "
+msgstr "תמלילים נתמכים רק במודולים מסוג \"וידאו\". "
 
 #: cms/djangoapps/contentstore/views/user.py
 msgid "Insufficient permissions"
@@ -9628,7 +9928,7 @@ msgstr "הרשאות לא מספיקות"
 
 #: cms/djangoapps/contentstore/views/user.py
 msgid "Could not find user by email address '{email}'."
-msgstr "לא ניתן לאתר משתמש לפי כתובת דוא\"ל '{email}'."
+msgstr "לא ניתן לאתר משתמש לפי כתובת דואר אלקטרוני '{email}'."
 
 #: cms/djangoapps/contentstore/views/user.py
 msgid "User {email} has registered but has not yet activated his/her account."
@@ -9747,7 +10047,7 @@ msgid ""
 "Optional notes about this user (for example, why course creation access was "
 "denied)"
 msgstr ""
-"הערות אופציונליות אודות משתמש זה (לדוגמא, מדוע נשללה גישה ליצירת קורס)"
+"הערות אופציונליות אודות משתמש זה (לדוגמה, מדוע נשללה גישה ליצירת קורס)"
 
 #: cms/djangoapps/maintenance/views.py
 #: cms/templates/maintenance/_force_publish_course.html
@@ -9771,7 +10071,7 @@ msgstr "נא ספקו את זהות הקורס."
 
 #: cms/djangoapps/maintenance/views.py
 msgid "Invalid course key."
-msgstr ""
+msgstr "מפתח הקורס אינו חוקי."
 
 #: cms/djangoapps/maintenance/views.py
 msgid "No matching course found."
@@ -9779,7 +10079,7 @@ msgstr "לא נמצא קורס מתאים."
 
 #: cms/djangoapps/maintenance/views.py
 msgid "Force publishing course is not supported with old mongo courses."
-msgstr ""
+msgstr "אילוץ פרסום הקורס אינו נתמך בקורסי Mongo קודמים."
 
 #: cms/djangoapps/maintenance/views.py
 msgid "Course is already in published state."
@@ -9787,11 +10087,11 @@ msgstr "הקורס נמצא כבר בשלב הפרסום."
 
 #: cms/djangoapps/models/settings/course_metadata.py
 msgid "Incorrect format for field '{name}'. {detailed_message}"
-msgstr "פורמט לא נכון עבור שדה  '{name}'. {detailed_message}"
+msgstr "פורמט לא תקין עבור שדה  '{name}'. {detailed_message}"
 
 #: cms/lib/xblock/tagging/tagging.py
 msgid "Dictionary with the available tags"
-msgstr "מילון עם התגים הזמינים"
+msgstr "מילון עם התגיות הזמינות"
 
 #: cms/templates/404.html cms/templates/error.html
 #: lms/templates/static_templates/404.html
@@ -9814,7 +10114,8 @@ msgstr "תוכן"
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -9932,7 +10233,7 @@ msgstr "דוגמה: שלום שלום"
 #: themes/stanford-style/lms/templates/register-form.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Public Username"
-msgstr "שם משתמש לתצוגה"
+msgstr "שם קמפוס"
 
 #. Translators: This is the placeholder text for a field that asks the user to
 #. pick a username
@@ -10005,8 +10306,9 @@ msgstr "שפת הקורס"
 msgid "Account"
 msgstr "חשבון"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "עזרה"
 
@@ -10139,10 +10441,14 @@ msgstr "נא רענן את העמוד על מנת לראות האם יושמו 
 msgid "Discussion - {course_number}"
 msgstr "דיונים - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr "דיונים"
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
-msgstr ""
+msgstr "הוסף פוסט"
 
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html
@@ -10337,7 +10643,7 @@ msgstr "סטודנטים נדחו:"
 
 #: lms/templates/enroll_students.html
 msgid "Debug: "
-msgstr "נפה שגיאות -Debug"
+msgstr "תיקון באגים"
 
 #: lms/templates/extauth_failure.html
 msgid "External Authentication failed"
@@ -10389,6 +10695,10 @@ msgstr "אפס סיסמה"
 msgid "Email is incorrect."
 msgstr "כתובת הדואר האלקטרוני שגויה"
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr "תמיכה"
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "{platform_name} עזרה"
@@ -10454,6 +10764,8 @@ msgid ""
 "details that will help us to troubleshoot, including error messages that you"
 " saw."
 msgstr ""
+"תאר מה היה מצבך כשאיתרת את הבעיה. כלול כל פרט שיעזור לנו לפתור את הבעיה, "
+"כולל הודעות שגיאה שראית."
 
 #: lms/templates/help_modal.html
 msgid "Thank You!"
@@ -10483,7 +10795,7 @@ msgstr "תיאור קצר של הבעיה"
 
 #: lms/templates/help_modal.html
 msgid "Details of the problem you are encountering{asterisk}"
-msgstr ""
+msgstr "פרטים על הבעיה בה נתקלת{asterisk}"
 
 #: lms/templates/help_modal.html
 msgid "suggestion"
@@ -10635,11 +10947,11 @@ msgstr "עבור לעמוד השאלות הנפוצות. "
 
 #: lms/templates/login.html
 msgid "Log into your {platform_name} Account"
-msgstr "היכנס לחשבונך ב-{platform_name} "
+msgstr "התחבר לחשבונך ב-{platform_name} "
 
 #: lms/templates/login.html
 msgid "Log into My {platform_name} Account"
-msgstr "היכנס לחשבון {platform_name} שלי"
+msgstr "התחבר לחשבון {platform_name} שלי"
 
 #: lms/templates/login.html
 msgid "Access My Courses"
@@ -10649,7 +10961,7 @@ msgstr "היכנס לקורסים שלי"
 #: lms/templates/register.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Processing your account information"
-msgstr "מעבד את מידע חשבונך."
+msgstr "מעבד את מידע החשבון שלך"
 
 #: lms/templates/login.html
 msgid "Please log in"
@@ -10669,7 +10981,7 @@ msgstr "לא הצלחנו לחבר אותך"
 
 #: lms/templates/login.html
 msgid "Your email or password is incorrect"
-msgstr "כתובת הדואר האלקטרוני או סיסמתך שגויות"
+msgstr "כתובת הדואר האלקטרוני או הסיסמה שהקלדת שגויות"
 
 #: lms/templates/login.html
 msgid "An error occurred when signing you in to {platform_name}."
@@ -10873,7 +11185,7 @@ msgstr "שמור"
 
 #: lms/templates/problem.html
 msgid "Toggle Answer Visibility"
-msgstr "החלף את ניראות התשובה"
+msgstr "בחר תשובה מוצגת/מוסתרת"
 
 #: lms/templates/problem.html
 msgid "You have used {num_used} of {num_total} submissions"
@@ -10972,12 +11284,12 @@ msgstr "ברוך הבא {username}"
 #: lms/templates/register-form.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Enter a Public Display Name:"
-msgstr "הכנס שם תצוגה ציבורי:"
+msgstr "הכנס שם קמפוס:"
 
 #: lms/templates/register-form.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Public Display Name"
-msgstr "שם תצוגה ציבורי"
+msgstr "שם קמפוס"
 
 #: lms/templates/register-form.html
 #: themes/stanford-style/lms/templates/register-form.html
@@ -11042,7 +11354,7 @@ msgstr "ברוכים הבאים {username}! נא הגדר למטה את העדפ
 #: lms/templates/register-shib.html lms/templates/signup_modal.html
 #: themes/stanford-style/lms/templates/register-shib.html
 msgid "Enter a public username:"
-msgstr "הכנס שם משתמש ציבורי:"
+msgstr "הכנס שם קמפוס:"
 
 #: lms/templates/register-shib.html
 #: themes/stanford-style/lms/templates/register-shib.html
@@ -11097,7 +11409,7 @@ msgstr ""
 
 #: lms/templates/register-sidebar.html
 msgid "Need help registering with {platform_name}?"
-msgstr ""
+msgstr "צריך עזרה ברישום ל{platform_name}?"
 
 #: lms/templates/register-sidebar.html
 #: themes/stanford-style/lms/templates/register-sidebar.html
@@ -11110,6 +11422,8 @@ msgid ""
 "After you enroll in a course, you can also find answers in the course "
 "discussions."
 msgstr ""
+"תוכל למצוא תשובות לרוב השאלות ברשימת השאלות הנפוצות שלנו. לאחר שתירשם לקורס,"
+" תוכל למצוא גם תשובות בדיוני הקורס."
 
 #: lms/templates/register.html
 msgid "Register for {platform_name}"
@@ -11136,7 +11450,7 @@ msgid ""
 "You have re-enabled forum notification emails from {platform_name}. You may "
 "{dashboard_link_start}return to your dashboard{link_end}."
 msgstr ""
-"הפעלת מחדש את הודעות הדוא\"ל של הפורום מ-{platform_name}. באפשרותך "
+"הפעלת מחדש את הודעות הדואר האלקטרוני של הפורום מ-{platform_name}. באפשרותך "
 "{dashboard_link_start}לחזור למרכז השליטה{link_end}."
 
 #: lms/templates/seq_module.html
@@ -11325,7 +11639,7 @@ msgstr "ציוות והרשמה"
 #: lms/templates/sysadmin_dashboard.html
 #: lms/templates/sysadmin_dashboard_gitlogs.html
 msgid "Git Logs"
-msgstr "רישומי GIT"
+msgstr "יומן אירועי GIT"
 
 #: lms/templates/sysadmin_dashboard.html
 msgid "User Management"
@@ -11438,12 +11752,12 @@ msgstr "פעילות GIT"
 #. Translators: git is a version-control system; see http://git-scm.com/about
 #: lms/templates/sysadmin_dashboard_gitlogs.html
 msgid "No git import logs have been recorded."
-msgstr "לא נמצאו רישומי יבוא מ-GIT."
+msgstr "לא נמצא יבוא יומן אירועי GIT."
 
 #. Translators: git is a version-control system; see http://git-scm.com/about
 #: lms/templates/sysadmin_dashboard_gitlogs.html
 msgid "No git import logs have been recorded for this course."
-msgstr "לא נמצאו רישומי יבוא מ-GIT לקורס זה."
+msgstr "לא נמצאו יבוא יומן אירועי GIT לקורס זה."
 
 #: lms/templates/textannotation.html
 msgid "Source:"
@@ -11451,7 +11765,7 @@ msgstr "מקור:"
 
 #: lms/templates/tracking_log.html
 msgid "Tracking Log"
-msgstr "רישומי מעקב"
+msgstr "יומן אירועי מעקב"
 
 #: lms/templates/tracking_log.html
 msgid "datetime"
@@ -11479,7 +11793,7 @@ msgid ""
 "You may {dashboard_link_start}return to your dashboard{link_end}. If you did"
 " not mean to do this, {undo_link_start}you can re-subscribe{link_end}."
 msgstr ""
-"לא תקבל יותר הודעות דוא\"ל מהפורום {platform_name}. יש באפשרותך "
+"לא תקבל יותר הודעות דואר אלקטרוני מהפורום {platform_name}. יש באפשרותך "
 "{dashboard_link_start}לחזור ללוח הבקרה{link_end}. אם לא התכוונת לעשות זאת, "
 "{undo_link_start}באפשרותך לבטל את המנוי{link_end}."
 
@@ -11526,7 +11840,7 @@ msgid ""
 "them up or down. Under Google Chrome, this is done by pressing ctrl-plus, or"
 " ctrl-minus at the same time."
 msgstr ""
-"אם הינך זקוק לגופן גדול או קטן יותר, השתמש בהגדרות הדפדפן שלך להגדיל או "
+"אם אתה זקוק לגופן גדול או קטן יותר, השתמש בהגדרות הדפדפן שלך להגדיל או "
 "להקטין אותו. בדפדפן גוגל כרום, פעולה זו מתבצעת באמצעות לחיצה במקביל על ctrl-"
 "plus או ctrl-minus."
 
@@ -11556,11 +11870,11 @@ msgstr "הורד דף מידע"
 
 #: lms/templates/word_cloud.html
 msgid "{num} of {total}"
-msgstr ""
+msgstr "{num} מתוך {total}"
 
 #: lms/templates/word_cloud.html
 msgid "Your words were:"
-msgstr ""
+msgstr "המילים שלך היו:"
 
 #: lms/templates/api_admin/api_access_request_form.html
 msgid "API Access Request"
@@ -11577,7 +11891,7 @@ msgstr "בקש גישה ל-API"
 
 #: lms/templates/api_admin/status.html
 msgid "API Access Request Status"
-msgstr ""
+msgstr "סטטוס בקשת גישה ל-API"
 
 #. Translators: "platform_name" is the name of this Open edX installation.
 #: lms/templates/api_admin/status.html
@@ -11588,8 +11902,8 @@ msgid ""
 "status of your API access request."
 msgstr ""
 "בקשתך לקבל גישה ל{platform_name} ממשק ה-API של קטלוג הקורס נמצאת בעיבוד. "
-"תקבל הודעה בדוא\"ל המופיע בפרופיל שלך, כשיושלם העיבוד. בנוסף, תוכל לחזור "
-"לעמוד זה על מנת לראות את סטטוס בקשת הגישה לממשק ה-API."
+"תקבל הודעה בדואר אלקטרוני המופיע בפרופיל שלך, כשיושלם העיבוד. בנוסף, תוכל "
+"לחזור לעמוד זה על מנת לראות את סטטוס בקשת הגישה לממשק ה-API."
 
 #. Translators: "platform_name" is the name of this Open edX installation.
 #. "api_support_email_link" is HTML for a link to email the API support staff.
@@ -11651,7 +11965,7 @@ msgstr ""
 
 #: lms/templates/api_admin/terms_of_service.html
 msgid "API Terms of Service"
-msgstr ""
+msgstr "תנאי שימוש ב-API"
 
 #: lms/templates/api_admin/terms_of_service.html
 msgid "Terms of Service for {platform_name} APIs"
@@ -11730,8 +12044,8 @@ msgid ""
 msgstr ""
 "הינך מסכים להשתמש בממשקי ה-API למטרות העברת תוכן שניתן לגשת אליה דרך ממשקי "
 "ה-API בלבד (להלן \"תוכן API\") לאתר האינטרנט, אתר מותאם לנייד, אפליקציה, "
-"בלוג, רשימת תפוצה בדוא\"ל או נכס של המדיה החברתית או לשימוש מסחרי אחר שתיארת"
-" בבקשה לקבלת גישה וש- {platform_name} אישרה על בסיס כל מקרה לגופו. "
+"בלוג, רשימת תפוצה בדואר אלקטרוני או נכס של המדיה החברתית או לשימוש מסחרי אחר"
+" שתיארת בבקשה לקבלת גישה וש- {platform_name} אישרה על בסיס כל מקרה לגופו. "
 "{platform_name} עשויה לנטר את שימושך בממשקי ה-API לתאימות עם התנאים ועלולה "
 "לדחות את גישתך או לסגור את האינטרגרציה שלך באם תנסה לעקוף או לחרוג מהדרישות "
 "והמגבלות שהוגדרו בידי {platform_name}. האפליקציה שלך או כל שימוש מאושר אחר "
@@ -11853,7 +12167,7 @@ msgid ""
 "or mask either your identity or yourApplication's identity when using the "
 "APIs."
 msgstr ""
-"הינך מסכים כי תציית לכל החוקים, התקנות וזכויות צד שלישי (לרבות אך לא מוגבל "
+"אתה מסכים לציית לכל החוקים, התקנות וזכויות צד שלישי (לרבות אך לא מוגבל "
 "לחוקים בנוגע ליבוא או יצוא נתונים או תוכנה, פרטיות, זכויות יוצרים וחוקים "
 "מקומיים); לא תעשה שימוש בממשקי ה-API על מנת לעודד או לקדם פעילות לא חוקית או"
 " הפרת זכויות צד שלישי; לא תפר אף תנאי שירות אחר עם {platform_name}; תקבל "
@@ -11949,15 +12263,15 @@ msgid ""
 " collect and how you may use and share such information (including for "
 "advertising) with {platform_name} and other third parties."
 msgstr ""
-"הינך מסכים לציית לכל חוקי הפרטיות והתקנות הקיימים ולהיות שקוף בכל הנוגע "
+"אתה מסכים לציית לכל חוקי הפרטיות והתקנות הקיימים ולהיות שקוף בכל הנוגע "
 "לאיסוף ושימוש במידע של משתמש הקצה; לספק ולפעול על פי מדיניות פרטיות עבור "
-"האפליקציה שלך המתארת בבירור ובדיוק למשתמשי הקצה שלך מהם פרטי המשתמש שהינך "
+"האפליקציה שלך המתארת בבירור ובדיוק למשתמשי הקצה שלך מהם פרטי המשתמש שאתה "
 "אוסף וכיצד תשתמש במידע כזה ותשתף אותו (לרבות לפרסום) באמצעות {platform_name}"
 " וגורמי צד שלישי אחרים."
 
 #: lms/templates/api_admin/terms_of_service.html
 msgid "Right to Charge"
-msgstr "זכות לגבות"
+msgstr "אישור לחייב/ לחיוב"
 
 #: lms/templates/api_admin/terms_of_service.html
 msgid ""
@@ -12034,7 +12348,7 @@ msgstr ""
 
 #: lms/templates/api_admin/terms_of_service.html
 msgid "Disclaimer of Warranty / Limitation of Liabilities"
-msgstr "כתב ויתור אחריות / הגבלת החבויות"
+msgstr "כתב ויתור התחייבות/ הגבלת התחייבויות"
 
 #: lms/templates/api_admin/terms_of_service.html
 msgid ""
@@ -12284,7 +12598,7 @@ msgstr ""
 
 #: lms/templates/api_admin/catalogs/edit.html
 msgid "Edit {catalog_name}"
-msgstr ""
+msgstr "ערוך {catalog_name}"
 
 #: lms/templates/api_admin/catalogs/edit.html
 #: lms/templates/api_admin/catalogs/list.html
@@ -12293,35 +12607,35 @@ msgstr "הורד CSV"
 
 #: lms/templates/api_admin/catalogs/edit.html
 msgid "Delete this catalog"
-msgstr ""
+msgstr "מחק קטלוג זה"
 
 #: lms/templates/api_admin/catalogs/edit.html
 msgid "Update Catalog"
-msgstr ""
+msgstr "עדכן קטלוג"
 
 #: lms/templates/api_admin/catalogs/list.html
 msgid "Catalogs for {username}"
-msgstr ""
+msgstr "קטלוגים עבור {username}"
 
 #: lms/templates/api_admin/catalogs/list.html
 msgid "Create new catalog:"
-msgstr ""
+msgstr "צור קטלוג חדש:"
 
 #: lms/templates/api_admin/catalogs/list.html
 msgid "Create Catalog"
-msgstr ""
+msgstr "צור קטלוג"
 
 #: lms/templates/api_admin/catalogs/search.html
 msgid "Catalog search"
-msgstr ""
+msgstr "חיפוש קטלוג"
 
 #: lms/templates/api_admin/catalogs/search.html
 msgid "Catalog Search"
-msgstr ""
+msgstr "חיפוש קטלוג"
 
 #: lms/templates/api_admin/catalogs/search.html
 msgid "Enter a username to view catalogs belonging to that user."
-msgstr ""
+msgstr "הזן שם משתמש כדי להציג קטלוגים השייכים לאותו משתמש."
 
 #: lms/templates/calculator/toggle_calculator.html
 msgid "Open Calculator"
@@ -12329,7 +12643,7 @@ msgstr "פתח מחשבון"
 
 #: lms/templates/calculator/toggle_calculator.html
 msgid "Enter equation"
-msgstr ""
+msgstr "הזן משוואה"
 
 #: lms/templates/calculator/toggle_calculator.html
 msgid "Calculator Input Field"
@@ -12379,7 +12693,7 @@ msgstr "עבור מספרים קבועים, ציין פעולת כפל באופ
 
 #: lms/templates/calculator/toggle_calculator.html
 msgid "For affixes, type the number and affix without a space (example: 5c)."
-msgstr "עבור מוּסָפִיות, הקלד מספר ומוספית ללא רווח (לדוגמה: 5c)."
+msgstr "עבור תווים מיוחדים, הקלד מספר ותווית מיוחדת ללא רווח (לדוגמה: 5c)."
 
 #: lms/templates/calculator/toggle_calculator.html
 msgid ""
@@ -12447,11 +12761,11 @@ msgstr "קבועים"
 #. as the percent sign (%) and metric affixes
 #: lms/templates/calculator/toggle_calculator.html
 msgid "Affixes"
-msgstr "מוספיות"
+msgstr "תווים מיוחדים"
 
 #: lms/templates/calculator/toggle_calculator.html
 msgid "Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)"
-msgstr "סימן האחוזים (%) וציוני מידות (d, c, m, u, n, p, k, M, G, T)"
+msgstr "סימן האחוזים (%) ותווים מיוחדים (d, c, m, u, n, p, k, M, G, T)"
 
 #. Translators: This refers to basic mathematical functions such as "square
 #. root"
@@ -12491,7 +12805,7 @@ msgstr "חשב"
 
 #: lms/templates/calculator/toggle_calculator.html
 msgid "Result"
-msgstr ""
+msgstr "תוצאה"
 
 #: lms/templates/ccx/coach_dashboard.html
 msgid "CCX Coach Dashboard"
@@ -12499,7 +12813,7 @@ msgstr "לוח הבקרה של CCX Coach"
 
 #: lms/templates/ccx/coach_dashboard.html
 msgid "Name your CCX"
-msgstr "קרא בשם את CCX שלך"
+msgstr "קרא בשם את ה-CCX שלך"
 
 #: lms/templates/ccx/coach_dashboard.html
 msgid "Create a new Custom Course for edX"
@@ -12788,7 +13102,7 @@ msgstr "על מנת לפתור את הבעיה, על מנהלך השותף לא
 
 #: lms/templates/certificates/server-error.html
 msgid "The institution&#39;s logo."
-msgstr "סמל &#39;המוסד ."
+msgstr "סמל לוגו &#39;המוסד."
 
 #: lms/templates/certificates/server-error.html
 msgid "The institution that is linked to the course."
@@ -12843,7 +13157,7 @@ msgstr "הירשם ל{course_name} | בחר מסלול"
 #: lms/templates/course_modes/choose.html
 #: themes/edx.org/lms/templates/course_modes/choose.html
 msgid "Sorry, there was an error when trying to enroll you"
-msgstr "צר לנו, אירעה שגיאה בתהליך ההרשמה"
+msgstr "מצטערים, אירעה שגיאה בתהליך ההרשמה"
 
 #: lms/templates/course_modes/choose.html
 #: themes/edx.org/lms/templates/course_modes/choose.html
@@ -12863,7 +13177,7 @@ msgid ""
 "qualify for academic credit, advance your career, or strengthen your school "
 "applications."
 msgstr ""
-"היֵה זכאי לקבלת נקודות זכות אקדמיות והדגש את הכישורים החדשים והידע באמצעות "
+"היה זכאי לקבלת נקודות זכות אקדמיות והדגש את הכישורים החדשים והידע באמצעות "
 "תעודה מאומתת. השתמש בהרשאה יקרת ערך זו על מנת להתאים לקבלת נקודות זכות "
 "אקדמיות, לקדם את הקריירה שלך או לחזק את בקשותיך לבתי הספר."
 
@@ -13005,7 +13319,7 @@ msgstr ""
 
 #: lms/templates/courseware/course_about.html
 msgid "You are enrolled in this course"
-msgstr "הינך רשום לקורס זה"
+msgstr "אתה רשום לקורס זה"
 
 #: lms/templates/courseware/course_about.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
@@ -13103,7 +13417,7 @@ msgstr "פרסם בפייסבוק הודעה על הרשמתךלקורס זה"
 #: lms/templates/courseware/course_about_sidebar_header.html
 #: themes/stanford-style/lms/templates/courseware/course_about_sidebar_header.html
 msgid "Email someone to say you've enrolled in this course"
-msgstr "שלח למישהו הודעת דוא\"ל על הרשמתך לקורס זה"
+msgstr "שלח למישהו הודעת דואר אלקטרוני על הרשמתך לקורס זה"
 
 #: lms/templates/courseware/course_navigation.html
 msgid "Course View"
@@ -13131,7 +13445,7 @@ msgstr "הגדר מצב תצוגה מקדימה"
 
 #: lms/templates/courseware/course_navigation.html
 msgid "You are now viewing the course as {i_start}{user_name}{i_end}."
-msgstr ""
+msgstr "אתה צופה כעת בקורס כ-{i_start}{user_name}{i_end}."
 
 #: lms/templates/courseware/course_navigation.html
 msgid "Course Material"
@@ -13139,7 +13453,7 @@ msgstr "חומרי הקורס"
 
 #: lms/templates/courseware/course_updates.html
 msgid "All course updates"
-msgstr ""
+msgstr "כל עדכוני הקורס"
 
 #: lms/templates/courseware/course_updates.html
 msgid "Hide"
@@ -13236,7 +13550,7 @@ msgstr "אינך רשום כרגע לקורס זה. {link_start}הירשם עכ
 
 #: lms/templates/courseware/info.html
 msgid "Welcome to {org}'s {course_name}!"
-msgstr "ברוים הבאים אל {org}של {course_name}!"
+msgstr "ברוכים הבאים אל {org}של {course_name}!"
 
 #: lms/templates/courseware/info.html
 msgid "Resume Course"
@@ -13512,7 +13826,7 @@ msgstr "תעודתך לא הונפקה מאחר ואין לך זהות קיימ
 
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Verify your identity now."
-msgstr ""
+msgstr "אמת את זהותך כעת."
 
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Your {cert_name_short} is Generating"
@@ -13572,7 +13886,7 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Course details"
-msgstr ""
+msgstr "פרטי הקורס"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "{course_number} {course_name} Home Page"
@@ -13628,7 +13942,7 @@ msgid ""
 "Are you sure you want to unenroll from the purchased course %(course_name)s "
 "(%(course_number)s)?"
 msgstr ""
-"האם הינך בטוח שברצונך לבטל את הרשמתך לקורס שרכשת %(course_name)s "
+"האם אתה בטוח שברצונך לבטל את הרשמתך לקורס שרכשת %(course_name)s "
 "(%(course_number)s)?"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
@@ -13644,7 +13958,7 @@ msgstr "הסכומים ששילמת לא יוחזרו לך."
 msgid ""
 "Are you sure you want to unenroll from %(course_name)s (%(course_number)s)?"
 msgstr ""
-"האם הינך בטוח שברצונך לבטל את הרשמתך ל-%(course_name)s (%(course_number)s)?"
+"האם אתה בטוח שברצונך לבטל את הרשמתך ל-%(course_name)s (%(course_number)s)?"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #, python-format
@@ -13652,7 +13966,7 @@ msgid ""
 "Are you sure you want to unenroll from the verified %(cert_name_long)s track"
 " of %(course_name)s (%(course_number)s)?"
 msgstr ""
-"האם הינך בטוח שברצונך לבטל את הרשמתך %(cert_name_long)s מהמסלול המאומת של "
+"האם אתה בטוח שברצונך לבטל את הרשמתך %(cert_name_long)s מהמסלול המאומת של "
 "%(course_name)s (%(course_number)s)?"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
@@ -13668,7 +13982,7 @@ msgstr "הגדרות דואר אלקטרוני"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Related Programs"
-msgstr ""
+msgstr "תכניות קשורות"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Verification not yet complete."
@@ -13832,27 +14146,29 @@ msgstr "אירעה שגיאה בעסקה זו. לקבלת עזרה, צור קש
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid "Verification Status: Approved"
-msgstr ""
+msgstr "מצב אימות: מאושר"
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid ""
 "Your edX Verification is reviewed and approved. Your verification status is "
 "good for one year after submission."
 msgstr ""
+"אישור האימות שלך ב-edX נבחן ואושר. מצב האישור שלך תקף לשנה אחת לאחר הגשתו."
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid "Verification Status: Pending"
-msgstr ""
+msgstr "מצב אימות: בהמתנה"
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid ""
 "Your edX Verification is pending. Your verification photos have been "
 "submitted and will be reviewed shortly."
 msgstr ""
+"האימות שלך ב-edX נמצא בהמתנה. תמונות האימות שלך הוגשו והן יבדקו בקרוב."
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid "Verification Status: Expired"
-msgstr ""
+msgstr "מצב אימות: פג תוקף"
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid ""
@@ -13860,6 +14176,8 @@ msgid ""
 "have to submit a new photo of yourself and your government-issued photo ID "
 "before the course ends."
 msgstr ""
+"תוקף האימות שלך ב-edX פג. כדי לקבל תעודה מאומתת, עליך להגיש לפני תום הקורס "
+"תמונה חדשה שלך ושל תעודה מזהה עם תמונה שהונפקה על ידי הממשלה.   "
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid "Resubmit Verification"
@@ -14031,7 +14349,7 @@ msgstr "הדגש מידע חשוב בכדי לעבור עליו בהמשך הק
 msgid ""
 "Get started by making a note in something you just read, like "
 "{section_link}."
-msgstr "תתחיל ביצירה של סיכום קצר על משהו שקראת עכשיו לדוגמא: {section_link}."
+msgstr "תתחיל ביצירה של סיכום קצר על משהו שקראת עכשיו לדוגמה: {section_link}."
 
 #: lms/templates/edxnotes/toggle_notes.html
 msgid "Hide notes"
@@ -14050,7 +14368,7 @@ msgid ""
 "To get started, please visit https://{site_name}. The login information for "
 "your account follows."
 msgstr ""
-"בכדי להתחיל, אנא בקר ב-https://{site_name}. המידע הדרוש להתחברות מצורף לעיל."
+"כדי להתחיל, אנא בקר ב-https://{site_name}. המידע הדרוש להתחברות מצורף לעיל."
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid "email: {email}"
@@ -14070,7 +14388,7 @@ msgstr "בברכה חמה, צוות {course_name}"
 
 #: lms/templates/emails/activation_email.txt
 msgid "Thank you for creating an account with {platform_name}!"
-msgstr ""
+msgstr "תודה רבה על שיצרת חשבון באמצעות {platform_name}!"
 
 #: lms/templates/emails/activation_email.txt
 msgid ""
@@ -14079,6 +14397,9 @@ msgid ""
 "following link. If that doesn't work, copy and paste the link into your "
 "browser's address bar."
 msgstr ""
+"רק עוד צעד אחד לפני שתוכל להירשם לקורס: עליך להפעיל את החשבון "
+"{platform_name}. כדי להפעיל את החשבון, לחץ על הקישור הבא. אם הקישור אינו "
+"עובד, העתק והדבק אותו לתוך שורת הכתובת של הדפדפן שלך."
 
 #: lms/templates/emails/activation_email.txt
 msgid ""
@@ -14087,6 +14408,8 @@ msgid ""
 "to this email message. Check the help section of the {platform_name} "
 "website."
 msgstr ""
+"אם לא יצרת חשבון, אין צורך לעשות דבר; לא תקבל עוד הודעות מאיתנו. אם אתה זקוק"
+" לעזרה, בבקשה אל תגיב להודעה זו. בדוק את קטע העזרה באתר {platform_name}."
 
 #: lms/templates/emails/activation_email_subject.txt
 msgid "Activate Your {platform_name} Account"
@@ -14280,7 +14603,7 @@ msgid ""
 "(4) You should be able to click on 'view course' button or see your course "
 "on your student dashboard at {url}"
 msgstr ""
-"(4) הינך אמור ללחוץ על 'צפה בקורס' או לראות את הקורס בלוח הבקרה שלך ב-{url}"
+"(4) אתה אמור ללחוץ על 'צפה בקורס' או לראות את הקורס בלוח הבקרה שלך ב-{url}"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
@@ -14329,7 +14652,7 @@ msgid ""
 "assistance, check the help section of the {platform_name} web site."
 msgstr ""
 "אם לא ביקשת זאת, אין צורך לעשות דבר; לא תקבל עוד הודעות מאיתנו. נא לא להגיב "
-"להודעה זו; אם הינך זקוק לעזרה, בדוק את עמוד העזרה באתר {platform_name}. "
+"להודעה זו; אם אתה זקוק לעזרה, בדוק את עמוד העזרה באתר {platform_name}. "
 
 #: lms/templates/emails/email_change_subject.txt
 msgid "Request to change {platform_name} account e-mail"
@@ -14361,7 +14684,7 @@ msgid ""
 "field."
 msgstr ""
 "כדי להשלים את הרשמתך, נא בקר ב-{registration_url} ומלא את טופס ההרשמה. וודא "
-"כי הינך משתמש ב-{email_address} בשדה כתובת הדואר האלקטרוני."
+"כי אתה משתמש ב-{email_address} בשדה כתובת הדואר האלקטרוני."
 
 #: lms/templates/emails/enroll_email_allowedmessage.txt
 msgid ""
@@ -14584,8 +14907,8 @@ msgid ""
 "name from {old_name} to {new_name}. If you need further assistance, please "
 "e-mail the course staff at {email}."
 msgstr ""
-"אנו מתנצלים, צוות הקורס שלנו לא אישר את בקשתך לשינוי שמך מ-{old_name} "
-"ל-{new_name}. אם הינך זקוק לעזרה נוספת, נא שלח הודעת דואר אלקטרוני לצוות "
+"מצטערים, צוות הקורס שלנו לא אישר את בקשתך לשינוי שמך מ-{old_name} "
+"ל-{new_name}. אם אתה זקוק לעזרה נוספת, נא שלח הודעת דואר אלקטרוני לצוות "
 "הקורס ב-{email}"
 
 #: lms/templates/emails/remove_beta_tester_email_message.txt
@@ -14610,7 +14933,7 @@ msgstr "הוסרת ממבחן הבטא עבור קורס {course_name}"
 msgid ""
 "We have successfully verified your identity for the {assessment} assessment "
 "in the {course_name} course."
-msgstr "אימתנו בהצלחה את ההערכתלך {assessment} בקורס {course_name}."
+msgstr "אימתנו בהצלחה את הערכתך {assessment} בקורס {course_name}."
 
 #: lms/templates/emails/reverification_processed.txt
 msgid ""
@@ -14695,16 +15018,16 @@ msgid ""
 "Our system indicates that you are trying to access this {platform_name} "
 "course from a country or region in which it is not currently available."
 msgstr ""
-"המערכת שלנו מראה כי הינך מנסה להיכנס לקורס {platform_name} זה ממדינה או אזור"
-" בו שירות זה אינו זמין כעת. "
+"המערכת שלנו מראה כי אתה מנסה להיכנס לקורס {platform_name} זה ממדינה או אזור "
+"בו שירות זה אינו זמין כעת. "
 
 #: lms/templates/embargo/default_enrollment.html
 msgid ""
 "Our system indicates that you are trying to enroll in this {platform_name} "
 "course from a country or region in which it is not currently available."
 msgstr ""
-"המערכת שלנו מראה כי הינך מנסה להירשם לקורס {platform_name} זה ממדינה או אזור"
-" בו שירות זה אינו זמין כעת. "
+"המערכת שלנו מראה כי אתה מנסה להירשם לקורס {platform_name} זה ממדינה או אזור "
+"בו שירות זה אינו זמין כעת. "
 
 #: lms/templates/enrollment/course_enrollment_message.html
 msgid "Enrollment Successful"
@@ -14886,6 +15209,8 @@ msgid ""
 "Certificates. You do not need to do this if you have set the certificate "
 "mode to on-demand generation."
 msgstr ""
+"כאשר אתה מוכן ליצור תעודות לקורס שלך, לחץ על 'צור תעודות'. אינך צריך לעשות "
+"זאת אם הגדרת את מצב התעודה ליצירה לפי דרישה."
 
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
@@ -14913,10 +15238,12 @@ msgid ""
 "To regenerate certificates for your course, choose the learners who will "
 "receive regenerated certificates and click Regenerate Certificates."
 msgstr ""
+"כדי ליצור מחדש תעודות עבור הקורס שלך, בחר את הלומדים שיקבלו תעודות שנוצרו "
+"מחדש ולחץ על 'צור תעודות מחדש'."
 
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 msgid "Choose learner types for regeneration"
-msgstr ""
+msgstr "בחר סוגי לומדים ליצירה מחדש"
 
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 msgid ""
@@ -14937,7 +15264,7 @@ msgstr "היסטוריית יצירת תעודות"
 
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 msgid "Task name"
-msgstr ""
+msgstr "שם המשימה"
 
 #: lms/templates/instructor/instructor_dashboard_2/certificates.html
 msgid "SET CERTIFICATE EXCEPTIONS"
@@ -15015,7 +15342,8 @@ msgstr "חתכי ציון:"
 msgid ""
 "View detailed Git import logs for this course {link_start}by clicking "
 "here{link_end}."
-msgstr "צפה בלוגי יבוא מפורטים מ-GIT {link_start} בלחיצה כאן{link_end}."
+msgstr ""
+"צפה ביבוא יומני אירועים מפורטים מ-GIT {link_start} בלחיצה כאן{link_end}."
 
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
 msgid "Course Warnings"
@@ -15114,7 +15442,7 @@ msgid ""
 "enter the location of the problem (from its Staff Debug Info)."
 msgstr ""
 "על מנת ליצור קובץ CSV המציין את כל תשובות הסטודנט לבעיה נתונה, הזן את מיקום "
-"הבעיה (ממידע אודות ניפוי הבאגים של הצוות)."
+"הבעיה (ממידע אודות תיקון הבאגים של הצוות)."
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid "Problem location: "
@@ -15197,6 +15525,9 @@ msgid ""
 " or email these links for direct access. Copies of links expire within 5 "
 "minutes."
 msgstr ""
+"{strong_start}שים לב{strong_end}: כדי לשמור על נתוני הסטודנט מאובטחים, אינך "
+"יכול לשמור או לשלוח בדואר אלקטרוני קישורים לגישה ישירה. עותקים של קישורים "
+"אלה יפוגו לאחר 5 דקות."
 
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Enrollment Codes"
@@ -15301,7 +15632,7 @@ msgstr "הגש מחדש חשבונית"
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid ""
 "Create a .csv file that contains enrollment information for your course."
-msgstr "צור קובץCSV המכיל פרטי הרשמה עבור הקורס שלך."
+msgstr "צור קובץ CSV המכיל פרטי הרשמה עבור הקורס שלך."
 
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Create Enrollment Report"
@@ -15335,6 +15666,9 @@ msgid ""
 " reports that you save outside of this page or that you send or receive in "
 "email expire after five minutes."
 msgstr ""
+"{strong_start}שים לב{strong_end}: כדי לעזור ולהגן על נתוני הלומד, תוקף "
+"הקישורים לדוחות אלה ששמרת מחוץ לעמוד זה, ששלחת או שקיבלת בדואר אלקטרוני יפוג"
+" לאחר 5 דקות."
 
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Coupon Code List"
@@ -16135,7 +16469,7 @@ msgstr "לעצמי"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Staff and Administrators"
-msgstr ""
+msgstr "צוות ומנהלי מערכת"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "All Learners"
@@ -16147,7 +16481,7 @@ msgstr "קבוצת למידה:"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "(Learners not explicitly assigned to a cohort)"
-msgstr ""
+msgstr "(לומדים שלא הוקצו במפורש למחזור לימודים)"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Subject: "
@@ -16155,7 +16489,7 @@ msgstr "נושא:"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "(Maximum 128 characters)"
-msgstr ""
+msgstr "(מקסימום 128 תווים)"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Message:"
@@ -16168,6 +16502,9 @@ msgid ""
 "yourself first, so that you can preview the formatting and make sure "
 "embedded images and links work correctly."
 msgstr ""
+"אנו ממליצים לא לשלוח ללומדים יותר מהודעת דואר אלקטרוני אחת בשבוע. לפני שתשלח"
+" את ההודעה, בדוק את הטקסט בקפידה ושלח אותה קודם כל  לעצמך, כך שתוכל לראות את"
+" העיצוב בתצוגה מוקדמת ולוודא שהתמונות המוטבעות והקישורים עובדים כהלכה."
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "CAUTION!"
@@ -16178,6 +16515,8 @@ msgid ""
 "When you select Send Email, your email message is added to the queue for "
 "sending, and cannot be cancelled."
 msgstr ""
+"בעת הבחירה ב'שלח הודעת דואר אלקטרוני', הודעת הדואר אלקטרוני נוספת לתור "
+"לשליחה ולא ניתן לבטלה."
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Send Email"
@@ -16197,21 +16536,22 @@ msgstr "היסטוריית משימות דוא\"ל"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "To see the content of previously sent emails, click this button:"
-msgstr ""
+msgstr "כדי לצפות בתוכן כל הודעות הדואר אלקטרוני שנשלחו, לחץ על לחצן זה: "
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Show Sent Email History"
-msgstr ""
+msgstr "הצג היסטוריה של דוא\"ל שנשלח"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "To read a sent email message, click its subject."
-msgstr ""
+msgstr "כדי לקרוא הודעת דואר אלקטרוני שנשלחה, לחץ על שורת הנושא."
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid ""
 "To see the status for all email tasks submitted for this course, click this "
 "button:"
 msgstr ""
+"כדי לצפות בדוח מצב לכל משימות דאר אלקטרוני שהוגשו לקורס זה, לחץ על לחצן זה:"
 
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "Show Email Task History"
@@ -16386,7 +16726,7 @@ msgstr "הצג היסטוריית משימות רקע עבור בעיה"
 
 #: lms/templates/learner_dashboard/program_details.html
 msgid "Program Details"
-msgstr ""
+msgstr "פרטי תכנית"
 
 #: lms/templates/modal/_modal-settings-language.html
 msgid "Change Preferred Language"
@@ -16535,8 +16875,7 @@ msgid ""
 "You have finished learning to grade, which means that you are now ready to "
 "start grading."
 msgstr ""
-"סיימת ללמוד כיצד לתת ציונים, המשמעות היא שהינך  מוכן עכשיו להתחיל לתת "
-"ציונים."
+"סיימת ללמוד כיצד לתת ציונים, המשמעות היא שאתה  מוכן עכשיו להתחיל לתת ציונים."
 
 #: lms/templates/peer_grading/peer_grading_problem.html
 msgid "Start Grading!"
@@ -16579,7 +16918,7 @@ msgid ""
 "submission is not addressed to the question or is incorrect, you should give"
 " it a score of zero and accompanying feedback instead of flagging it."
 msgstr ""
-"הינך עומד לסמן הגשה. עליך לוודא כי אתה מסמן רק הגשה הכוללת תוכן בעל אופי "
+"אתה עומד לסמן הגשה. עליך לוודא כי אתה מסמן רק הגשה הכוללת תוכן בעל אופי "
 "מפורש, פוגעני או (אם נחשד) תוכן מועתק. אם ההגשה הזו אינה עונה לשאלה או אינה "
 "נכונה, עליך לתת לה ציון אפס וללוות אותה במשוב במקום לסמן אותה בדגל. "
 
@@ -16605,15 +16944,15 @@ msgstr ""
 
 #: lms/templates/provider/authorize.html
 msgid "Read your user ID"
-msgstr ""
+msgstr "קרא את מזהה המשתמש שלך"
 
 #: lms/templates/provider/authorize.html
 msgid "Read your user profile"
-msgstr ""
+msgstr "קרא את פרופיל המשתמש שלך"
 
 #: lms/templates/provider/authorize.html
 msgid "Read your email address"
-msgstr ""
+msgstr "קרא את כתובת הדואר האלקטרוני שלך"
 
 #: lms/templates/provider/authorize.html
 msgid "Read the list of courses in which you are a staff member."
@@ -16625,7 +16964,7 @@ msgstr "קרא את רשימת הקורסים שבה אתה המדריך."
 
 #: lms/templates/provider/authorize.html
 msgid "To see if you are a global staff user"
-msgstr ""
+msgstr "לראות אם אתה משתמש צוות גלובלי"
 
 #: lms/templates/provider/authorize.html
 msgid "Manage your data: {permission}"
@@ -16633,7 +16972,7 @@ msgstr "נהל את נתוניך: {permission}"
 
 #: lms/templates/registration/activate_account_notice.html
 msgid "You're almost there!"
-msgstr ""
+msgstr "אתה כמעט שם!"
 
 #: lms/templates/registration/activate_account_notice.html
 msgid ""
@@ -16642,14 +16981,17 @@ msgid ""
 "{email_start}{email}{email_end} with instructions for activating your "
 "account. If you don't receive this message, check your spam folder."
 msgstr ""
+"רק עוד צעד אחד: לפני שתירשם לקורס, עליך להפעיל את חשבונך. שלחנו הודעת דואר "
+"אלקטרוני אל  {email_start}{email}{email_end} עם הוראות להפעלת החשבון. אם "
+"אינך מקבל הודעה זו, בדוק את תיקיית דואר הזבל שלך."
 
 #: lms/templates/registration/activation_complete.html
 msgid "Account Activated"
-msgstr ""
+msgstr "החשבון הופעל"
 
 #: lms/templates/registration/activation_complete.html
 msgid "Account already active"
-msgstr ""
+msgstr "החשבון כמעט פעיל"
 
 #: lms/templates/registration/activation_invalid.html
 msgid "Activation Invalid"
@@ -16661,10 +17003,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}."
 
 #: lms/templates/registration/activation_invalid.html
 msgid "Return to the {link_start}home page{link_end}."
-msgstr ""
+msgstr "חזור ל {link_start}עמוד הבית{link_end}."
 
 #: lms/templates/registration/password_reset_complete.html
 msgid "Your Password Reset is Complete"
@@ -16799,7 +17144,7 @@ msgid ""
 "There was an error in your date input.  It should be formatted as YYYY-MM-DD"
 msgstr ""
 "אירעה שגיאה בקליטת התאריך שלך. על התאריך להיות בפורמט \n"
-"שששש/חח/יי"
+"YYYY-MM-DD"
 
 #: lms/templates/shoppingcart/download_report.html
 msgid "These reports are delimited by start and end dates."
@@ -17181,7 +17526,7 @@ msgstr ""
 #: lms/templates/static_templates/privacy.html
 #: lms/templates/static_templates/tos.html
 msgid "This page left intentionally blank. Feel free to add your own content."
-msgstr ""
+msgstr "עמוד זה ריק באופן מכוון. אל תהסס להוסיף את התוכן שלך."
 
 #: lms/templates/static_templates/embargo.html
 msgid ""
@@ -17389,11 +17734,11 @@ msgstr "עם מי ניתן ליצור קשר במידה ויש לי שאלות?"
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
-"במידה ויש לך שאלות לגבי הקורס או טופס זה, תוכל ליצור איתנו  קשר באמצעות <a "
-"href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"במידה ויש לך שאלות לגבי הקורס או טופס זה, תוכל ליצור איתנו קשר באמצעות "
+"{link_start}{mail_to_link}{link_end}."
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -17521,11 +17866,11 @@ msgstr "פורטל השותפים של edX"
 msgid ""
 "Browse recently launched courses and see what's new in your favorite "
 "subjects."
-msgstr ""
+msgstr "עיין בקורסים שהושקו לאחרונה וראה מה חדש בנושאים האהובים עליך."
 
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Explore New Courses"
-msgstr ""
+msgstr "חקור קורסים חדשים"
 
 #: themes/edx.org/lms/templates/footer.html
 msgid "Page Footer"
@@ -17541,6 +17886,8 @@ msgid ""
 "the edX and Open EdX logos are registered trademarks or trademarks of edX "
 "Inc."
 msgstr ""
+"© 2016 edX Inc.‎ כל הזכויות שמורות, למעט כשמצוין אחרת‏. EdX‏, Open edX וסמלי"
+" הלוגו edX ו-Open EdX הם סימני מסחר רשומים או סימני מסחר של edX Inc.‎"
 
 #: themes/edx.org/lms/templates/header.html
 #: themes/red-theme/lms/templates/header.html
@@ -17561,80 +17908,82 @@ msgstr ""
 
 #: themes/example/lms/templates/header.html
 msgid "Create Account"
-msgstr ""
+msgstr "צור חשבון"
 
 #: themes/example/lms/templates/courseware/course_about.html
 msgid "Want to purchase this course for a group?"
-msgstr ""
+msgstr "רוצה לרכוש קורס זה עבור קבוצה?"
 
 #: themes/example/lms/templates/courseware/course_about.html
 msgid ""
 "You can purchase enrollment codes for this course to distribute to your team"
-msgstr ""
+msgstr "ניתן לרכוש קודי רישום עבור קורס זה כדי להפיץ לצוות שלך"
 
 #: themes/example/lms/templates/courseware/course_about.html
 msgid "Purchase for a Group"
-msgstr ""
+msgstr "רכוש עבור קבוצה"
 
 #: themes/example/lms/templates/courseware/course_about.html
 msgid ""
 "Bulk discounts may apply for groups larger than 10. Contact "
 "{link_start}harvardxplus@harvard.edu{link_end} for more information."
 msgstr ""
+"ייתכן שיחולו הנחות על כמות גדולה לקבוצות גדולות מ-10. צור קשר עם "
+"{link_start}harvardxplus@harvard.edu{link_end} לקבלת מידע נוסף."
 
 #: themes/example/lms/templates/courseware/course_about.html
 msgid "Email Us"
-msgstr ""
+msgstr "שלח לנו דואר אלקטרוני"
 
 #: themes/example/lms/templates/courseware/courses.html
 msgid "Lorem ipsum dolor sit amet."
-msgstr ""
+msgstr "Lorem ipsum dolor sit amet."
 
 #: themes/example/lms/templates/static_templates/about.html
 msgid "About Us"
-msgstr ""
+msgstr "אודותינו"
 
 #: themes/example/lms/templates/static_templates/contact.html
 msgid "Thank you for your inquiry"
-msgstr ""
+msgstr "תודה על שאלתך"
 
 #: themes/example/lms/templates/static_templates/faq.html
 msgid "FAQ's"
-msgstr ""
+msgstr "שאלות נפוצות"
 
 #: themes/example/lms/templates/static_templates/faq.html
 msgid "General FAQs"
-msgstr ""
+msgstr "שאלות נפוצות כלליות"
 
 #: themes/example/lms/templates/static_templates/faq.html
 #: themes/example/lms/templates/static_templates/honor.html
 #: themes/example/lms/templates/static_templates/privacy.html
 #: themes/example/lms/templates/static_templates/tos.html
 msgid "Lorem ipsum dolor sit amet"
-msgstr ""
+msgstr "Lorem ipsum dolor sit amet"
 
 #: themes/example/lms/templates/static_templates/faq.html
 msgid "Academic Planning"
-msgstr ""
+msgstr "תכנון אקדמי"
 
 #: themes/example/lms/templates/static_templates/faq.html
 #: themes/example/lms/templates/static_templates/honor.html
 #: themes/example/lms/templates/static_templates/privacy.html
 #: themes/example/lms/templates/static_templates/tos.html
 msgid "Back to top"
-msgstr ""
+msgstr "חזרה למעלה"
 
 #: themes/example/lms/templates/static_templates/faq.html
 msgid "Registration"
-msgstr ""
+msgstr "רישום"
 
 #: themes/example/lms/templates/static_templates/faq.html
 msgid "Finances"
-msgstr ""
+msgstr "כספים"
 
 #: themes/example/lms/templates/student_account/login_and_register.html
 msgid "Sign in or Create Account"
-msgstr ""
+msgstr "היכנס או צור חשבון"
 
 #. Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'.
 #. Please do not translate any of these trademarks and company names.
@@ -18293,7 +18642,7 @@ msgstr "מתווה קורס"
 #: cms/templates/course_outline.html
 msgid ""
 "This course was created as a re-run. Some manual configuration is needed."
-msgstr "קורס זה נוצר כמחזור לימודים חדש. דרושות הגדרות ידניות מסוימות."
+msgstr "קורס זה נוצר כמחזור לימודים חדש. דרושות תצורה ידנית מסוימת."
 
 #: cms/templates/course_outline.html
 msgid ""
@@ -18579,7 +18928,7 @@ msgstr ""
 
 #: cms/templates/edit-tabs.html cms/templates/howitworks.html
 msgid "close modal"
-msgstr "סגור מודל"
+msgstr "סגור חלונית שיחה"
 
 #: cms/templates/error.html
 msgid "Internal Server Error"
@@ -18676,7 +19025,7 @@ msgid ""
 "information."
 msgstr ""
 "{em_start}זהירות:{em_end} כאשר הינך מייצא קורס, מידע כגון מפתחות MATLAB API,"
-" דרכוני LTI, מחרוזות אסימונים סודיות להערות, וכתובות URL לאחסון ,הערות "
+" passports LTI, מחרוזות אסימונים סודיות להערות, וכתובות URL לאחסון ,הערות "
 "נכללות במידע המיוצא. אם קבצים אלו משותפים, יתכן ומשותף מידע סודי או מותנה "
 "רישיון."
 
@@ -18703,7 +19052,7 @@ msgstr "מידע {em_start}המיוצא עם{em_end} הקורס שלך"
 #: cms/templates/export.html
 msgid ""
 "Values from Advanced Settings, including MATLAB API keys and LTI passports"
-msgstr "ערכים מהגדרות מתקדמות, כולל מפתחות API MATLAB ודרכוני LTI."
+msgstr "ערכים מהגדרות מתקדמות, כולל מפתחות API MATLAB ו-passports LTI."
 
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
@@ -18802,9 +19151,9 @@ msgid ""
 "course team information, is not exported."
 msgstr ""
 "תוכן ומבנה הקורס (כולל פרקים, תתי-פרקים ויחידות). ערכים אחרים מהגדרות "
-"מתקדמות כולל מפתחות MATLAB API ודרכוני LTI מיוצאים גם כן. מידע אחר כולל מידע"
-" אישי של הסטודנט, מידע על תקנון ציונים, מידע על פורום הדיונים, הגדרות קורס "
-"וצוות הקורס אינו מיוצא."
+"מתקדמות כולל מפתחות MATLAB API ו-passports LTI מיוצאים גם כן. מידע אחר כולל "
+"מידע אישי של הסטודנט, מידע על תקנון ציונים, מידע על פורום הדיונים, הגדרות "
+"קורס וצוות הקורס אינו מיוצא."
 
 #. Translators: ".tar.gz" is a file extension, and should not be translated
 #: cms/templates/export.html
@@ -19225,8 +19574,8 @@ msgid ""
 "your library until the import operation has completed."
 msgstr ""
 "לתהליך הייבוא חמישה שלבים. במהלך שני השלבים הראשונים, עליך להישאר בעמוד. "
-"ניתן לעזוב את העמוד לאחר השלמת שלב הפריקה. יחד עם זאת, אנו ממליצים כי לא "
-"תבצע שינויים חשובים בספרייתך עד להשלמת פעולת הייבוא.   "
+"ניתן לעזוב את העמוד לאחר השלמת שלב חילוץ הקובץ. יחד עם זאת, אנו ממליצים כי "
+"לא תבצע שינויים חשובים בספרייתך עד להשלמת פעולת הייבוא.   "
 
 #: cms/templates/import.html
 msgid ""
@@ -19258,8 +19607,8 @@ msgid ""
 "your course until the import operation has completed."
 msgstr ""
 "לתהליך הייבוא חמישה שלבים. במהלך שני השלבים הראשונים, עליך להישאר בעמוד. "
-"ניתן לעזוב את העמוד לאחר השלמת שלב הפריקה. יחד עם זאת, אנו ממליצים כי לא "
-"תבצע שינויים חשובים בקורס שלך עד להשלמת פעולת הייבוא.   "
+"ניתן לעזוב את העמוד לאחר השלמת שלב חילוץ הקובץ. יחד עם זאת, אנו ממליצים כי "
+"לא תבצע שינויים חשובים בקורס שלך עד להשלמת פעולת הייבוא.   "
 
 #: cms/templates/import.html
 msgid "Select a .tar.gz File to Replace Your Library Content"
@@ -19299,7 +19648,7 @@ msgstr "מעביר את הקובץ שלך לשרתים שלנו"
 
 #: cms/templates/import.html
 msgid "Unpacking"
-msgstr "פריקה"
+msgstr "חילוץ קובץ"
 
 #: cms/templates/import.html
 msgid ""
@@ -19596,9 +19945,9 @@ msgid ""
 "this page or {link_start}refresh it{link_end} to update the course list. The"
 " new course will need some manual configuration."
 msgstr ""
-"הקורס החדש יתווסף לרשימת הקורסים שלך תוך 10-5 דקות. חזור לעמוד זה או "
+"הקורס החדש יתווסף לרשימת הקורסים שלך תוך 5-10 דקות. חזור לעמוד זה או "
 "{link_start}רענן אותו{link_end}על מנת לעדכן את רשימת הקורסים. יהיה צורך "
-"במספר הגדרות ידניות בקורס החדש."
+"במספר תצורות ידניות בקורס החדש."
 
 #. Translators: This is a status message for the course re-runs feature.
 #. When a course admin indicates that a course should be re-run, the system
@@ -20717,7 +21066,7 @@ msgstr "הגדרות עבור כשירות לקבלת נקודות זכות בק
 
 #: cms/templates/settings_graders.html
 msgid "Minimum Credit-Eligible Grade:"
-msgstr ""
+msgstr "דירוג מינימלי לזכאות לקבלת נקודות זכות:"
 
 #: cms/templates/settings_graders.html
 msgid "Must be greater than or equal to the course passing grade"
@@ -20761,6 +21110,8 @@ msgid ""
 "course is pass/fail or graded by letter, and to establish the thresholds for"
 " each grade."
 msgstr ""
+"ניתן להשתמש בסליידר שמתחת לטווח הציון הכללי להגדיר אם הקורס שלך הוא עובר/לא "
+"עובר או עם ציון על פי טווחים, ולקבוע את הסף עבור כל ציון. "
 
 #: cms/templates/settings_graders.html
 msgid ""
@@ -21132,7 +21483,7 @@ msgstr "עזרה מקוונת לפי הקשר"
 
 #: cms/templates/widgets/metadata-edit.html
 msgid "Launch Latex Source Compiler"
-msgstr ""
+msgstr "הפעלת מהדר מקור LaTeX"
 
 #: cms/templates/widgets/problem-edit.html
 msgid "Heading"
@@ -21249,10 +21600,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "לא נעשו שינויים. אין שום דבר לשמור."
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "בחרו אפשרות"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "שם קצר למאמר"
diff --git a/conf/locale/he/LC_MESSAGES/djangojs.mo b/conf/locale/he/LC_MESSAGES/djangojs.mo
index ae187309af..b6919119de 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 a49b6a2e52..c717442fc2 100644
--- a/conf/locale/he/LC_MESSAGES/djangojs.po
+++ b/conf/locale/he/LC_MESSAGES/djangojs.po
@@ -60,8 +60,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-09-07 13:21+0000\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-21 12:37+0000\n"
 "Last-Translator: qualityalltext <quality@alltext.co.il>\n"
 "Language-Team: Hebrew (http://www.transifex.com/open-edx/edx-platform/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -1376,12 +1376,14 @@ msgid ""
 "required http:// prefix?"
 msgstr ""
 
+#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
+#. Translators: this is a message from the raw HTML editor displayed in the
+#. browser when a user needs to edit HTML
+#: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: cms/templates/js/course-instructor-details.underscore
 #: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
-msgstr "כותרת"
+msgstr ""
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -1818,7 +1820,6 @@ msgid ""
 msgstr ""
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr ""
 
@@ -4465,8 +4466,8 @@ 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 cms/static/coffee/src/main.js
 msgid "Studio's having trouble saving your work"
@@ -4500,11 +4501,11 @@ msgstr "קישור זה ייפתח בחלון/לשונית דפדפן חדש/ה"
 
 #: cms/static/js/base.js
 msgid "This link will open in a modal window"
-msgstr "קישור זה יפתח בחלון חדש"
+msgstr "קישור זה יפתח בחלונית שיחה"
 
 #: cms/static/js/certificates/collections/certificates.js
 msgid "Could not parse certificate JSON. %(message)s"
-msgstr "לא ניתן לפצל JSON של תעודה. %(message)s"
+msgstr "לא ניתן לעבד JSON של תעודה. %(message)s"
 
 #: cms/static/js/certificates/models/certificate.js
 msgid "Certificate name is required."
@@ -4577,7 +4578,7 @@ msgstr "אבגדהוזחטיכלמנסעפצקרשת"
 
 #: cms/static/js/factories/export.js
 msgid "There has been an error while exporting."
-msgstr "קרתה שגיאה במהלך הייצוא."
+msgstr "אירעה שגיאה במהלך הייצוא."
 
 #: cms/static/js/factories/export.js
 msgid ""
@@ -4626,31 +4627,31 @@ msgstr "עבור לעמוד הקורס הראשי"
 
 #: cms/static/js/factories/export.js
 msgid "The raw error message is:"
-msgstr "הודעת השגיאה הגולמית היא:"
+msgstr "הודעת השגיאה היא:"
 
 #: cms/static/js/factories/export.js
 msgid "There has been an error with your export."
-msgstr "קרתה שגיאה בייצוא שלך. "
+msgstr "אירעה שגיאה בייצוא שלך. "
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while importing the new library to our database."
-msgstr "קרתה שגיאה במהלך יבוא הספרייה החדשה לבסיס הנתונים שלנו."
+msgstr "אירעה שגיאה במהלך יבוא הספרייה החדשה לבסיס הנתונים שלנו."
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while importing the new course to our database."
-msgstr "קרתה שגיאה במהלך יבוא הקורס החדש לבסיס הנתונים שלנו."
+msgstr "אירעה שגיאה במהלך יבוא הקורס החדש לבסיס הנתונים שלנו."
 
 #: cms/static/js/factories/import.js
 msgid "There was an error during the upload process."
-msgstr "קרתה שגיאה במהלך תהליך העלאת הנתונים."
+msgstr "אירעה שגיאה במהלך תהליך העלאת הנתונים."
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while unpacking the file."
-msgstr "קרתה שגיאה בהורדת הקובץ."
+msgstr "אירעה שגיאה בחילוץ הקובץ."
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while verifying the file you submitted."
-msgstr "קרתה שגיאה בזמן אימות הקובץ שהגשת."
+msgstr "אירעה שגיאה בזמן אימות הקובץ שהגשת."
 
 #: cms/static/js/factories/import.js
 msgid "Choose new file"
@@ -4713,11 +4714,11 @@ msgstr "הצג הגדרות מיושנות"
 #: cms/static/js/factories/textbooks.js
 #: cms/static/js/views/pages/group_configurations.js
 msgid "You have unsaved changes. Do you really want to leave this page?"
-msgstr "ישנם שינויים שלא נשמרו. האם אתה בטוח שברצונך לעזוב דף זה?"
+msgstr "ישנם שינויים שלא נשמרו. האם אתה בטוח שברצונך לעזוב עמוד זה?"
 
 #: cms/static/js/maintenance/force_publish_course.js
 msgid "Internal Server Error."
-msgstr ""
+msgstr "שגיאת שרת פנימית."
 
 #. Translators: This is the status of a video upload that is queued
 #. waiting for other uploads to complete
@@ -4851,7 +4852,7 @@ msgstr "אנא הוסף פרק אחד לפחות"
 
 #: cms/static/js/models/textbook.js
 msgid "All chapters must have a name and asset"
-msgstr "לכל הפרקים חייב להיות שם וערך"
+msgstr "לכל הפרקים חייב להיות שם ומדיה"
 
 #: cms/static/js/models/uploads.js
 msgid ""
@@ -4898,11 +4899,11 @@ msgstr "חובה לקבל {0} "
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be greater than or equal to {1}"
-msgstr ""
+msgstr "{0} חייב להיות גדול או שווה ל-{1}"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be less than or equal to {1}"
-msgstr ""
+msgstr "{0} חייב להיות קטן או שווה ל- {1}"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be between {1} and {2}"
@@ -4910,19 +4911,19 @@ msgstr "{0}  חייב להיות בין {1} ל-{2}"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be {1} characters"
-msgstr ""
+msgstr "{0} חייב להיות בעל {1} תווים"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be at least {1} characters"
-msgstr ""
+msgstr "{0} חייב להיות בעל {1} תווים לכל הפחות"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be at most {1} characters"
-msgstr ""
+msgstr "{0} חייב להיות בעל {1} תווים לכל היותר"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be between {1} and {2} characters"
-msgstr ""
+msgstr "{0} חייב להיות בין {1} ו-{2} תווים "
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be one of: {1}"
@@ -4942,11 +4943,11 @@ msgstr "{0} חייב להיות מספר"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be a valid email"
-msgstr "{0} חייב להיות דוא\"ל חוקי"
+msgstr "{0} חייב להיות דואר אלקטרוני חוקי"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} must be a valid url"
-msgstr "{0} חייב להיות url חוקי"
+msgstr "{0} חייב להיות כתובת URL חוקית"
 
 #: cms/static/js/programs/utils/validation_config.js
 msgid "{0} is invalid"
@@ -5126,7 +5127,7 @@ msgstr "שגיאה בייבוא קורס."
 
 #: cms/static/js/views/import.js
 msgid "There was an error with the upload"
-msgstr "קרתה שגיאה בהעלאה"
+msgstr "אירעה שגיאה בהעלאה"
 
 #: cms/static/js/views/instructor_info.js
 msgid "Upload instructor image."
@@ -5134,7 +5135,7 @@ msgstr "העלה תמונת מדריך."
 
 #: cms/static/js/views/instructor_info.js cms/static/js/views/settings/main.js
 msgid "Files must be in JPEG or PNG format."
-msgstr "קבצים חייבים להיות בפורמו JPEG או PNG. "
+msgstr "קבצים חייבים להיות בפורמט JPEG או PNG. "
 
 #: cms/static/js/views/license.js cms/templates/js/license-selector.underscore
 msgid "All Rights Reserved"
@@ -5146,11 +5147,11 @@ msgstr " כל הזכויות על עבודתך שמורות עמך."
 
 #: cms/static/js/views/license.js
 msgid "Creative Commons"
-msgstr "קריאטיב קומונס"
+msgstr "Creative Commons"
 
 #: cms/static/js/views/license.js
 msgid "You waive some rights for your work, such that others can use it too"
-msgstr "אתה מוותר על כמה מזכויותייך על עבודתך כדי שגם אחרים יוכלו להשתמש בה"
+msgstr "אתה מוותר על מספר זכויותייך על עבודתך כדי שאחרים יוכלו גם להשתמש בה"
 
 #: cms/static/js/views/license.js
 msgid "Version"
@@ -5219,7 +5220,7 @@ msgstr "מחיקת %(item_display_name)s היא קבועה ואינה הפיכה
 
 #: cms/static/js/views/manage_users_and_roles.js
 msgid "There was an error changing the user's role"
-msgstr "קרתה שגיאה בשינוי תפקיד המשתמש."
+msgstr "אירעה שגיאה בשינוי תפקיד המשתמש."
 
 #: cms/static/js/views/manage_users_and_roles.js
 msgid "Error adding user"
@@ -5231,15 +5232,15 @@ msgstr "שגיאה בהסרת משתמש"
 
 #: cms/static/js/views/manage_users_and_roles.js
 msgid "A valid email address is required"
-msgstr "דרושה כתובת דוא\"ל תקינה"
+msgstr "דרושה כתובת דואר אלקטרוני תקינה"
 
 #: cms/static/js/views/manage_users_and_roles.js
 msgid "You must enter a valid email address in order to add a new team member"
-msgstr "עליך להזין כתובת דוא\"ל תקינה על מנת להוסיף חבר צוות חדש."
+msgstr "עליך להזין כתובת דואר אלקטרוני תקינה על מנת להוסיף חבר צוות חדש."
 
 #: cms/static/js/views/manage_users_and_roles.js
 msgid "Return and add email address"
-msgstr "חזור והוסף כתובת דוא\"ל"
+msgstr "חזור והוסף כתובת דואר אלקטרוני"
 
 #: cms/static/js/views/manage_users_and_roles.js
 msgid "Already a member"
@@ -5283,7 +5284,7 @@ msgstr "האם לפרסם את כל השינויים שלא פורסמו עבו
 
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "Basic"
-msgstr "בסיסי"
+msgstr "בסיס"
 
 #. Translators: "title" is the name of the current component being edited.
 #: cms/static/js/views/modals/edit_xblock.js
@@ -5313,7 +5314,7 @@ msgstr "הוסף תאריך"
 #. Translators: "title" is the name of the current component being edited.
 #: cms/static/js/views/pages/container.js
 msgid "Editing visibility for: %(title)s"
-msgstr "עורך נראות: %(title)s"
+msgstr "עורך הצגה/הסתרה: %(title)s"
 
 #: cms/static/js/views/pages/container.js
 msgid "Duplicating"
@@ -5367,7 +5368,7 @@ msgstr ""
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Making Visible to Students"
-msgstr "משנה לגלוי עבור הסטודנטים"
+msgstr "מציג עבור הסטודנטים"
 
 #: cms/static/js/views/pages/course_outline.js
 msgid "Course Index"
@@ -5514,7 +5515,7 @@ msgstr "העלה"
 
 #: cms/static/js/views/uploads.js
 msgid "We're sorry, there was an error"
-msgstr "אנו מצטערים, קרתה שגיאה"
+msgstr "מצטערים, אירעה שגיאה"
 
 #: cms/static/js/views/utils/create_course_utils.js
 msgid ""
@@ -5560,7 +5561,7 @@ msgstr "פרק"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "subsection"
-msgstr "תת מקטע"
+msgstr "תת פרק"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "unit"
@@ -5632,7 +5633,7 @@ msgid ""
 "Sorry, there was an error parsing the subtitles that you uploaded. Please "
 "check the format and try again."
 msgstr ""
-"אנו מצטערים, קרתה שגיאה בניתוח הכתוביות שהעלת. אנא בדוק את התבנית ונסה שוב. "
+"מצטערים, אירעה שגיאה בניתוח הכתוביות שהעלת. אנא בדוק את התבנית ונסה שוב. "
 
 #: cms/static/js/views/video/translations_editor.js
 msgid "Upload translation"
@@ -5660,7 +5661,7 @@ msgstr "אזהרה"
 
 #: cms/static/js/xblock_asides/structured_tags.js
 msgid "Updating Tags"
-msgstr "עדכון תגים"
+msgstr "עדכון תגיות"
 
 #: cms/templates/js/asset-library.underscore
 #: cms/templates/js/basic-modal.underscore
@@ -5701,6 +5702,12 @@ msgstr "הקודם"
 msgid "Status"
 msgstr "סטטוס"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr "הודעה"
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr "גדול"
@@ -5840,6 +5847,10 @@ msgstr "בטל דיווח"
 msgid "Vote for this post,"
 msgstr "הצבע לפוסט זה,"
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr "גלוי ל:"
@@ -5857,16 +5868,18 @@ msgstr ""
 "הסטודנטים או להגבילם לקבוצה ספציפית של סטודנטים. "
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr "כותרת:"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr "הוסף כותרת ברורה ותיאורית על מנת לעודד את ההשתתפות בדיון. "
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
-msgstr "הזן את שאלתך או הערתך"
+msgid "Enter your question or comment."
+msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -5922,8 +5935,8 @@ msgid "Editing post"
 msgstr "עורך פוסט"
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
-msgstr "ערוך את כותרת הפוסט"
+msgid "Edit your post below."
+msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Update post"
@@ -6972,9 +6985,6 @@ msgid ""
 "file, download course profile information or cohort results on the "
 "{link_start}Data Download{link_end} page."
 msgstr ""
-"על מנת לסקור משימות סטודנט בקבוצת למידה או לראות את תוצאות העלאת קובץ ה-CSV,"
-" עליך להוריד את מידע פרופיל הקורס או תוצאות קבוצת הלמידה בעמוד "
-"{link_start}Data Download{link_end}."
 
 #: lms/templates/instructor/instructor_dashboard_2/enrollment-code-lookup-links.underscore
 msgid "Used"
@@ -8785,11 +8795,6 @@ msgstr "מעולם לא פורסם"
 msgid "Last published %(last_published_date)s by %(publish_username)s"
 msgstr "פורסם לאחרונה  %(last_published_date)s על ידי %(publish_username)s"
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr "הודעה"
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
@@ -9183,7 +9188,7 @@ msgstr "הרץ את %(key)s"
 
 #: cms/templates/js/programs/course_run.underscore
 msgid "Delete course run"
-msgstr "מחק מחזור לימודים של קורס"
+msgstr "מחק הרצת קורס"
 
 #: cms/templates/js/programs/course_run.underscore
 #, python-format
@@ -9202,7 +9207,7 @@ msgstr "מצב: %(mode)s"
 
 #: cms/templates/js/programs/course_run.underscore
 msgid "Please select a Course Run"
-msgstr "בחר מחזור לימודים של קורס"
+msgstr "בחר הרצת קורס"
 
 #: cms/templates/js/programs/program_creator_form.underscore
 msgid "Create a New Program"
diff --git a/conf/locale/hi/LC_MESSAGES/django.mo b/conf/locale/hi/LC_MESSAGES/django.mo
index f8e2424ded..e3c7314a91 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 3643a7b4ad..86bf160cc4 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: 2016-09-01 11:27+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
 "PO-Revision-Date: 2016-05-09 11:27+0000\n"
 "Last-Translator: plankton rules <planktonrules0@gmail.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/open-edx/edx-platform/language/hi/)\n"
@@ -989,6 +989,13 @@ msgid ""
 "email, and their account will be activated immediately upon registration."
 msgstr ""
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1496,13 +1503,17 @@ msgid "This answer is partially correct."
 msgstr ""
 
 #: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
+msgid "This answer is being processed."
 msgstr ""
 
 #: common/lib/capa/capa/inputtypes.py
-msgid "This answer is being processed."
+msgid "Not yet answered."
 msgstr ""
 
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "विकल्प चुनें"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1573,6 +1584,11 @@ msgstr ""
 msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr ""
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr ""
@@ -2891,16 +2907,6 @@ msgid ""
 "learners earn a minimum score in another, prerequisite subsection."
 msgstr ""
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr ""
@@ -4714,10 +4720,6 @@ msgid ""
 " 0."
 msgstr ""
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr ""
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -8571,6 +8573,10 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr ""
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
@@ -8737,18 +8743,18 @@ msgstr ""
 msgid "Please select your Country."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr ""
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
+msgid "Review the Terms of Service and Honor Code"
 msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
@@ -8756,7 +8762,19 @@ msgstr ""
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
 msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
@@ -9284,7 +9302,8 @@ msgstr ""
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -9477,8 +9496,9 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "सहायता"
 
@@ -9611,6 +9631,10 @@ msgstr ""
 msgid "Discussion - {course_number}"
 msgstr "चर्चा - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -9862,6 +9886,10 @@ msgstr "अपना पासवर्ड रीसेट करें"
 msgid "Email is incorrect."
 msgstr "ई-मेल ग़लत है।"
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "{platform_name} सहायता"
@@ -16382,8 +16410,8 @@ msgstr ""
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
 
 #: lms/templates/verify_student/incourse_reverify.html
@@ -19831,10 +19859,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "कोई बदलाव नहीं हुआ। पुन: सुरक्षा ज़रूरी नहीं।"
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "विकल्प चुनें"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "स्लग"
diff --git a/conf/locale/hi/LC_MESSAGES/djangojs.mo b/conf/locale/hi/LC_MESSAGES/djangojs.mo
index 54221b0c0e..798b503110 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 a725a40273..3f8dbcb33f 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: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-08-16 19:42+0000\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-15 13:50+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"
@@ -1428,8 +1428,6 @@ msgstr ""
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: cms/templates/js/course-instructor-details.underscore
 #: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
 msgstr ""
 
@@ -1877,7 +1875,6 @@ msgstr ""
 " लोड करें।"
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr ""
 "हमें आपके अनुरोध को लागू करने में कुछ मुश्किल हुई। कृपया फिर से कोशिश करें।"
@@ -5777,6 +5774,12 @@ msgstr "पिछला"
 msgid "Status"
 msgstr ""
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr ""
@@ -5914,6 +5917,10 @@ msgstr ""
 msgid "Vote for this post,"
 msgstr ""
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr ""
@@ -5929,15 +5936,17 @@ msgid ""
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
+msgid "Enter your question or comment."
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
@@ -5994,7 +6003,7 @@ msgid "Editing post"
 msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
+msgid "Edit your post below."
 msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
@@ -8719,11 +8728,6 @@ msgstr ""
 msgid "Last published %(last_published_date)s by %(publish_username)s"
 msgstr ""
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr ""
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.mo b/conf/locale/ko_KR/LC_MESSAGES/django.mo
index ef27cc5a53..969971bbbb 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 954b23832e..bc286a401a 100644
--- a/conf/locale/ko_KR/LC_MESSAGES/django.po
+++ b/conf/locale/ko_KR/LC_MESSAGES/django.po
@@ -84,7 +84,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
 "PO-Revision-Date: 2016-05-09 11:27+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/open-edx/edx-platform/language/ko_KR/)\n"
@@ -977,6 +977,13 @@ msgid ""
 "email, and their account will be activated immediately upon registration."
 msgstr ""
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
 msgstr "잠시 기다려 주십시오."
@@ -1482,13 +1489,17 @@ msgid "This answer is partially correct."
 msgstr ""
 
 #: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
+msgid "This answer is being processed."
 msgstr ""
 
 #: common/lib/capa/capa/inputtypes.py
-msgid "This answer is being processed."
+msgid "Not yet answered."
 msgstr ""
 
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "평가 기준을 선택하세요."
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1559,6 +1570,11 @@ msgstr ""
 msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr ""
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr ""
@@ -2869,16 +2885,6 @@ msgid ""
 "learners earn a minimum score in another, prerequisite subsection."
 msgstr ""
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr ""
@@ -4685,10 +4691,6 @@ msgid ""
 " 0."
 msgstr ""
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr ""
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -8492,6 +8494,10 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr ""
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
@@ -8658,18 +8664,18 @@ msgstr ""
 msgid "Please select your Country."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr ""
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
+msgid "Review the Terms of Service and Honor Code"
 msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
@@ -8677,7 +8683,19 @@ msgstr ""
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
 msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
@@ -9202,7 +9220,8 @@ msgstr ""
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -9393,8 +9412,9 @@ msgstr ""
 msgid "Account"
 msgstr "계정"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "도움말"
 
@@ -9527,6 +9547,10 @@ msgstr ""
 msgid "Discussion - {course_number}"
 msgstr "토의 - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -9773,6 +9797,10 @@ msgstr "비밀번호 재설정"
 msgid "Email is incorrect."
 msgstr "이메일이 틀립니다"
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "{platform_name} 도움말"
@@ -16330,11 +16358,9 @@ msgstr "질문이 있다면 누구에게 연락해야하나요?"
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
-"이 강좌나 형식에 대해 질문이 있다면 <a href=\"{mail_to_link}\"\">{mail_to_link}</a>로 "
-"연락해주세요."
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -19915,10 +19941,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "변경사항이 없습니다. 저장할 내용이 없습니다."
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "평가 기준을 선택하세요."
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "경로명"
diff --git a/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo b/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo
index 91590395d7..356d15034b 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 d95b8c3773..d916663fb2 100644
--- a/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
@@ -50,6 +50,7 @@
 # kmooc <shevious@gmail.com>, 2015
 # shevious <shevious@yahoo.com>, 2015
 # jeon <bluerespect@nate.com>, 2014-2015
+# gscavanger0209 <gscavanger@gmail.com>, 2016
 # Kevin Min <gr326887@graded.br>, 2015
 # Kunwoo Kim <crazyabtmath@naver.com>, 2015
 # Sam Ryoo <samryoo@gmail.com>, 2014
@@ -57,9 +58,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-08-16 19:42+0000\n"
-"Last-Translator: Ned Batchelder <ned@edx.org>\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-20 08:13+0000\n"
+"Last-Translator: gscavanger0209 <gscavanger@gmail.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/open-edx/edx-platform/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1856,7 +1857,6 @@ msgid ""
 msgstr "요청 처리 중 오류가 발생했습니다. 저장 안 된 작업을 복사한 후 페이지를 다시 여세요."
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr "요청 처리 중 오류가 발생했습니다. 다시 시도하세요"
 
@@ -5688,6 +5688,12 @@ msgstr ""
 msgid "Status"
 msgstr "상태"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr ""
@@ -5825,6 +5831,10 @@ msgstr ""
 msgid "Vote for this post,"
 msgstr ""
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr ""
@@ -5840,15 +5850,17 @@ msgid ""
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
+msgid "Enter your question or comment."
 msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
@@ -5905,7 +5917,7 @@ msgid "Editing post"
 msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
+msgid "Edit your post below."
 msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
@@ -8627,11 +8639,6 @@ msgstr ""
 msgid "Last published %(last_published_date)s by %(publish_username)s"
 msgstr ""
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr ""
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.mo b/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 0ac66cfb92..579e701f0a 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 6ba9e75204..3eb4cd0309 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -249,7 +249,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
 "PO-Revision-Date: 2016-05-09 11:27+0000\n"
 "Last-Translator: Monica Farias <monifar.tp@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/open-edx/edx-platform/language/pt_BR/)\n"
@@ -1249,6 +1249,13 @@ msgstr ""
 "Se esta opção estiver selecionada, usuários não serão obrigados a confirmar "
 "o e-mail e suas contas serão ativadas imediatamente após a inscrição."
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1758,13 +1765,17 @@ msgid "This answer is partially correct."
 msgstr ""
 
 #: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
+msgid "This answer is being processed."
 msgstr ""
 
 #: common/lib/capa/capa/inputtypes.py
-msgid "This answer is being processed."
+msgid "Not yet answered."
 msgstr ""
 
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "Selecionar uma opção"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1844,6 +1855,11 @@ msgstr "{input_type}: marcação inesperada {tag_name}"
 msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr "Era esperada a marcação {expected_tag}, mas {given_tag} foi obtida."
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr "Correto"
@@ -3349,16 +3365,6 @@ msgid ""
 "learners earn a minimum score in another, prerequisite subsection."
 msgstr ""
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr ""
@@ -5451,10 +5457,6 @@ msgstr ""
 "Especificado em segundos. Ativar armazenamento em cache, definindo este como"
 " um valor maior que 0."
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr ""
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -9778,6 +9780,10 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr "Ativar Melhorias na Home Page do curso"
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr "O campo '{field_name}' não pôde ser editado."
@@ -9965,27 +9971,39 @@ msgstr ""
 msgid "Please select your Country."
 msgstr "Por favor, selecione seu País."
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "Termos do Serviço e Código de Honra"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
-msgstr "Eu concordo com {terms_of_service} {platform_name}."
+msgid "Review the Terms of Service and Honor Code"
+msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
-msgstr "Você deve concordar com {terms_of_service} {platform_name}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
+msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -10557,7 +10575,8 @@ msgstr ""
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -10749,8 +10768,9 @@ msgstr ""
 msgid "Account"
 msgstr "Conta"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "Ajuda"
 
@@ -10883,6 +10903,10 @@ msgstr ""
 msgid "Discussion - {course_number}"
 msgstr "Discussão - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -11132,6 +11156,10 @@ msgstr "Redefinir minha senha"
 msgid "Email is incorrect."
 msgstr "O endereço de e-mail é incorreto. "
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "Ajuda do {platform_name}"
@@ -18177,11 +18205,9 @@ msgstr "Com quem posso entrar em contato se tiver dúvidas?"
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
-"Se você tiver alguma pergunta sobre este curso ou este formulário, você pode"
-" entrar em contato com <a href=\"{mail_to_link}\"\">{mail_to_link}</a>."
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -22137,10 +22163,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "Nenhuma alteração realizada. Nada para salvar. "
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "Selecionar uma opção"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "Slug"
diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo b/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo
index 61cc849b1e..6cfcf39c20 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 8ef5fe2d3d..7384825c92 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -185,8 +185,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-09-05 02:00+0000\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-15 13:50+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"
@@ -1598,14 +1598,9 @@ msgstr ""
 "A URL que você inseriu parece ser um link externo. Deseja adicionar o "
 "prefixo obrigatório http://?"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/course-instructor-details.underscore
-#: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
 msgstr "Título"
 
@@ -2071,7 +2066,6 @@ msgstr ""
 "copiado qualquer trabalho não salvo e, em seguida, recarregue a página."
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr ""
 "Houve algum problema ao processar a sua solicitação. Por favor, tente "
@@ -6192,6 +6186,12 @@ msgstr "Anterior"
 msgid "Status"
 msgstr "Status"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr "Grande"
@@ -6331,6 +6331,10 @@ msgstr "Retirar"
 msgid "Vote for this post,"
 msgstr "Vote nesta publicação,"
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr "Visível para:"
@@ -6349,17 +6353,19 @@ msgstr ""
 "grupo."
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr "Título:"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr ""
 "Adicionar um título claro e descritivo para incentivar a participação."
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
-msgstr "Insira sua pergunta ou comentário"
+msgid "Enter your question or comment."
+msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -6415,8 +6421,8 @@ msgid "Editing post"
 msgstr "Editando publicação"
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
-msgstr "Editar título da publicação"
+msgid "Edit your post below."
+msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Update post"
@@ -9293,11 +9299,6 @@ msgstr ""
 "Publicado pela última vez em %(last_published_date)s por "
 "%(publish_username)s"
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr "mensagem"
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/conf/locale/rtl/LC_MESSAGES/django.mo b/conf/locale/rtl/LC_MESSAGES/django.mo
index 9c7fc18d63..ae3ed01e85 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 1e6639d063..2e21556233 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: 2016-09-15 11:17+0000\n"
-"PO-Revision-Date: 2016-09-15 11:17:57.818689\n"
+"POT-Creation-Date: 2016-09-22 14:31+0000\n"
+"PO-Revision-Date: 2016-09-22 14:31:50.606322\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -9767,27 +9767,39 @@ msgstr "ذخوحشرغ"
 msgid "Please select your Country."
 msgstr "حمثشسث سثمثذف غخعق ذخعرفقغ."
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr "قثدهثص فاث اخرخق ذخيث"
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "فثقوس خب سثقدهذث شري اخرخق ذخيث"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
-msgstr "ه شلقثث فخ فاث {platform_name} {terms_of_service}."
+msgid "Review the Terms of Service and Honor Code"
+msgstr "قثدهثص فاث فثقوس خب سثقدهذث شري اخرخق ذخيث"
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
-msgstr "غخع وعسف شلقثث فخ فاث {platform_name} {terms_of_service}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr "ه شلقثث فخ فاث {platform_name} {terms_of_service}"
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr "غخع وعسف شلقثث فخ فاث {platform_name} {terms_of_service}"
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
+msgstr "قثدهثص فاث فثقوس خب سثقدهذث"
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -9981,7 +9993,7 @@ msgstr "{platform_name} سعححخقف مثدثمس:"
 msgid "HTML"
 msgstr "افوم"
 
-#: cms/djangoapps/contentstore/views/component.py
+#: cms/djangoapps/contentstore/views/component.py lms/templates/video.html
 msgid "Video"
 msgstr "دهيثخ"
 
@@ -11005,14 +11017,8 @@ msgid "Tell us the details"
 msgstr "فثمم عس فاث يثفشهمس"
 
 #: lms/templates/help_modal.html
-msgid ""
-"Describe what you were doing when you encountered the issue. Include any "
-"details that will help us to troubleshoot, including error messages that you"
-" saw."
-msgstr ""
-"يثسذقهزث صاشف غخع صثقث يخهرل صاثر غخع ثرذخعرفثقثي فاث هسسعث. هرذمعيث شرغ "
-"يثفشهمس فاشف صهمم اثمح عس فخ فقخعزمثساخخف, هرذمعيهرل ثققخق وثسسشلثس فاشف غخع"
-" سشص."
+msgid "Include error messages, steps which lead to the issue, etc"
+msgstr "هرذمعيث ثققخق وثسسشلثس, سفثحس صاهذا مثشي فخ فاث هسسعث, ثفذ"
 
 #: lms/templates/help_modal.html
 msgid "Thank You!"
@@ -11043,8 +11049,12 @@ msgid "Brief description of the problem"
 msgstr "زقهثب يثسذقهحفهخر خب فاث حقخزمثو"
 
 #: lms/templates/help_modal.html
-msgid "Details of the problem you are encountering{asterisk}"
-msgstr "يثفشهمس خب فاث حقخزمثو غخع شقث ثرذخعرفثقهرل{asterisk}"
+msgid ""
+"Details of the problem you are encountering{asterisk}{begin_span}Include "
+"error messages, steps which lead to the issue, etc.{end_span}"
+msgstr ""
+"يثفشهمس خب فاث حقخزمثو غخع شقث ثرذخعرفثقهرل{asterisk}{begin_span}هرذمعيث "
+"ثققخق وثسسشلثس, سفثحس صاهذا مثشي فخ فاث هسسعث, ثفذ.{end_span}"
 
 #: lms/templates/help_modal.html
 msgid "suggestion"
@@ -12118,13 +12128,29 @@ msgid "No playable video sources found."
 msgstr "رخ حمشغشزمث دهيثخ سخعقذثس بخعري."
 
 #: lms/templates/video.html
-msgid "Download video"
-msgstr "يخصرمخشي دهيثخ"
+msgid "Downloads and transcripts"
+msgstr "يخصرمخشيس شري فقشرسذقهحفس"
+
+#: lms/templates/video.html
+msgid "Download video file"
+msgstr "يخصرمخشي دهيثخ بهمث"
+
+#: lms/templates/video.html
+msgid "Transcripts"
+msgstr "فقشرسذقهحفس"
+
+#: lms/templates/video.html
+msgid "Download {file}"
+msgstr "يخصرمخشي {file}"
 
 #: lms/templates/video.html
 msgid "Download transcript"
 msgstr "يخصرمخشي فقشرسذقهحف"
 
+#: lms/templates/video.html
+msgid "Handouts"
+msgstr "اشريخعفس"
+
 #: lms/templates/video.html
 msgid "Download Handout"
 msgstr "يخصرمخشي اشريخعف"
diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.mo b/conf/locale/rtl/LC_MESSAGES/djangojs.mo
index 081a20fce4..7380cfee45 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 fcbf7b64bd..4c768cc2d1 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: 2016-09-15 11:16+0000\n"
-"PO-Revision-Date: 2016-09-15 11:17:58.277591\n"
+"POT-Creation-Date: 2016-09-22 14:30+0000\n"
+"PO-Revision-Date: 2016-09-22 14:31:51.058301\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -1924,7 +1924,6 @@ msgstr "صث اشي سخوث فقخعزمث حقخذثسسهرل غخعق قثض
 #: common/static/coffee/src/discussion/utils.js
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 #: common/static/common/js/discussion/utils.js
-#: common/static/common/js/discussion/views/discussion_topic_menu_view.js
 #: common/static/common/templates/discussion/pagination.underscore
 msgid "…"
 msgstr "…"
@@ -6440,14 +6439,6 @@ msgstr "ذخممشحسث يهسذعسسهخر"
 msgid "Topic Area:"
 msgstr "فخحهذ شقثش:"
 
-#: common/static/common/templates/discussion/topic.underscore
-msgid "Discussion topics; currently listing: "
-msgstr "يهسذعسسهخر فخحهذس; ذعققثرفمغ مهسفهرل: "
-
-#: common/static/common/templates/discussion/topic.underscore
-msgid "Filter topics"
-msgstr "بهمفثق فخحهذس"
-
 #: common/static/common/templates/discussion/topic.underscore
 msgid "Add your post to a relevant topic to help others find it."
 msgstr "شيي غخعق حخسف فخ ش قثمثدشرف فخحهذ فخ اثمح خفاثقس بهري هف."
@@ -9151,6 +9142,10 @@ msgstr "شيي"
 msgid "Clear Value"
 msgstr "ذمثشق دشمعث"
 
+#: cms/templates/js/metadata-editor.underscore
+msgid "Component Location ID"
+msgstr "ذخوحخرثرف مخذشفهخر هي"
+
 #: cms/templates/js/metadata-file-uploader-item.underscore
 #: cms/templates/js/video/metadata-translations-item.underscore
 msgid "Download"
diff --git a/conf/locale/ru/LC_MESSAGES/django.mo b/conf/locale/ru/LC_MESSAGES/django.mo
index 5dde9add11..72ce83151f 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 f6e71c8820..3c46094ca9 100644
--- a/conf/locale/ru/LC_MESSAGES/django.po
+++ b/conf/locale/ru/LC_MESSAGES/django.po
@@ -193,7 +193,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
 "PO-Revision-Date: 2016-05-09 11:27+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"
@@ -1218,6 +1218,13 @@ msgstr ""
 "Если эта функция включена, пользователям не нужно подтверждать адрес "
 "электронной почты, а их учетная запись активируется сразу после регистрации."
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1727,14 +1734,18 @@ msgstr "Это неправильный ответ."
 msgid "This answer is partially correct."
 msgstr "Это частично правильный ответ."
 
-#: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
-msgstr "Этот вопрос оставлен без ответа."
-
 #: common/lib/capa/capa/inputtypes.py
 msgid "This answer is being processed."
 msgstr "Этот ответ в процессе оценки."
 
+#: common/lib/capa/capa/inputtypes.py
+msgid "Not yet answered."
+msgstr ""
+
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "Выберите опцию"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1812,6 +1823,11 @@ msgstr "{input_type}: неопределённый тег {tag_name}"
 msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr "Требуется тег {expected_tag}. Вместо него введён тег {given_tag}."
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr "Верных"
@@ -3367,16 +3383,6 @@ msgstr ""
 "пока обучающийся не набрал необходимое количество баллов в предшествующем "
 "подразделе."
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr "Информаоция о курсе обучения"
@@ -5508,10 +5514,6 @@ msgid ""
 msgstr ""
 "Задаётся в секундах. Для включения кэширования укажите значение больше 0."
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr "Путь к квитанции заказа."
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -9874,6 +9876,10 @@ msgstr "Отображать ли страницы с описаниями на
 msgid "Enable course home page improvements."
 msgstr "Разрешить улучшенную страницу курса."
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr "Путь к квитанции заказа."
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Поле '{field_name}' не может быть отредактировано."
@@ -10063,27 +10069,39 @@ msgstr "Компания"
 msgid "Please select your Country."
 msgstr "Пожалуйста, выберите свою страну."
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "Условия предоставления услуг и Кодекс чести"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
-msgstr "Я принимаю {terms_of_service} {platform_name}."
+msgid "Review the Terms of Service and Honor Code"
+msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
-msgstr "Вы должны принять {terms_of_service} {platform_name}."
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr "Я принимаю {terms_of_service} {platform_name}"
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr "Вы должны принять {terms_of_service} {platform_name}"
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
+msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -10657,7 +10675,8 @@ msgstr "Содержание"
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -10850,8 +10869,9 @@ msgstr "Выберите язык"
 msgid "Account"
 msgstr "Учётная запись"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "Помощь"
 
@@ -10984,6 +11004,10 @@ msgstr "Пожалуйста, перезагрузите страницу, чт
 msgid "Discussion - {course_number}"
 msgstr "Обсуждение - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -11236,6 +11260,10 @@ msgstr "Сбросить пароль"
 msgid "Email is incorrect."
 msgstr "Адрес электронной почты введён неверно."
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "Помощь {platform_name}"
@@ -18519,11 +18547,9 @@ msgstr "Куда обратиться, если у меня есть вопро
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
 msgstr ""
-"Если у вас возникнут вопросы относительно курса или этой анкеты, свяжитесь с"
-"  <a href=\"{mail_to_link}\"\">{mail_to_link}</a>."
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -22547,10 +22573,6 @@ msgstr ""
 msgid "No changes made. Nothing to save."
 msgstr "Изменений не было. Нечего сохранять."
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "Выберите опцию"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "Slug-строка"
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.mo b/conf/locale/ru/LC_MESSAGES/djangojs.mo
index 29609f0b34..2dab430b9c 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 e3178c6e0a..598a98334a 100644
--- a/conf/locale/ru/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ru/LC_MESSAGES/djangojs.po
@@ -124,9 +124,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-09-13 21:04+0000\n"
-"Last-Translator: Weyedide <weyedide@gmail.com>\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-19 12:11+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1548,14 +1548,9 @@ msgstr ""
 "Адрес URL, введённый вами, похож на внешнюю ссылку.  Добавить обязательный "
 "префикс «http://»?"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/course-instructor-details.underscore
-#: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
 msgstr "Заголовок"
 
@@ -2036,7 +2031,6 @@ msgstr ""
 "страницу."
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr ""
 "Возникла проблема при обработке вашего запроса.  Пожалуйста, попробуйте ещё "
@@ -6306,6 +6300,12 @@ msgstr "Предыдущее"
 msgid "Status"
 msgstr "Состояние"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr "Большой"
@@ -6445,6 +6445,10 @@ msgstr "Отозвать жалобу"
 msgid "Vote for this post,"
 msgstr "Голосовать за это сообщениие"
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr "Видно:"
@@ -6463,18 +6467,20 @@ msgstr ""
 "определённой группы."
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr "Заголовок:"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr ""
 "Добавьте чётко сформулированный, содержательный заголовок, чтобы побудить "
 "других к участию."
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
-msgstr "Введите свой вопрос или комментарий"
+msgid "Enter your question or comment."
+msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -6530,8 +6536,8 @@ msgid "Editing post"
 msgstr "Редактирование сообщения"
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
-msgstr "Редактировать заголовок сообщения"
+msgid "Edit your post below."
+msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Update post"
@@ -8968,6 +8974,10 @@ msgid ""
 "release date has passed, published units in this subsection will become "
 "available to learners unless units are explicitly hidden."
 msgstr ""
+"Если Вы выберете какой-либо вариант кроме \"%(hide_label)s\", при "
+"наступлении даты выпуска подраздела опубликованные блоки из данного "
+"подраздела станут доступны обучающимся, за исключением блоков, намеренно "
+"скрытых авторами."
 
 #: cms/templates/js/course-instructor-details.underscore
 msgid "Instructor Name"
@@ -9475,11 +9485,6 @@ msgstr ""
 "Последний раз опубликовано %(last_published_date)s пользователем "
 "%(publish_username)s"
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr "сообщение"
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.mo b/conf/locale/zh_CN/LC_MESSAGES/django.mo
index f6048789db..42770fe529 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 8bd2a67b2c..c93822184e 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -13,6 +13,7 @@
 # Changyue Wang <peterwang.dut@gmail.com>, 2014-2015
 # CharlotteDing <kikyoru@hotmail.com>, 2015
 # chalow <charlotteouya@hotmail.com>, 2015
+# Christina Guo <csu2008guoting@163.com>, 2016
 # ckyOL, 2015
 # focusheart <focusheart@gmail.com>, 2014
 # focusheart <focusheart@gmail.com>, 2014
@@ -342,7 +343,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:27+0000\n"
+"POT-Creation-Date: 2016-09-15 13:40+0000\n"
 "PO-Revision-Date: 2016-06-29 18:11+0000\n"
 "Last-Translator: Yue Fang <yfang@juilliard.edu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
@@ -1266,6 +1267,13 @@ msgid ""
 "email, and their account will be activated immediately upon registration."
 msgstr "如果选择该选项，用户将不会被要求验证他们的邮箱，他们的账户将在注册后立刻被激活。"
 
+#: common/djangoapps/third_party_auth/models.py
+msgid ""
+"If this option is not selected, users will not be presented with the "
+"provider as an option to authenticate with on the login screen, but manual "
+"authentication using the correct link is still possible."
+msgstr ""
+
 #: common/djangoapps/third_party_auth/templates/third_party_auth/post_custom_auth_entry.html
 #: lms/templates/student_account/finish_auth.html
 msgid "Please wait"
@@ -1771,14 +1779,18 @@ msgstr "这个回答是不正确的。"
 msgid "This answer is partially correct."
 msgstr "这个回答是部分正确的。"
 
-#: common/lib/capa/capa/inputtypes.py
-msgid "This answer is unanswered."
-msgstr "这个回答是无解的。"
-
 #: common/lib/capa/capa/inputtypes.py
 msgid "This answer is being processed."
 msgstr "这个回答正在处理中。"
 
+#: common/lib/capa/capa/inputtypes.py
+msgid "Not yet answered."
+msgstr ""
+
+#: wiki/forms.py
+msgid "Select an option"
+msgstr "请选择"
+
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
@@ -1849,6 +1861,11 @@ msgstr "{input_type}: 未知标签 {tag_name}"
 msgid "Expected a {expected_tag} tag; got {given_tag} instead"
 msgstr "期望一个  {expected_tag}标签；实际获得 {given_tag}"
 
+#. Translators: index here could be 1,2,3 and so on
+#: common/lib/capa/capa/responsetypes.py
+msgid "Question {index}"
+msgstr ""
+
 #: common/lib/capa/capa/responsetypes.py
 msgid "Correct"
 msgstr "正确"
@@ -3199,16 +3216,6 @@ msgid ""
 "learners earn a minimum score in another, prerequisite subsection."
 msgstr "输入 true 或 false。如果该值为 true，你可以隐藏某分段，直到学习者获得最低分数为止。"
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Enable Subsection Grades Saved"
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter true or false. If this value is true, the robust grades feature of "
-"saving subsection grades is enabled for this course."
-msgstr ""
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Learning Information"
 msgstr "课程学习信息"
@@ -5087,10 +5094,6 @@ msgid ""
 " 0."
 msgstr "指定为秒。借由设定这个大于0的值来启动快取。"
 
-#: lms/djangoapps/commerce/models.py
-msgid "Path to order receipt page."
-msgstr ""
-
 #: lms/djangoapps/commerce/signals.py
 msgid ""
 "A refund request has been initiated for {username} ({email}). To process "
@@ -9090,6 +9093,10 @@ msgstr ""
 msgid "Enable course home page improvements."
 msgstr "启用改进版课程主页"
 
+#: openedx/core/djangoapps/site_configuration/models.py
+msgid "Path to order receipt page."
+msgstr ""
+
 #: openedx/core/djangoapps/user_api/accounts/api.py
 msgid "The '{field_name}' field cannot be edited."
 msgstr "'{field_name}'字段无法编辑."
@@ -9267,27 +9274,39 @@ msgstr "公司"
 msgid "Please select your Country."
 msgstr "请选择你的国家"
 
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Honor Code"
+msgstr ""
+
 #. Translators: This is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
 msgid "Terms of Service and Honor Code"
 msgstr "服务条款和诚信准则"
 
-#. Translators: "Terms of Service" is a legal document users must agree to
-#. in order to register a new account.
-#. Translators: "Terms of service" is a legal document users must agree to
-#. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "I agree to the {platform_name} {terms_of_service}."
-msgstr "我同意{platform_name} {terms_of_service}。"
+msgid "Review the Terms of Service and Honor Code"
+msgstr ""
 
 #. Translators: "Terms of Service" is a legal document users must agree to
 #. in order to register a new account.
 #. Translators: "Terms of service" is a legal document users must agree to
 #. in order to register a new account.
 #: openedx/core/djangoapps/user_api/views.py
-msgid "You must agree to the {platform_name} {terms_of_service}."
-msgstr "您必须同意 {platform_name} {terms_of_service}。"
+msgid "I agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#. Translators: "Terms of Service" is a legal document users must agree to
+#. in order to register a new account.
+#. Translators: "Terms of service" is a legal document users must agree to
+#. in order to register a new account.
+#: openedx/core/djangoapps/user_api/views.py
+msgid "You must agree to the {platform_name} {terms_of_service}"
+msgstr ""
+
+#: openedx/core/djangoapps/user_api/views.py
+msgid "Review the Terms of Service"
+msgstr ""
 
 #: openedx/core/lib/api/view_utils.py
 msgid "This value is invalid."
@@ -9824,7 +9843,8 @@ msgstr "内容"
 #: cms/templates/container.html cms/templates/course_outline.html
 #: cms/templates/group_configurations.html cms/templates/library.html
 #: cms/templates/manage_users.html cms/templates/manage_users_lib.html
-#: lms/templates/courseware/courses.html lms/templates/edxnotes/edxnotes.html
+#: lms/templates/problem_ajax.html 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
@@ -10015,8 +10035,9 @@ msgstr "选择语言"
 msgid "Account"
 msgstr "账户"
 
-#: cms/templates/widgets/header.html lms/templates/help_modal.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: cms/templates/widgets/header.html lms/templates/navigation.html
+#: lms/templates/static_templates/help.html
+#: themes/edx.org/lms/templates/header.html wiki/plugins/help/wiki_plugin.py
 msgid "Help"
 msgstr "帮助"
 
@@ -10149,6 +10170,10 @@ msgstr ""
 msgid "Discussion - {course_number}"
 msgstr "讨论 - {course_number}"
 
+#: lms/djangoapps/discussion/templates/discussion/discussion_board.html
+msgid "Discussions"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/discussion_board.html
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Add a Post"
@@ -10395,6 +10420,10 @@ msgstr "重置我的密码"
 msgid "Email is incorrect."
 msgstr "邮箱不正确。"
 
+#: lms/templates/help_modal.html
+msgid "Support"
+msgstr ""
+
 #: lms/templates/help_modal.html
 msgid "{platform_name} Help"
 msgstr "{platform_name} 帮助"
@@ -16989,9 +17018,9 @@ msgstr "如果我碰到问题可以联系谁？"
 
 #: lms/templates/survey/survey.html
 msgid ""
-"If you have any questions about this course or this form, you can contact <a"
-" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
-msgstr "如果您对这门课程或者这个表格有任何问题，您可以联系我们<a href=\"{mail_to_link}\"\">{mail_to_link}</a>。"
+"If you have any questions about this course or this form, you can contact "
+"{link_start}{mail_to_link}{link_end}."
+msgstr ""
 
 #: lms/templates/verify_student/incourse_reverify.html
 msgid "Re-Verify for {course_name}"
@@ -20487,10 +20516,6 @@ msgstr "当您在编辑时，别人进行了修改，您的内容已自动与其
 msgid "No changes made. Nothing to save."
 msgstr "没有变更，不需要保存。"
 
-#: wiki/forms.py
-msgid "Select an option"
-msgstr "请选择"
-
 #: wiki/forms.py
 msgid "Slug"
 msgstr "固定链接地址"
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
index e73615ae88..d755c141a4 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 f19ca95d50..dd8b0f2bb6 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -36,6 +36,7 @@
 # jsgang <jsgang9@gmail.com>, 2014-2016
 # daisybellamy <linmiaoqiqi@hotmail.com>, 2014
 # 刘洋 <liuyang2011@tsinghua.edu.cn>, 2013
+# Luyi Zheng <luyi.zheng@mail.mcgill.ca>, 2016
 # pku9104038 <pku9104038@hotmail.com>, 2014
 # pku9104038 <pku9104038@hotmail.com>, 2014
 # ranfish <ranfish@gmail.com>, 2015
@@ -180,9 +181,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2016-09-01 11:26+0000\n"
-"PO-Revision-Date: 2016-09-09 07:31+0000\n"
-"Last-Translator: jsgang <jsgang9@gmail.com>\n"
+"POT-Creation-Date: 2016-09-15 13:39+0000\n"
+"PO-Revision-Date: 2016-09-15 13:50+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1571,14 +1572,9 @@ msgid ""
 "required http:// prefix?"
 msgstr "输入的 URL 似乎是一个外部链接，您想加上必要的 http:// 前缀吗？"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/course-instructor-details.underscore
-#: cms/templates/js/signatory-details.underscore
-#: common/static/common/templates/discussion/new-post.underscore
-#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
 msgstr "标题"
 
@@ -2030,7 +2026,6 @@ msgid ""
 msgstr "在处理您的请求时发生错误。请您确认已备份未保存的工作，然后重新载入页面。"
 
 #: common/static/coffee/src/discussion/utils.js
-#: common/static/common/js/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
 msgstr "处理请求遇到问题，请重试。"
 
@@ -5860,6 +5855,12 @@ msgstr "上一步"
 msgid "Status"
 msgstr "状态"
 
+#: cms/templates/js/publish-history.underscore
+#: cms/templates/js/staff-lock-editor.underscore
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "message"
+msgstr ""
+
 #: common/static/common/templates/image-modal.underscore
 msgid "Large"
 msgstr "大"
@@ -5997,6 +5998,10 @@ msgstr "取消报告"
 msgid "Vote for this post,"
 msgstr "为该帖投票"
 
+#: common/static/common/templates/discussion/new-post-alert.underscore
+msgid "Error posting your message."
+msgstr ""
+
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Visible To:"
 msgstr "公开可见对"
@@ -6012,16 +6017,18 @@ msgid ""
 msgstr "讨论区管理员、版主以及助教可以将它们的帖子设置为对所有学生可见或者仅对某个群组可见。"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title:"
 msgstr "标题"
 
 #: common/static/common/templates/discussion/new-post.underscore
+#: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Add a clear and descriptive title to encourage participation."
 msgstr "添加一个清晰并且描述性强的标题来鼓励参与。"
 
 #: common/static/common/templates/discussion/new-post.underscore
-msgid "Enter your question or comment"
-msgstr "请输入您的问题或者评论"
+msgid "Enter your question or comment."
+msgstr ""
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "follow this post"
@@ -6077,8 +6084,8 @@ msgid "Editing post"
 msgstr "编辑讨论帖"
 
 #: common/static/common/templates/discussion/thread-edit.underscore
-msgid "Edit post title"
-msgstr "编辑讨论帖标题"
+msgid "Edit your post below."
+msgstr ""
 
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Update post"
@@ -8816,11 +8823,6 @@ msgstr ""
 msgid "Last published %(last_published_date)s by %(publish_username)s"
 msgstr ""
 
-#: cms/templates/js/publish-history.underscore
-#: cms/templates/js/staff-lock-editor.underscore
-msgid "message"
-msgstr ""
-
 #: cms/templates/js/publish-history.underscore
 #: cms/templates/js/publish-xblock.underscore
 msgid "Previously published"
diff --git a/lms/djangoapps/bulk_email/admin.py b/lms/djangoapps/bulk_email/admin.py
index 95c05c5747..e42f7f535f 100644
--- a/lms/djangoapps/bulk_email/admin.py
+++ b/lms/djangoapps/bulk_email/admin.py
@@ -36,6 +36,7 @@ two curly braces on each side), to indicate where the email text is to be insert
 Other tags that may be used (surrounded by one curly brace on each side):
 {platform_name}        : the name of the platform
 {course_title}         : the name of the course
+{course_root}          : the URL path to the root of the course
 {course_url}           : the course's full URL
 {email}                : the user's email address
 {account_settings_url} : URL at which users can change account preferences
diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py
index b624e4775a..8e89892713 100644
--- a/lms/djangoapps/bulk_email/tasks.py
+++ b/lms/djangoapps/bulk_email/tasks.py
@@ -100,13 +100,15 @@ def _get_course_email_context(course):
     course_id = course.id.to_deprecated_string()
     course_title = course.display_name
     course_end_date = get_default_time_display(course.end)
+    course_root = reverse('course_root', kwargs={'course_id': course_id})
     course_url = '{}{}'.format(
         settings.LMS_ROOT_URL,
-        reverse('course_root', kwargs={'course_id': course_id})
+        course_root
     )
     image_url = u'{}{}'.format(settings.LMS_ROOT_URL, course_image_url(course))
     email_context = {
         'course_title': course_title,
+        'course_root': course_root,
         'course_url': course_url,
         'course_image_url': image_url,
         'course_end_date': course_end_date,
diff --git a/lms/djangoapps/bulk_email/tests/test_tasks.py b/lms/djangoapps/bulk_email/tests/test_tasks.py
index 06ad3d07c9..b0ae98eab1 100644
--- a/lms/djangoapps/bulk_email/tests/test_tasks.py
+++ b/lms/djangoapps/bulk_email/tests/test_tasks.py
@@ -33,6 +33,7 @@ from django.core.management import call_command
 from xmodule.modulestore.tests.factories import CourseFactory
 
 from bulk_email.models import CourseEmail, Optout, SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_LEARNERS
+from bulk_email.tasks import _get_course_email_context
 
 from instructor_task.tasks import send_bulk_course_email
 from instructor_task.subtasks import update_subtask_status, SubtaskStatus
@@ -434,3 +435,14 @@ class TestBulkEmailInstructorTask(InstructorTaskCourseTestCase):
         with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
             get_conn.return_value.send_messages.side_effect = cycle([None])
             self._test_run_with_task(send_bulk_course_email, 'emailed', num_emails, num_emails)
+
+    def test_get_course_email_context_has_correct_keys(self):
+        result = _get_course_email_context(self.course)
+        self.assertIn('course_title', result)
+        self.assertIn('course_root', result)
+        self.assertIn('course_url', result)
+        self.assertIn('course_image_url', result)
+        self.assertIn('course_end_date', result)
+        self.assertIn('account_settings_url', result)
+        self.assertIn('email_settings_url', result)
+        self.assertIn('platform_name', result)
diff --git a/lms/djangoapps/commerce/migrations/0005_auto_20160831_0247.py b/lms/djangoapps/commerce/migrations/0005_auto_20160831_0247.py
deleted file mode 100644
index fd94a1d798..0000000000
--- a/lms/djangoapps/commerce/migrations/0005_auto_20160831_0247.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sites', '0001_initial'),
-        ('commerce', '0004_auto_20160531_0950'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='commerceconfiguration',
-            name='receipt_page',
-        ),
-        migrations.AddField(
-            model_name='commerceconfiguration',
-            name='site',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, blank=True, to='sites.Site', null=True),
-        ),
-    ]
diff --git a/lms/djangoapps/commerce/models.py b/lms/djangoapps/commerce/models.py
index 70c2f7b9ef..586a69ade6 100644
--- a/lms/djangoapps/commerce/models.py
+++ b/lms/djangoapps/commerce/models.py
@@ -1,15 +1,10 @@
 """
 Commerce-related models.
 """
-from django.contrib.sites.models import Site
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
 from config_models.models import ConfigurationModel
-from openedx.core.djangoapps.site_configuration.models import SiteConfiguration
-
-from logging import getLogger
-logger = getLogger(__name__)  # pylint: disable=invalid-name
 
 
 class CommerceConfiguration(ConfigurationModel):
@@ -38,41 +33,15 @@ class CommerceConfiguration(ConfigurationModel):
             'Specified in seconds. Enable caching by setting this to a value greater than 0.'
         )
     )
-    site = models.ForeignKey(
-        Site,
-        on_delete=models.SET_NULL,
-        blank=True,
-        null=True
+    receipt_page = models.CharField(
+        max_length=255,
+        default='/commerce/checkout/receipt/?orderNum=',
+        help_text=_('Path to order receipt page.')
     )
 
     def __unicode__(self):
         return "Commerce configuration"
 
-    def get_receipt_page_url(self, order_number):
-        """
-        Return absolute receipt page URL.
-
-        Arguments:
-            order_number (str): Order number
-
-        Returns:
-            Absolute receipt page URL, consisting of site domain and site receipt page.
-        """
-        site = self.site
-        if site:
-            try:
-                return '{site_domain}{receipt_page_url}{order_number}'.format(
-                    site_domain=site.domain,
-                    receipt_page_url=site.configuration.receipt_page_url,  # pylint: disable=no-member
-                    order_number=order_number
-                )
-            except AttributeError:
-                logger.info("Site Configuration is not enabled for site (%s).", site)
-        return '{default_receipt_page_url}{order_number}'.format(
-            default_receipt_page_url=SiteConfiguration.DEFAULT_RECEIPT_PAGE_URL,
-            order_number=order_number
-        )
-
     @property
     def is_cache_enabled(self):
         """Whether responses from the Ecommerce API will be cached."""
diff --git a/lms/djangoapps/commerce/tests/test_models.py b/lms/djangoapps/commerce/tests/test_models.py
deleted file mode 100644
index 8c593718da..0000000000
--- a/lms/djangoapps/commerce/tests/test_models.py
+++ /dev/null
@@ -1,64 +0,0 @@
-""" Tests for commerce models. """
-
-import ddt
-
-from django.test import TestCase
-
-from commerce.models import CommerceConfiguration
-from microsite_configuration.tests.factories import SiteFactory
-from openedx.core.djangoapps.site_configuration.models import SiteConfiguration
-from openedx.core.djangoapps.site_configuration.tests.factories import SiteConfigurationFactory
-
-
-@ddt.ddt
-class CommerceConfigurationModelTests(TestCase):
-    """ Tests for the CommerceConfiguration model. """
-
-    def setUp(self):
-        """
-        Create CommerceConfiguration object
-        """
-        super(CommerceConfigurationModelTests, self).setUp()
-        self.site = SiteFactory()
-        self.order_number = "TEST_ORDER_NUMBER"
-
-    def configure_commerce(self, is_configured, is_default_page):
-        """
-        Helper for creating specific Commerce Configuration.
-
-        Arguments:
-            is_configured (bool): Indicates whether or not the Site has Site Configuration.
-            is_default_page (bool): Indicates whether or not the LMS receipt page is used
-
-        Returns:
-            Commerce configuration.
-        """
-        if not is_default_page:
-            if is_configured:
-                SiteConfigurationFactory.create(
-                    site=self.site,
-                    receipt_page_url='receipt/page/url',
-                )
-
-        return CommerceConfiguration.objects.create(
-            enabled=True,
-            site=self.site if not is_default_page else None
-        )
-
-    @ddt.data((True, False), (False, False), (False, True))
-    @ddt.unpack
-    def test_get_receipt_page_url_site_configured(self, is_configured, is_default_page):
-        commerce_configuration = self.configure_commerce(is_configured, is_default_page)
-        receipt_page_url = commerce_configuration.get_receipt_page_url(self.order_number)
-        expected_receipt_page_url = '{site_domain}{receipt_page_url}{order_number}'.format(
-            site_domain=self.site.domain,
-            receipt_page_url=self.site.configuration.receipt_page_url,  # pylint: disable=no-member
-            order_number=self.order_number
-        ) if (is_configured and not is_default_page) else '{default_receipt_page_url}{order_number}'.format(
-            default_receipt_page_url=SiteConfiguration.DEFAULT_RECEIPT_PAGE_URL,
-            order_number=self.order_number
-        )
-        self.assertEqual(
-            receipt_page_url,
-            expected_receipt_page_url
-        )
diff --git a/lms/djangoapps/courseware/tests/test_password_history.py b/lms/djangoapps/courseware/tests/test_password_history.py
index ec5656e993..0f9a26eb77 100644
--- a/lms/djangoapps/courseware/tests/test_password_history.py
+++ b/lms/djangoapps/courseware/tests/test_password_history.py
@@ -2,6 +2,7 @@
 This file will test through the LMS some of the PasswordHistory features
 """
 import json
+import ddt
 from mock import patch
 from uuid import uuid4
 from nose.plugins.attrib import attr
@@ -23,6 +24,7 @@ from courseware.tests.helpers import LoginEnrollmentTestCase
 
 @attr(shard=1)
 @patch.dict("django.conf.settings.FEATURES", {'ADVANCED_SECURITY': True})
+@ddt.ddt
 class TestPasswordHistory(LoginEnrollmentTestCase):
     """
     Go through some of the PasswordHistory use cases
@@ -71,16 +73,18 @@ class TestPasswordHistory(LoginEnrollmentTestCase):
         history = PasswordHistory()
         history.create(user)
 
-    def assertPasswordResetError(self, response, error_message):
+    def assertPasswordResetError(self, response, error_message, valid_link=False):
         """
         This method is a custom assertion that verifies that a password reset
         view returns an error response as expected.
         Args:
             response: response from calling a password reset endpoint
             error_message: message we expect to see in the response
+            valid_link: if the current password reset link is still valid
 
         """
-        self.assertFalse(response.context_data['validlink'])
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context_data['validlink'], valid_link)
         self.assertIn(error_message, response.content)
 
     @patch.dict("django.conf.settings.ADVANCED_SECURITY_CONFIG", {'MIN_DAYS_FOR_STAFF_ACCOUNTS_PASSWORD_RESETS': None})
@@ -338,3 +342,28 @@ class TestPasswordHistory(LoginEnrollmentTestCase):
         }, follow=True)
 
         self.assertIn(success_msg, resp.content)
+
+    @ddt.data(
+        ('foo', 'foobar'),
+        ('', ''),
+    )
+    @ddt.unpack
+    def test_password_reset_form_invalid(self, password1, password2):
+        """
+        Tests that password reset fail when providing bad passwords and error message is displayed
+        to the user.
+        """
+        user_email, _ = self._setup_user()
+        err_msg = 'Error in resetting your password. Please try again.'
+
+        # try to reset password, it should fail
+        user = User.objects.get(email=user_email)
+        token = default_token_generator.make_token(user)
+        uidb36 = int_to_base36(user.id)
+
+        # try to do a password reset with the same password as before
+        resp = self.client.post('/password_reset_confirm/{0}-{1}/'.format(uidb36, token), {
+            'new_password1': password1,
+            'new_password2': password2,
+        }, follow=True)
+        self.assertPasswordResetError(resp, err_msg, valid_link=True)
diff --git a/lms/djangoapps/courseware/tests/test_submitting_problems.py b/lms/djangoapps/courseware/tests/test_submitting_problems.py
index 9262e1b6d4..b7287999bd 100644
--- a/lms/djangoapps/courseware/tests/test_submitting_problems.py
+++ b/lms/djangoapps/courseware/tests/test_submitting_problems.py
@@ -354,7 +354,21 @@ class TestCourseGrader(TestSubmittingProblems):
         self.add_dropdown_to_section(self.homework.location, 'p3', 1)
         self.refresh_course()
 
-    def weighted_setup(self):
+    def weighted_setup(self, hw_weight=0.25, final_weight=0.75):
+        """
+        Set up a simple course for testing weighted grading functionality.
+        """
+        # pylint: disable=attribute-defined-outside-init
+
+        self.set_weighted_policy(hw_weight, final_weight)
+
+        # set up a structure of 1 homework and 1 final
+        self.homework = self.add_graded_section_to_course('homework')
+        self.problem = self.add_dropdown_to_section(self.homework.location, 'H1P1')
+        self.final = self.add_graded_section_to_course('Final Section', 'Final')
+        self.final_question = self.add_dropdown_to_section(self.final.location, 'FinalQuestion')
+
+    def set_weighted_policy(self, hw_weight=0.25, final_weight=0.75):
         """
         Set up a simple course for testing weighted grading functionality.
         """
@@ -366,23 +380,17 @@ class TestCourseGrader(TestSubmittingProblems):
                     "min_count": 1,
                     "drop_count": 0,
                     "short_label": "HW",
-                    "weight": 0.25
+                    "weight": hw_weight
                 }, {
                     "type": "Final",
                     "name": "Final Section",
                     "short_label": "Final",
-                    "weight": 0.75
+                    "weight": final_weight
                 }
             ]
         }
         self.add_grading_policy(grading_policy)
 
-        # set up a structure of 1 homework and 1 final
-        self.homework = self.add_graded_section_to_course('homework')
-        self.problem = self.add_dropdown_to_section(self.homework.location, 'H1P1')
-        self.final = self.add_graded_section_to_course('Final Section', 'Final')
-        self.final_question = self.add_dropdown_to_section(self.final.location, 'FinalQuestion')
-
     def dropping_setup(self):
         """
         Set up a simple course for testing the dropping grading functionality.
@@ -619,6 +627,17 @@ class TestCourseGrader(TestSubmittingProblems):
         self.submit_question_answer('FinalQuestion', {'2_1': 'Correct', '2_2': 'Correct'})
         self.check_grade_percent(1.0)
 
+    def test_grade_updates_on_weighted_change(self):
+        """
+        Test that the course grade updates when the
+        assignment weights change.
+        """
+        self.weighted_setup()
+        self.submit_question_answer('H1P1', {'2_1': 'Correct', '2_2': 'Correct'})
+        self.check_grade_percent(0.25)
+        self.set_weighted_policy(0.75, 0.25)
+        self.check_grade_percent(0.75)
+
     def dropping_homework_stage1(self):
         """
         Get half the first homework correct and all of the second
diff --git a/lms/djangoapps/discussion_api/api.py b/lms/djangoapps/discussion_api/api.py
index 7c03c5d0c6..3b364289ee 100644
--- a/lms/djangoapps/discussion_api/api.py
+++ b/lms/djangoapps/discussion_api/api.py
@@ -916,6 +916,11 @@ def update_thread(request, thread_id, update_data):
         thread_edited.send(sender=None, user=request.user, post=cc_thread)
     api_thread = serializer.data
     _do_extra_actions(api_thread, cc_thread, update_data.keys(), actions_form, context, request)
+
+    # always return read as True (and therefore unread_comment_count=0) as reasonably
+    # accurate shortcut, rather than adding additional processing.
+    api_thread['read'] = True
+    api_thread['unread_comment_count'] = 0
     return api_thread
 
 
diff --git a/lms/djangoapps/discussion_api/tests/test_api.py b/lms/djangoapps/discussion_api/tests/test_api.py
index f7e60a0df2..57a8fb4085 100644
--- a/lms/djangoapps/discussion_api/tests/test_api.py
+++ b/lms/djangoapps/discussion_api/tests/test_api.py
@@ -2047,7 +2047,7 @@ class UpdateThreadTest(
             "endorsed_comment_list_url": None,
             "non_endorsed_comment_list_url": None,
             "editable_fields": ["abuse_flagged", "following", "raw_body", "read", "title", "topic_id", "type", "voted"],
-            'read': False,
+            'read': True,
             'has_endorsed': False,
             'response_count': 0
         }
diff --git a/lms/djangoapps/discussion_api/tests/test_views.py b/lms/djangoapps/discussion_api/tests/test_views.py
index aa16e260c6..ea6444b81f 100644
--- a/lms/djangoapps/discussion_api/tests/test_views.py
+++ b/lms/djangoapps/discussion_api/tests/test_views.py
@@ -833,7 +833,7 @@ class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTest
 
     def test_basic(self):
         self.register_get_user_response(self.user)
-        self.register_thread({"created_at": "Test Created Date", "updated_at": "Test Updated Date"})
+        self.register_thread({"created_at": "Test Created Date", "updated_at": "Test Updated Date", "read": True})
         request_data = {"raw_body": "Edited body"}
         response = self.request_patch(request_data)
         self.assertEqual(response.status_code, 200)
@@ -849,6 +849,7 @@ class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTest
                 "created_at": "Test Created Date",
                 "updated_at": "Test Updated Date",
                 "comment_count": 1,
+                "read": True,
             })
         )
         self.assertEqual(
@@ -864,7 +865,7 @@ class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTest
                 "anonymous_to_peers": ["False"],
                 "closed": ["False"],
                 "pinned": ["False"],
-                "read": ["False"],
+                "read": ["True"],
             }
         )
 
diff --git a/lms/djangoapps/grades/new/course_grade.py b/lms/djangoapps/grades/new/course_grade.py
index 003f03a02f..c31c56b5f8 100644
--- a/lms/djangoapps/grades/new/course_grade.py
+++ b/lms/djangoapps/grades/new/course_grade.py
@@ -40,7 +40,6 @@ class CourseGrade(object):
                     graded_total = subsection_grade.graded_total
                     if graded_total.possible > 0:
                         subsections_by_format[subsection_grade.format].append(graded_total)
-        self._log_event(log.info, u"subsections_by_format")
         return subsections_by_format
 
     @lazy
@@ -52,7 +51,6 @@ class CourseGrade(object):
         for chapter in self.chapter_grades:
             for subsection_grade in chapter['sections']:
                 locations_to_weighted_scores.update(subsection_grade.locations_to_weighted_scores)
-        self._log_event(log.info, u"locations_to_weighted_scores")
         return locations_to_weighted_scores
 
     @lazy
@@ -66,7 +64,10 @@ class CourseGrade(object):
             self.subsection_grade_totals_by_format,
             generate_random_scores=settings.GENERATE_PROFILE_SCORES
         )
-        self._log_event(log.info, u"grade_value")
+        # can't use the existing properties due to recursion issues caused by referencing self.grade_value
+        percent = self._calc_percent(grade_value)
+        letter_grade = self._compute_letter_grade(percent)
+        self._log_event(log.warning, u"grade_value, percent: {0}, grade: {1}".format(percent, letter_grade))
         return grade_value
 
     @property
@@ -82,7 +83,7 @@ class CourseGrade(object):
         """
         Returns a rounded percent from the overall grade.
         """
-        return round(self.grade_value['percent'] * 100 + 0.05) / 100
+        return self._calc_percent(self.grade_value)
 
     @property
     def letter_grade(self):
@@ -114,7 +115,6 @@ class CourseGrade(object):
         grade_summary['totaled_scores'] = self.subsection_grade_totals_by_format
         grade_summary['raw_scores'] = list(self.locations_to_weighted_scores.itervalues())
 
-        self._log_event(log.warning, u"grade_summary, percent: {0}, grade: {1}".format(self.percent, self.letter_grade))
         return grade_summary
 
     def compute_and_update(self, read_only=False):
@@ -123,7 +123,6 @@ class CourseGrade(object):
 
         If read_only is True, doesn't save any updates to the grades.
         """
-        self._log_event(log.warning, u"compute_and_update, read_only: {}".format(read_only))
         subsection_grade_factory = SubsectionGradeFactory(self.student, self.course, self.course_structure)
         for chapter_key in self.course_structure.get_children(self.course.location):
             chapter = self.course_structure[chapter_key]
@@ -139,10 +138,23 @@ class CourseGrade(object):
                 'sections': chapter_subsection_grades
             })
 
+        subsections_total = sum(len(x) for x in self.subsection_grade_totals_by_format.itervalues())
+        subsections_read = len(subsection_grade_factory._unsaved_subsection_grades)  # pylint: disable=protected-access
+        subsections_created = subsections_total - subsections_read
+        blocks_total = len(self.locations_to_weighted_scores)
         if not read_only:
             subsection_grade_factory.bulk_create_unsaved()
 
         self._signal_listeners_when_grade_computed()
+        self._log_event(
+            log.warning,
+            u"compute_and_update, read_only: {0}, subsections read/created: {1}/{2}, blocks accessed: {3}".format(
+                read_only,
+                subsections_read,
+                subsections_created,
+                blocks_total,
+            )
+        )
 
     def score_for_module(self, location):
         """
@@ -166,6 +178,13 @@ class CourseGrade(object):
             possible += child_possible
         return earned, possible
 
+    @staticmethod
+    def _calc_percent(grade_value):
+        """
+        Helper for percent calculation.
+        """
+        return round(grade_value['percent'] * 100 + 0.05) / 100
+
     def _compute_letter_grade(self, percentage):
         """
         Returns a letter grade as defined in grading_policy (e.g. 'A' 'B' 'C' for 6.002x) or None.
diff --git a/lms/djangoapps/grades/new/subsection_grade.py b/lms/djangoapps/grades/new/subsection_grade.py
index 1488c29b5c..bf1c1e359b 100644
--- a/lms/djangoapps/grades/new/subsection_grade.py
+++ b/lms/djangoapps/grades/new/subsection_grade.py
@@ -33,7 +33,7 @@ def persistence_safe_fallback():
     except DatabaseError:
         # Error deliberately logged, then swallowed. It's assumed that the wrapped code is not guaranteed to succeed.
         # TODO: enqueue a celery task to finish the task asynchronously, see TNL-5471
-        log.warning("Persistent Grades: Persistence Error, falling back.\n{}".format(format_exc()))
+        log.warning("Persistent Grades: database_error.safe_fallback.\n{}".format(format_exc()))
 
 
 class SubsectionGrade(object):
@@ -80,7 +80,7 @@ class SubsectionGrade(object):
                 student, descendant_key, course_structure, scores_client, submissions_scores, persisted_values={},
             )
         self.all_total, self.graded_total = graders.aggregate_scores(self.scores, self.display_name, self.location)
-        self._log_event(log.warning, u"init_from_structure", student)
+        self._log_event(log.info, u"init_from_structure", student)
 
     def init_from_model(self, student, model, course_structure, scores_client, submissions_scores):
         """
@@ -112,7 +112,7 @@ class SubsectionGrade(object):
             section=self.display_name,
             module_id=self.location,
         )
-        self._log_event(log.warning, u"init_from_model", student)
+        self._log_event(log.info, u"init_from_model", student)
 
     @classmethod
     def bulk_create_models(cls, student, subsection_grades, course_key):
@@ -275,7 +275,7 @@ class SubsectionGradeFactory(object):
         If read_only is True, doesn't save any updates to the grades.
         """
         self._log_event(
-            log.warning, u"create, read_only: {0}, subsection: {1}".format(read_only, subsection.location)
+            log.info, u"create, read_only: {0}, subsection: {1}".format(read_only, subsection.location)
         )
 
         block_structure = self._get_block_structure(block_structure)
@@ -298,7 +298,7 @@ class SubsectionGradeFactory(object):
         """
         Bulk creates all the unsaved subsection_grades to this point.
         """
-        self._log_event(log.warning, u"bulk_create_unsaved")
+        self._log_event(log.info, u"bulk_create_unsaved")
 
         with persistence_safe_fallback():
             SubsectionGrade.bulk_create_models(self.student, self._unsaved_subsection_grades, self.course.id)
diff --git a/lms/djangoapps/grades/scores.py b/lms/djangoapps/grades/scores.py
index e653ae2521..d711ce2854 100644
--- a/lms/djangoapps/grades/scores.py
+++ b/lms/djangoapps/grades/scores.py
@@ -89,7 +89,12 @@ def get_score(user, block, scores_client, submissions_scores_cache, weight, poss
         if possible is None:
             possible = score.total
         elif possible != score.total:
-            log.error(u"Persisted Grades: possible value {} != score.total value {}".format(possible, score.total))
+            log.error(
+                u"Persistent Grades: scores.get_score, possible value {} != score.total value {}".format(
+                    possible,
+                    score.total
+                )
+            )
     else:
         # This means we don't have a valid score entry and we don't have a
         # cached_max_score on hand. We know they've earned 0.0 points on this.
diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py
index 5ca8eb0d6a..be8f26b534 100644
--- a/lms/djangoapps/instructor_task/tests/test_base.py
+++ b/lms/djangoapps/instructor_task/tests/test_base.py
@@ -208,15 +208,24 @@ class InstructorTaskModuleTestCase(InstructorTaskCourseTestCase):
         else:
             return TEST_COURSE_KEY.make_usage_key('problem', problem_url_name)
 
+    def _option_problem_factory_args(self, correct_answer=OPTION_1, num_inputs=1, num_responses=2):
+        """
+        Returns the factory args for the option problem type.
+        """
+        return {
+            'question_text': 'The correct answer is {0}'.format(correct_answer),
+            'options': [OPTION_1, OPTION_2],
+            'correct_option': correct_answer,
+            'num_responses': num_responses,
+            'num_inputs': num_inputs,
+        }
+
     def define_option_problem(self, problem_url_name, parent=None, **kwargs):
         """Create the problem definition so the answer is Option 1"""
         if parent is None:
             parent = self.problem_section
         factory = OptionResponseXMLFactory()
-        factory_args = {'question_text': 'The correct answer is {0}'.format(OPTION_1),
-                        'options': [OPTION_1, OPTION_2],
-                        'correct_option': OPTION_1,
-                        'num_responses': 2}
+        factory_args = self._option_problem_factory_args()
         problem_xml = factory.build_xml(**factory_args)
         ItemFactory.create(parent_location=parent.location,
                            parent=parent,
@@ -225,13 +234,10 @@ class InstructorTaskModuleTestCase(InstructorTaskCourseTestCase):
                            data=problem_xml,
                            **kwargs)
 
-    def redefine_option_problem(self, problem_url_name):
+    def redefine_option_problem(self, problem_url_name, correct_answer=OPTION_1, num_inputs=1, num_responses=2):
         """Change the problem definition so the answer is Option 2"""
         factory = OptionResponseXMLFactory()
-        factory_args = {'question_text': 'The correct answer is {0}'.format(OPTION_2),
-                        'options': [OPTION_1, OPTION_2],
-                        'correct_option': OPTION_2,
-                        'num_responses': 2}
+        factory_args = self._option_problem_factory_args(correct_answer, num_inputs, num_responses)
         problem_xml = factory.build_xml(**factory_args)
         location = InstructorTaskTestCase.problem_location(problem_url_name)
         item = self.module_store.get_item(location)
diff --git a/lms/djangoapps/instructor_task/tests/test_integration.py b/lms/djangoapps/instructor_task/tests/test_integration.py
index afd241a9cc..315aac8fc6 100644
--- a/lms/djangoapps/instructor_task/tests/test_integration.py
+++ b/lms/djangoapps/instructor_task/tests/test_integration.py
@@ -5,6 +5,8 @@ Runs tasks on answers to course problems to validate that code
 paths actually work.
 
 """
+from collections import namedtuple
+import ddt
 import json
 import logging
 from mock import patch
@@ -37,6 +39,7 @@ from instructor_task.tests.test_base import (
 )
 from capa.responsetypes import StudentInputError
 from lms.djangoapps.lms_xblock.runtime import quote_slashes
+from lms.djangoapps.grades.new.course_grade import CourseGradeFactory
 
 
 log = logging.getLogger(__name__)
@@ -65,6 +68,7 @@ class TestIntegrationTask(InstructorTaskModuleTestCase):
 
 
 @attr(shard=3)
+@ddt.ddt
 class TestRescoringTask(TestIntegrationTask):
     """
     Integration-style tests for rescoring problems in a background task.
@@ -77,10 +81,11 @@ class TestRescoringTask(TestIntegrationTask):
 
         self.initialize_course()
         self.create_instructor('instructor')
-        self.create_student('u1')
-        self.create_student('u2')
-        self.create_student('u3')
-        self.create_student('u4')
+        self.user1 = self.create_student('u1')
+        self.user2 = self.create_student('u2')
+        self.user3 = self.create_student('u3')
+        self.user4 = self.create_student('u4')
+        self.users = [self.user1, self.user2, self.user3, self.user4]
         self.logout()
 
         # set up test user for performing test operations
@@ -103,7 +108,7 @@ class TestRescoringTask(TestIntegrationTask):
         resp = self.client.post(modx_url, {})
         return resp
 
-    def check_state(self, username, descriptor, expected_score, expected_max_score, expected_attempts):
+    def check_state(self, user, descriptor, expected_score, expected_max_score, expected_attempts=1):
         """
         Check that the StudentModule state contains the expected values.
 
@@ -111,7 +116,7 @@ class TestRescoringTask(TestIntegrationTask):
 
         Values checked include the number of attempts, the score, and the max score for a problem.
         """
-        module = self.get_student_module(username, descriptor)
+        module = self.get_student_module(user.username, descriptor)
         self.assertEqual(module.grade, expected_score)
         self.assertEqual(module.max_grade, expected_max_score)
         state = json.loads(module.state)
@@ -123,6 +128,16 @@ class TestRescoringTask(TestIntegrationTask):
             self.assertGreater(len(state['correct_map']), 0)
             self.assertGreater(len(state['student_answers']), 0)
 
+        # assume only one problem in the subsection and the grades
+        # are in sync.
+        expected_subsection_grade = expected_score
+
+        course_grade = CourseGradeFactory(user).create(self.course)
+        self.assertEquals(
+            course_grade.subsection_grade_totals_by_format['Homework'][0].earned,
+            expected_subsection_grade,
+        )
+
     def submit_rescore_all_student_answers(self, instructor, problem_url_name):
         """Submits the particular problem for rescoring"""
         return submit_rescore_problem_for_all_students(self.create_task_request(instructor),
@@ -134,8 +149,25 @@ class TestRescoringTask(TestIntegrationTask):
                                                   InstructorTaskModuleTestCase.problem_location(problem_url_name),
                                                   student)
 
-    def test_rescoring_option_problem(self):
-        """Run rescore scenario on option problem"""
+    RescoreTestData = namedtuple('RescoreTestData', 'edit, new_expected_scores, new_expected_max')
+
+    @ddt.data(
+        RescoreTestData(edit=dict(correct_answer=OPTION_2), new_expected_scores=(0, 1, 1, 2), new_expected_max=2),
+        RescoreTestData(edit=dict(num_inputs=2), new_expected_scores=(2, 1, 1, 0), new_expected_max=4),
+        RescoreTestData(edit=dict(num_inputs=4), new_expected_scores=(2, 1, 1, 0), new_expected_max=8),
+        RescoreTestData(edit=dict(num_responses=4), new_expected_scores=(2, 1, 1, 0), new_expected_max=4),
+        RescoreTestData(edit=dict(num_inputs=2, num_responses=4), new_expected_scores=(2, 1, 1, 0), new_expected_max=8),
+    )
+    @ddt.unpack
+    def test_rescoring_option_problem(self, problem_edit, new_expected_scores, new_expected_max):
+        """
+        Run rescore scenario on option problem.
+        Verify rescoring updates grade after content change.
+        Original problem definition has:
+            num_inputs = 1
+            num_responses = 2
+            correct_answer = OPTION_1
+        """
         # get descriptor:
         problem_url_name = 'H1P1'
         self.define_option_problem(problem_url_name)
@@ -148,31 +180,29 @@ class TestRescoringTask(TestIntegrationTask):
         self.submit_student_answer('u3', problem_url_name, [OPTION_2, OPTION_1])
         self.submit_student_answer('u4', problem_url_name, [OPTION_2, OPTION_2])
 
-        self.check_state('u1', descriptor, 2, 2, 1)
-        self.check_state('u2', descriptor, 1, 2, 1)
-        self.check_state('u3', descriptor, 1, 2, 1)
-        self.check_state('u4', descriptor, 0, 2, 1)
+        # verify each user's grade
+        expected_original_scores = (2, 1, 1, 0)
+        expected_original_max = 2
+        for i, user in enumerate(self.users):
+            self.check_state(user, descriptor, expected_original_scores[i], expected_original_max)
 
-        # update the data in the problem definition
-        self.redefine_option_problem(problem_url_name)
-        # confirm that simply rendering the problem again does not result in a change
-        # in the grade:
+        # update the data in the problem definition so the answer changes.
+        self.redefine_option_problem(problem_url_name, **problem_edit)
+
+        # confirm that simply rendering the problem again does not change the grade
         self.render_problem('u1', problem_url_name)
-        self.check_state('u1', descriptor, 2, 2, 1)
+        self.check_state(self.user1, descriptor, expected_original_scores[0], expected_original_max)
 
         # rescore the problem for only one student -- only that student's grade should change:
-        self.submit_rescore_one_student_answer('instructor', problem_url_name, User.objects.get(username='u1'))
-        self.check_state('u1', descriptor, 0, 2, 1)
-        self.check_state('u2', descriptor, 1, 2, 1)
-        self.check_state('u3', descriptor, 1, 2, 1)
-        self.check_state('u4', descriptor, 0, 2, 1)
+        self.submit_rescore_one_student_answer('instructor', problem_url_name, self.user1)
+        self.check_state(self.user1, descriptor, new_expected_scores[0], new_expected_max)
+        for i, user in enumerate(self.users[1:], start=1):  # everyone other than user1
+            self.check_state(user, descriptor, expected_original_scores[i], expected_original_max)
 
         # rescore the problem for all students
         self.submit_rescore_all_student_answers('instructor', problem_url_name)
-        self.check_state('u1', descriptor, 0, 2, 1)
-        self.check_state('u2', descriptor, 1, 2, 1)
-        self.check_state('u3', descriptor, 1, 2, 1)
-        self.check_state('u4', descriptor, 2, 2, 1)
+        for i, user in enumerate(self.users):
+            self.check_state(user, descriptor, new_expected_scores[i], new_expected_max)
 
     def test_rescoring_failure(self):
         """Simulate a failure in rescoring a problem"""
@@ -298,45 +328,45 @@ class TestRescoringTask(TestIntegrationTask):
         location = InstructorTaskModuleTestCase.problem_location(problem_url_name)
         descriptor = self.module_store.get_item(location)
         # run with more than one user
-        userlist = ['u1', 'u2', 'u3', 'u4']
-        for username in userlist:
+        for user in self.users:
             # first render the problem, so that a seed will be created for this user
-            self.render_problem(username, problem_url_name)
+            self.render_problem(user.username, problem_url_name)
             # submit a bogus answer, in order to get the problem to tell us its real answer
             dummy_answer = "1000"
-            self.submit_student_answer(username, problem_url_name, [dummy_answer, dummy_answer])
+            self.submit_student_answer(user.username, problem_url_name, [dummy_answer, dummy_answer])
             # we should have gotten the problem wrong, since we're way out of range:
-            self.check_state(username, descriptor, 0, 1, 1)
+            self.check_state(user, descriptor, 0, 1, expected_attempts=1)
             # dig the correct answer out of the problem's message
-            module = self.get_student_module(username, descriptor)
+            module = self.get_student_module(user.username, descriptor)
             state = json.loads(module.state)
             correct_map = state['correct_map']
             log.info("Correct Map: %s", correct_map)
             # only one response, so pull it out:
             answer = correct_map.values()[0]['msg']
-            self.submit_student_answer(username, problem_url_name, [answer, answer])
+            self.submit_student_answer(user.username, problem_url_name, [answer, answer])
             # we should now get the problem right, with a second attempt:
-            self.check_state(username, descriptor, 1, 1, 2)
+            self.check_state(user, descriptor, 1, 1, expected_attempts=2)
 
         # redefine the problem (as stored in Mongo) so that the definition of correct changes
         self.define_randomized_custom_response_problem(problem_url_name, redefine=True)
         # confirm that simply rendering the problem again does not result in a change
         # in the grade (or the attempts):
         self.render_problem('u1', problem_url_name)
-        self.check_state('u1', descriptor, 1, 1, 2)
+        self.check_state(self.user1, descriptor, 1, 1, expected_attempts=2)
 
         # rescore the problem for only one student -- only that student's grade should change
         # (and none of the attempts):
         self.submit_rescore_one_student_answer('instructor', problem_url_name, User.objects.get(username='u1'))
-        for username in userlist:
-            self.check_state(username, descriptor, 0 if username == 'u1' else 1, 1, 2)
+        for user in self.users:
+            expected_score = 0 if user.username == 'u1' else 1
+            self.check_state(user, descriptor, expected_score, 1, expected_attempts=2)
 
         # rescore the problem for all students
         self.submit_rescore_all_student_answers('instructor', problem_url_name)
 
         # all grades should change to being wrong (with no change in attempts)
-        for username in userlist:
-            self.check_state(username, descriptor, 0, 1, 2)
+        for user in self.users:
+            self.check_state(user, descriptor, 0, 1, expected_attempts=2)
 
 
 class TestResetAttemptsTask(TestIntegrationTask):
diff --git a/lms/djangoapps/student_account/test/test_views.py b/lms/djangoapps/student_account/test/test_views.py
index 656c275062..1f75f64023 100644
--- a/lms/djangoapps/student_account/test/test_views.py
+++ b/lms/djangoapps/student_account/test/test_views.py
@@ -126,11 +126,8 @@ class StudentAccountUpdateTest(CacheIsolationTestCase, UrlResetMixin):
         self.assertTrue(result)
 
         # Try reusing the activation link to change the password again
-        response = self.client.post(
-            activation_link,
-            {'new_password1': self.OLD_PASSWORD, 'new_password2': self.OLD_PASSWORD},
-            follow=True
-        )
+        # Visit the activation link again.
+        response = self.client.get(activation_link)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "This password reset link is invalid. It may have been used already.")
 
diff --git a/lms/djangoapps/student_account/views.py b/lms/djangoapps/student_account/views.py
index 78e6f4d852..d0c52341c2 100644
--- a/lms/djangoapps/student_account/views.py
+++ b/lms/djangoapps/student_account/views.py
@@ -347,7 +347,7 @@ def get_user_orders(user):
                                     'order_date': strftime_localized(
                                         date_placed.replace(tzinfo=pytz.UTC), 'SHORT_DATE'
                                     ),
-                                    'receipt_url': commerce_configuration.get_receipt_page_url(order['number'])
+                                    'receipt_url': commerce_configuration.receipt_page + order['number']
                                 }
                                 user_orders.append(order_data)
                             except KeyError:
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 9f71896d22..bc52bb4ed6 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -274,6 +274,13 @@ if ENV_TOKENS.get('COMPREHENSIVE_THEME_DIR', None):
     COMPREHENSIVE_THEME_DIR = ENV_TOKENS.get('COMPREHENSIVE_THEME_DIR')
 
 COMPREHENSIVE_THEME_DIRS = ENV_TOKENS.get('COMPREHENSIVE_THEME_DIRS', COMPREHENSIVE_THEME_DIRS) or []
+
+# COMPREHENSIVE_THEME_LOCALE_PATHS contain the paths to themes locale directories e.g.
+# "COMPREHENSIVE_THEME_LOCALE_PATHS" : [
+#        "/edx/src/edx-themes/conf/locale"
+#    ],
+COMPREHENSIVE_THEME_LOCALE_PATHS = ENV_TOKENS.get('COMPREHENSIVE_THEME_LOCALE_PATHS', [])
+
 DEFAULT_SITE_THEME = ENV_TOKENS.get('DEFAULT_SITE_THEME', DEFAULT_SITE_THEME)
 ENABLE_COMPREHENSIVE_THEMING = ENV_TOKENS.get('ENABLE_COMPREHENSIVE_THEMING', ENABLE_COMPREHENSIVE_THEMING)
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 1acd1da91a..0dc4b47b0a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2950,6 +2950,9 @@ SITE_ID = 1
 # dir containing all themes
 COMPREHENSIVE_THEME_DIRS = [REPO_ROOT / "themes"]
 
+# Theme directory locale paths
+COMPREHENSIVE_THEME_LOCALE_PATHS = []
+
 # Theme to use when no site or site theme is defined,
 # set to None if you want to use openedx theme
 DEFAULT_SITE_THEME = None
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 0afd3d6780..def7a840bc 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -588,6 +588,7 @@ OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application'
 COURSE_CATALOG_API_URL = 'https://catalog.example.com/api/v1'
 
 COMPREHENSIVE_THEME_DIRS = [REPO_ROOT / "themes", REPO_ROOT / "common/test"]
+COMPREHENSIVE_THEME_LOCALE_PATHS = [REPO_ROOT / "themes/conf/locale", ]
 
 LMS_ROOT_URL = "http://localhost:8000"
 
diff --git a/lms/static/js/i18n/ar/djangojs.js b/lms/static/js/i18n/ar/djangojs.js
index 4dc9b10999..538edcb37a 100644
--- a/lms/static/js/i18n/ar/djangojs.js
+++ b/lms/static/js/i18n/ar/djangojs.js
@@ -667,7 +667,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 post title": "\u062a\u0639\u062f\u064a\u0644 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 ", 
     "Edit the name": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0627\u0633\u0645", 
     "Edit the program marketing slug": "\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0634\u0627\u0631\u0629 \u0627\u0644\u062a\u0633\u0648\u064a\u0642\u064a\u0629 \u0644\u0644\u0628\u0631\u0646\u0627\u0645\u062c", 
     "Edit the program subtitle": "\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0641\u0631\u0639\u064a \u0644\u0644\u0628\u0631\u0646\u0627\u0645\u062c.", 
@@ -716,7 +715,6 @@
     "Enter the page number you'd like to quickly navigate to.": "\u0623\u062f\u062e\u0644 \u0631\u0642\u0645 \u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u062a\u064a \u062a\u0648\u062f \u0627\u0644\u0648\u0644\u0648\u062c \u0625\u0644\u064a\u0647\u0627", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u0623\u062f\u062e\u0644 \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0623\u0648 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0644\u0643\u0644 \u0645\u062a\u0639\u0644\u0651\u0645 \u062a\u0631\u0639\u0628 \u0628\u0625\u0636\u0627\u0641\u062a\u0647 \u0643\u0627\u0633\u062a\u062b\u0646\u0627\u0621.", 
     "Enter username or email": "\u0623\u062f\u062e\u0644 \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0623\u0648 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a", 
-    "Enter your question or comment": "\u0623\u064e\u062f\u062e\u0650\u0644 \u0633\u0624\u0627\u0644\u0643 \u0623\u0648 \u062a\u0639\u0644\u064a\u0642\u0643", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "\u062c\u0627\u0631\u064a \u0625\u0639\u0627\u062f\u0629 \u0636\u0628\u0637 \u0645\u062d\u0627\u0648\u0644\u0627\u062a \u0627\u0645\u062a\u062d\u0627\u0646 \u0627\u0644\u062f\u062e\u0648\u0644 \u0644\u0644\u0637\u0627\u0644\u0628 '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "\u062c\u0627\u0631\u064a \u062d\u0630\u0641 \u062d\u0627\u0644\u0629 \u0627\u0645\u062a\u062d\u0627\u0646 \u0627\u0644\u062f\u062e\u0648\u0644 \u0644\u0644\u0637\u0627\u0644\u0628 '{student_id}'.", 
     "Error": "\u062e\u0637\u0623", 
@@ -2053,7 +2051,6 @@
     "less than a minute": "\u0623\u0642\u0644\u0651 \u0645\u0646 \u062f\u0642\u064a\u0642\u0629", 
     "marked as answer %(time_ago)s": "\u0645\u0648\u0633\u0648\u0645\u0629 \u0643\u0625\u062c\u0627\u0628\u0629 %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "\u0645\u0648\u0633\u0648\u0645\u0629 \u0643\u0625\u062c\u0627\u0628\u0629 %(time_ago)s \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645 %(user)s", 
-    "message": "\u0631\u0633\u0627\u0644\u0629", 
     "name": "\u0627\u0644\u0627\u0633\u0645  ", 
     "not enrolled": "\u063a\u064a\u0631 \u0645\u0633\u062c\u0644", 
     "off": "\u063a\u064a\u0631 \u0645\u0641\u0639\u0651\u0644", 
diff --git a/lms/static/js/i18n/eo/djangojs.js b/lms/static/js/i18n/eo/djangojs.js
index ca1423e41f..04e77e1274 100644
--- a/lms/static/js/i18n/eo/djangojs.js
+++ b/lms/static/js/i18n/eo/djangojs.js
@@ -412,6 +412,7 @@
     "Common Problem Types": "\u00c7\u00f6mm\u00f6n Pr\u00f6\u00dfl\u00e9m T\u00fdp\u00e9s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "Community TA": "\u00c7\u00f6mm\u00fcn\u00eft\u00fd T\u00c0 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#", 
     "Component": "\u00c7\u00f6mp\u00f6n\u00e9nt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#", 
+    "Component Location ID": "\u00c7\u00f6mp\u00f6n\u00e9nt L\u00f6\u00e7\u00e4t\u00ef\u00f6n \u00ccD \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "Configure": "\u00c7\u00f6nf\u00efg\u00fcr\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#", 
     "Confirm": "\u00c7\u00f6nf\u00efrm \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #", 
     "Confirm Timed Transcript": "\u00c7\u00f6nf\u00efrm T\u00efm\u00e9d Tr\u00e4ns\u00e7r\u00efpt \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#", 
@@ -528,7 +529,6 @@
     "Discussion": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#", 
     "Discussion Home": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n H\u00f6m\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1#", 
     "Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n \u00e4dm\u00efns, m\u00f6d\u00e9r\u00e4t\u00f6rs, \u00e4nd T\u00c0s \u00e7\u00e4n m\u00e4k\u00e9 th\u00e9\u00efr p\u00f6sts v\u00efs\u00ef\u00dfl\u00e9 t\u00f6 \u00e4ll st\u00fcd\u00e9nts \u00f6r sp\u00e9\u00e7\u00eff\u00fd \u00e4 s\u00efngl\u00e9 \u00e7\u00f6h\u00f6rt. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #", 
-    "Discussion topics; currently listing: ": "D\u00efs\u00e7\u00fcss\u00ef\u00f6n t\u00f6p\u00ef\u00e7s; \u00e7\u00fcrr\u00e9ntl\u00fd l\u00efst\u00efng:  \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#", 
     "Display Name": "D\u00efspl\u00e4\u00fd N\u00e4m\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#", 
     "Div": "D\u00efv \u2c60'\u03c3\u044f\u0454\u043c#", 
     "Do not show again": "D\u00f6 n\u00f6t sh\u00f6w \u00e4g\u00e4\u00efn \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454#", 
@@ -691,7 +691,6 @@
     "Files must be in JPEG or PNG format.": "F\u00efl\u00e9s m\u00fcst \u00df\u00e9 \u00efn JP\u00c9G \u00f6r PNG f\u00f6rm\u00e4t. \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#", 
     "Fill browser": "F\u00efll \u00dfr\u00f6ws\u00e9r \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#", 
     "Filter and sort topics": "F\u00eflt\u00e9r \u00e4nd s\u00f6rt t\u00f6p\u00ef\u00e7s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#", 
-    "Filter topics": "F\u00eflt\u00e9r t\u00f6p\u00ef\u00e7s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#", 
     "Financial Assistance": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #", 
     "Financial Assistance Application": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u00c0ppl\u00ef\u00e7\u00e4t\u00ef\u00f6n \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#", 
     "Find": "F\u00efnd \u2c60'\u03c3\u044f\u0454\u043c \u03b9#", 
diff --git a/lms/static/js/i18n/es-419/djangojs.js b/lms/static/js/i18n/es-419/djangojs.js
index fd3c544f99..b8cdd8fb5a 100644
--- a/lms/static/js/i18n/es-419/djangojs.js
+++ b/lms/static/js/i18n/es-419/djangojs.js
@@ -571,7 +571,6 @@
     "Edit Membership": "Editar membres\u00eda", 
     "Edit Team": "Editar Equipo", 
     "Edit Your Name": "Edite su nombre", 
-    "Edit post title": "Editar el t\u00edtulo de la publicaci\u00f3n", 
     "Edit the name": "Editar el nombre", 
     "Edit the program marketing slug": "Editar el slug de marketing para el programa", 
     "Edit the program subtitle": "Editar el subt\u00edtulo del programa", 
@@ -620,7 +619,6 @@
     "Enter the page number you'd like to quickly navigate to.": "Introduzca el n\u00famero de p\u00e1gina al cual le gustar\u00eda dirigirse", 
     "Enter the username or email address of each learner that you want to add as an exception.": "Ingrese el nombre de usuario y correo electr\u00f3nico de cada estudiante que quiere agregar como excepci\u00f3n ", 
     "Enter username or email": "Ingrese el nombre de usuario o el correo electr\u00f3nico.", 
-    "Enter your question or comment": "Ingresa tu pregunta o comentario", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "Intentos para ex\u00e1men de ingreso esta siendo reiniciado para el estudiante '{student_id}'", 
     "Entrance exam state is being deleted for student '{student_id}'.": "El estado del examen de ingreso est\u00e1 siendo borrado para el estudiante '{student_id}'.", 
     "Error": "Error", 
@@ -1930,7 +1928,6 @@
     "less than a minute": "menos de un minuto", 
     "marked as answer %(time_ago)s": "marcado como respuesta %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "marcado como respuesta %(time_ago)s por %(user)s", 
-    "message": "mensaje", 
     "name": "nombre", 
     "not enrolled": "No est\u00e1 inscrito", 
     "off": "Apagar", 
diff --git a/lms/static/js/i18n/fake2/djangojs.js b/lms/static/js/i18n/fake2/djangojs.js
index 3b86aabb30..61e9340803 100644
--- a/lms/static/js/i18n/fake2/djangojs.js
+++ b/lms/static/js/i18n/fake2/djangojs.js
@@ -412,6 +412,7 @@
     "Common Problem Types": "\u023b\u00f8\u026f\u026f\u00f8n \u2c63\u0279\u00f8bl\u01dd\u026f \u0166\u028ed\u01dds", 
     "Community TA": "\u023b\u00f8\u026f\u026fnn\u1d09\u0287\u028e \u0166\u023a", 
     "Component": "\u023b\u00f8\u026fd\u00f8n\u01ddn\u0287", 
+    "Component Location ID": "\u023b\u00f8\u026fd\u00f8n\u01ddn\u0287 \u0141\u00f8\u0254\u0250\u0287\u1d09\u00f8n \u0197\u0110", 
     "Configure": "\u023b\u00f8n\u025f\u1d09\u0183n\u0279\u01dd", 
     "Confirm": "\u023b\u00f8n\u025f\u1d09\u0279\u026f", 
     "Confirm Timed Transcript": "\u023b\u00f8n\u025f\u1d09\u0279\u026f \u0166\u1d09\u026f\u01ddd \u0166\u0279\u0250ns\u0254\u0279\u1d09d\u0287", 
@@ -528,7 +529,6 @@
     "Discussion": "\u0110\u1d09s\u0254nss\u1d09\u00f8n", 
     "Discussion Home": "\u0110\u1d09s\u0254nss\u1d09\u00f8n \u0126\u00f8\u026f\u01dd", 
     "Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.": "\u0110\u1d09s\u0254nss\u1d09\u00f8n \u0250d\u026f\u1d09ns, \u026f\u00f8d\u01dd\u0279\u0250\u0287\u00f8\u0279s, \u0250nd \u0166\u023as \u0254\u0250n \u026f\u0250\u029e\u01dd \u0287\u0265\u01dd\u1d09\u0279 d\u00f8s\u0287s \u028c\u1d09s\u1d09bl\u01dd \u0287\u00f8 \u0250ll s\u0287nd\u01ddn\u0287s \u00f8\u0279 sd\u01dd\u0254\u1d09\u025f\u028e \u0250 s\u1d09n\u0183l\u01dd \u0254\u00f8\u0265\u00f8\u0279\u0287.", 
-    "Discussion topics; currently listing: ": "\u0110\u1d09s\u0254nss\u1d09\u00f8n \u0287\u00f8d\u1d09\u0254s; \u0254n\u0279\u0279\u01ddn\u0287l\u028e l\u1d09s\u0287\u1d09n\u0183: ", 
     "Display Name": "\u0110\u1d09sdl\u0250\u028e N\u0250\u026f\u01dd", 
     "Div": "\u0110\u1d09\u028c", 
     "Do not show again": "\u0110\u00f8 n\u00f8\u0287 s\u0265\u00f8\u028d \u0250\u0183\u0250\u1d09n", 
@@ -691,7 +691,6 @@
     "Files must be in JPEG or PNG format.": "F\u1d09l\u01dds \u026fns\u0287 b\u01dd \u1d09n \u0248\u2c63\u0246\u01e4 \u00f8\u0279 \u2c63N\u01e4 \u025f\u00f8\u0279\u026f\u0250\u0287.", 
     "Fill browser": "F\u1d09ll b\u0279\u00f8\u028ds\u01dd\u0279", 
     "Filter and sort topics": "F\u1d09l\u0287\u01dd\u0279 \u0250nd s\u00f8\u0279\u0287 \u0287\u00f8d\u1d09\u0254s", 
-    "Filter topics": "F\u1d09l\u0287\u01dd\u0279 \u0287\u00f8d\u1d09\u0254s", 
     "Financial Assistance": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd", 
     "Financial Assistance Application": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd \u023addl\u1d09\u0254\u0250\u0287\u1d09\u00f8n", 
     "Find": "F\u1d09nd", 
diff --git a/lms/static/js/i18n/fr/djangojs.js b/lms/static/js/i18n/fr/djangojs.js
index b4482a908f..65896fb10b 100644
--- a/lms/static/js/i18n/fr/djangojs.js
+++ b/lms/static/js/i18n/fr/djangojs.js
@@ -507,7 +507,6 @@
     "Edit HTML": "Editer le code HTML", 
     "Edit Team": "Modifier l'\u00e9quipe", 
     "Edit Your Name": "Modifier votre nom", 
-    "Edit post title": "\u00c9diter le titre du message", 
     "Edit the name": "Modifier le nom", 
     "Edit this certificate?": "Modifier ce certificat ?", 
     "Editable": "Modifiable", 
@@ -548,7 +547,6 @@
     "Enter the page number you'd like to quickly navigate to.": "Saisissez le num\u00e9ro de la page que vous souhaitez atteindre rapidement.", 
     "Enter the username or email address of each learner that you want to add as an exception.": "Saisissez le nom d'utilisateur ou l'adresse email de chaque \u00e9tudiant que vous souhaitez ajouter comme exception.", 
     "Enter username or email": "Veuillez saisir un nom d'utilisateur ou un email.", 
-    "Enter your question or comment": "Saisir votre question ou commentaire", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "Le nombre d'examens d'entr\u00e9e est r\u00e9initialis\u00e9 pour l'\u00e9tudiant '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "Effacement du status de l'examen d'entr\u00e9e pour l'\u00e9tudiant '{student_id}'.", 
     "Error": "Erreur", 
@@ -1637,7 +1635,6 @@
     "less than a minute": "moins d\u2019une minute", 
     "marked as answer %(time_ago)s": "marqu\u00e9 comme r\u00e9ponse %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "marqu\u00e9 comme r\u00e9ponse %(time_ago)s par %(user)s", 
-    "message": "message", 
     "name": "nom", 
     "off": "arr\u00eat", 
     "on": "on", 
diff --git a/lms/static/js/i18n/he/djangojs.js b/lms/static/js/i18n/he/djangojs.js
index 3db921b3cd..30e795d247 100644
--- a/lms/static/js/i18n/he/djangojs.js
+++ b/lms/static/js/i18n/he/djangojs.js
@@ -40,7 +40,7 @@
     "A driver's license, passport, or other government-issued ID with your name and photo": "\u05e8\u05d9\u05e9\u05d9\u05d5\u05df \u05e0\u05d4\u05d9\u05d2\u05d4, \u05d3\u05e8\u05db\u05d5\u05df, \u05d0\u05d5 \u05ea\u05e2\u05d5\u05d3\u05d5\u05ea \u05de\u05d6\u05d4\u05d5\u05ea \u05d0\u05d7\u05e8\u05d5\u05ea \u05e9\u05d4\u05d5\u05e0\u05e4\u05e7\u05d5 \u05d1\u05d9\u05d3\u05d9 \u05d4\u05de\u05d3\u05d9\u05e0\u05d4 \u05d5\u05de\u05db\u05d9\u05dc\u05d5\u05ea \u05d0\u05ea \u05e9\u05de\u05da \u05d5\u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea\u05da", 
     "A list of courses you have just enrolled in as a verified student": "\u05e8\u05e9\u05d9\u05de\u05ea \u05e7\u05d5\u05e8\u05e1\u05d9\u05dd \u05dc\u05d4\u05dd \u05e0\u05e8\u05e9\u05de\u05ea \u05db\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d1\u05e2\u05dc \u05d6\u05d4\u05d5\u05ea \u05de\u05d0\u05d5\u05de\u05ea\u05ea. ", 
     "A short description of the program, including concepts covered and expected outcomes (255 character limit).": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05e7\u05e6\u05e8 \u05e9\u05dc \u05d4\u05ea\u05db\u05e0\u05d9\u05ea \u05db\u05d5\u05dc\u05dc \u05e8\u05e2\u05d9\u05d5\u05e0\u05d5\u05ea \u05e9\u05d4\u05d5\u05e2\u05dc\u05d5 \u05d5\u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e6\u05e4\u05d5\u05d9\u05d5\u05ea (\u05d4\u05de\u05d2\u05d1\u05dc\u05d4 \u05d4\u05d9\u05d0 255 \u05ea\u05d5\u05d5\u05d9\u05dd).", 
-    "A valid email address is required": "\u05d3\u05e8\u05d5\u05e9\u05d4 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05ea\u05e7\u05d9\u05e0\u05d4", 
+    "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 You": "\u05d0\u05d5\u05d3\u05d5\u05ea\u05d9\u05da", 
@@ -88,7 +88,7 @@
     "All Groups": "\u05db\u05dc \u05d4\u05e7\u05d1\u05d5\u05e6\u05d5\u05ea", 
     "All Rights Reserved": "\u05db\u05dc \u05d4\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05e9\u05de\u05d5\u05e8\u05d5\u05ea", 
     "All Topics": "\u05db\u05dc \u05d4\u05e0\u05d5\u05e9\u05d0\u05d9\u05dd", 
-    "All chapters must have a name and asset": "\u05dc\u05db\u05dc \u05d4\u05e4\u05e8\u05e7\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd \u05d5\u05e2\u05e8\u05da", 
+    "All chapters must have a name and asset": "\u05dc\u05db\u05dc \u05d4\u05e4\u05e8\u05e7\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e9\u05dd \u05d5\u05de\u05d3\u05d9\u05d4", 
     "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 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.", 
@@ -128,7 +128,7 @@
     "Back to Dashboard": "\u05d1\u05d7\u05d6\u05e8\u05d4 \u05dc\u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4", 
     "Back to sign in": "\u05d1\u05d7\u05d6\u05e8\u05d4 \u05dc\u05db\u05e0\u05d9\u05e1\u05d4 \u05dc\u05d7\u05e9\u05d1\u05d5\u05df", 
     "Back to {platform} FAQs": "\u05d7\u05d6\u05e8\u05d4 \u05dc\u05e9\u05d0\u05dc\u05d5\u05ea \u05d4\u05e0\u05e4\u05d5\u05e6\u05d5\u05ea \u05e9\u05dc {platform}", 
-    "Basic": "\u05d1\u05e1\u05d9\u05e1\u05d9", 
+    "Basic": "\u05d1\u05e1\u05d9\u05e1", 
     "Be sure your entire face is inside the frame": "\u05d5\u05d3\u05d0 \u05db\u05d9 \u05db\u05dc \u05e4\u05e0\u05d9\u05da \u05de\u05ea\u05d0\u05d9\u05de\u05d9\u05dd \u05dc\u05d2\u05d1\u05d5\u05dc\u05d5\u05ea \u05d4\u05de\u05e1\u05d2\u05e8\u05ea.", 
     "Before proceeding, please confirm that your details match": "\u05d1\u05d8\u05e8\u05dd \u05ea\u05de\u05e9\u05d9\u05da, \u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05d4\u05e4\u05e8\u05d8\u05d9\u05dd \u05ea\u05d5\u05d0\u05de\u05d9\u05dd", 
     "Before you upgrade to a certificate track, you must activate your account.": "\u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05e9\u05d3\u05e8\u05d2 \u05dc\u05de\u05e1\u05dc\u05d5\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da.", 
@@ -211,7 +211,7 @@
     "Content Group Name": "\u05e9\u05dd \u05e7\u05d1\u05d5\u05e6\u05ea \u05ea\u05d5\u05db\u05df", 
     "Content-Specific Discussion Topics": "\u05e0\u05d5\u05e9\u05d0\u05d9 \u05d3\u05d9\u05d5\u05df \u05dc\u05ea\u05d5\u05db\u05df \u05de\u05e1\u05d5\u05d9\u05dd", 
     "Correct failed component": "\u05ea\u05e7\u05df \u05e8\u05db\u05d9\u05d1 \u05db\u05d5\u05e9\u05dc", 
-    "Could not parse certificate JSON. %(message)s": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e4\u05e6\u05dc JSON \u05e9\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4. %(message)s", 
+    "Could not parse certificate JSON. %(message)s": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05e2\u05d1\u05d3 JSON \u05e9\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4. %(message)s", 
     "Country of residence": "\u05d0\u05e8\u05e5 \u05de\u05d2\u05d5\u05e8\u05d9\u05dd", 
     "Course": "\u05e7\u05d5\u05e8\u05e1", 
     "Course Code": "\u05e7\u05d5\u05d3 \u05e7\u05d5\u05e8\u05e1", 
@@ -241,7 +241,7 @@
     "Create an account using": "\u05e6\u05d5\u05e8 \u05d7\u05e9\u05d1\u05d5\u05df \u05d1\u05e2\u05d6\u05e8\u05ea", 
     "Create team.": "\u05e6\u05d5\u05e8 \u05e6\u05d5\u05d5\u05ea.", 
     "Create your account": "\u05e6\u05d5\u05e8 \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da", 
-    "Creative Commons": "\u05e7\u05e8\u05d9\u05d0\u05d8\u05d9\u05d1 \u05e7\u05d5\u05de\u05d5\u05e0\u05e1", 
+    "Creative Commons": "Creative Commons", 
     "Creative Commons licensed content, with terms as follow:": "\u05ea\u05d5\u05db\u05df \u05d1\u05e8\u05d9\u05e9\u05d9\u05d5\u05df Creative Commons, \u05db\u05e4\u05d5\u05e3 \u05dc\u05ea\u05e0\u05d0\u05d9\u05dd \u05d4\u05d1\u05d0\u05d9\u05dd:", 
     "Crossed out items have been refunded.": "\u05ea\u05e9\u05dc\u05d5\u05dd \u05d4\u05d5\u05d7\u05d6\u05e8 \u05e2\u05d1\u05d5\u05e8 \u05e4\u05e8\u05d9\u05d8\u05d9\u05dd \u05e9\u05e0\u05de\u05d7\u05e7\u05d5 ", 
     "Current Role:": "\u05ea\u05e4\u05e7\u05d9\u05d3 \u05e0\u05d5\u05db\u05d7\u05d9:", 
@@ -258,7 +258,7 @@
     "Delete Page Confirmation": "\u05d0\u05d9\u05e9\u05d5\u05e8 \u05de\u05d7\u05d9\u05e7\u05ea \u05e2\u05de\u05d5\u05d3", 
     "Delete Team": "\u05de\u05d7\u05e7 \u05e6\u05d5\u05d5\u05ea", 
     "Delete course": "\u05de\u05d7\u05e7 \u05e7\u05d5\u05e8\u05e1", 
-    "Delete course run": "\u05de\u05d7\u05e7 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d9\u05de\u05d5\u05d3\u05d9\u05dd \u05e9\u05dc \u05e7\u05d5\u05e8\u05e1", 
+    "Delete course run": "\u05de\u05d7\u05e7 \u05d4\u05e8\u05e6\u05ea \u05e7\u05d5\u05e8\u05e1", 
     "Delete the user, {username}": "\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4\u05de\u05e9\u05ea\u05de\u05e9, {username}", 
     "Delete this %(item_display_name)s?": "\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4%(item_display_name)s?", 
     "Delete this %(xblock_type)s (and prerequisite)?": "\u05d4\u05d0\u05dd \u05dc\u05de\u05d7\u05d5\u05e7 %(xblock_type)s \u05d6\u05d4 (\u05d5\u05d0\u05ea \u05d4\u05d3\u05e8\u05d9\u05e9\u05d4 \u05d4\u05de\u05d5\u05e7\u05d3\u05de\u05ea)?", 
@@ -312,7 +312,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 post title": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05db\u05d5\u05ea\u05e8\u05ea \u05d4\u05e4\u05d5\u05e1\u05d8", 
     "Edit the name": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e9\u05dd", 
     "Edit the program marketing slug": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e1\u05dc\u05d0\u05d2 \u05dc\u05e9\u05d9\u05d5\u05d5\u05e7 \u05d4\u05ea\u05db\u05e0\u05d9\u05ea", 
     "Edit the program subtitle": "\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05ea \u05d4\u05ea\u05db\u05e0\u05d9\u05ea", 
@@ -324,7 +323,7 @@
     "Editing comment": "\u05e2\u05d5\u05e8\u05da \u05d4\u05e2\u05e8\u05d4", 
     "Editing post": "\u05e2\u05d5\u05e8\u05da \u05e4\u05d5\u05e1\u05d8", 
     "Editing response": "\u05e2\u05d5\u05e8\u05da \u05ea\u05d2\u05d5\u05d1\u05d4", 
-    "Editing visibility for: %(title)s": "\u05e2\u05d5\u05e8\u05da \u05e0\u05e8\u05d0\u05d5\u05ea: %(title)s", 
+    "Editing visibility for: %(title)s": "\u05e2\u05d5\u05e8\u05da \u05d4\u05e6\u05d2\u05d4/\u05d4\u05e1\u05ea\u05e8\u05d4: %(title)s", 
     "Editing: %(title)s": "\u05e2\u05d5\u05e8\u05da: %(title)s", 
     "Editor": "\u05e2\u05d5\u05e8\u05da", 
     "Email address": "\u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9", 
@@ -342,7 +341,6 @@
     "Enter the name of the cohort": "\u05d4\u05d6\u05df \u05d0\u05ea \u05e9\u05dd \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05d9\u05de\u05d5\u05d3", 
     "Enter the page number you'd like to quickly navigate to.": "\u05d4\u05d6\u05df \u05d0\u05ea \u05de\u05e1\u05e4\u05e8 \u05d4\u05e2\u05de\u05d5\u05d3 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e0\u05d5\u05d5\u05d8 \u05d1\u05d5 \u05d1\u05de\u05d4\u05d9\u05e8\u05d5\u05ea.", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u05d4\u05d6\u05df \u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9 \u05d0\u05d5 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05e9\u05dc \u05db\u05dc \u05dc\u05d5\u05de\u05d3 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05db\u05d7\u05e8\u05d9\u05d2.", 
-    "Enter your question or comment": "\u05d4\u05d6\u05df \u05d0\u05ea \u05e9\u05d0\u05dc\u05ea\u05da \u05d0\u05d5 \u05d4\u05e2\u05e8\u05ea\u05da", 
     "Error adding user": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05d5\u05e1\u05e4\u05ea \u05de\u05e9\u05ea\u05de\u05e9", 
     "Error importing course": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05d1\u05d5\u05d0 \u05e7\u05d5\u05e8\u05e1.", 
     "Error removing user": "\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e1\u05e8\u05ea \u05de\u05e9\u05ea\u05de\u05e9", 
@@ -365,7 +363,7 @@
     "File format not supported. Please upload a file with a {file_extension} extension.": "\u05ea\u05d1\u05e0\u05d9\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5 \u05d0\u05d9\u05e0\u05d4 \u05e0\u05ea\u05de\u05db\u05ea. \u05d0\u05e0\u05d0 \u05d4\u05e2\u05dc\u05d4 \u05e7\u05d5\u05d1\u05e5 \u05e2\u05dd \u05ea\u05d5\u05e1\u05e4\u05ea {file_extension}.", 
     "File upload succeeded": "\u05d4\u05e2\u05dc\u05d0\u05ea \u05e7\u05d5\u05d1\u05e5 \u05e2\u05d1\u05e8\u05d4 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4", 
     "File {filename} exceeds maximum size of {maxFileSizeInMBs} MB": "\u05d4\u05e7\u05d5\u05d1\u05e5 {filename} \u05d7\u05d5\u05e8\u05d2 \u05de\u05d4\u05d2\u05d5\u05d3\u05dc \u05d4\u05de\u05e8\u05d1\u05d9 \u05e9\u05dc {maxFileSizeInMBs} MB", 
-    "Files must be in JPEG or PNG format.": "\u05e7\u05d1\u05e6\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1\u05d9\u05dd \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e4\u05d5\u05e8\u05de\u05d5 JPEG \u05d0\u05d5 PNG. ", 
+    "Files must be in JPEG or PNG format.": "\u05e7\u05d1\u05e6\u05d9\u05dd \u05d7\u05d9\u05d9\u05d1\u05d9\u05dd \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e4\u05d5\u05e8\u05de\u05d8 JPEG \u05d0\u05d5 PNG. ", 
     "Filter and sort topics": "\u05e1\u05e0\u05df \u05d5\u05de\u05d9\u05d9\u05df \u05e0\u05d5\u05e9\u05d0\u05d9\u05dd", 
     "Filter topics": "\u05e1\u05e0\u05df \u05e0\u05d5\u05e9\u05d0\u05d9\u05dd", 
     "Financial Assistance Application": "\u05d1\u05e7\u05e9\u05d4 \u05dc\u05e2\u05d6\u05e8\u05d4 \u05db\u05e1\u05e4\u05d9\u05ea", 
@@ -432,6 +430,7 @@
     "Instructor Photo URL": "\u05db\u05ea\u05d5\u05d1\u05ea URL \u05e9\u05dc \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05de\u05d3\u05e8\u05d9\u05da", 
     "Instructor Title": "\u05ea\u05d5\u05d0\u05e8 \u05d4\u05de\u05d3\u05e8\u05d9\u05da", 
     "Instructor tools": "\u05db\u05dc\u05d9 \u05d4\u05de\u05d3\u05e8\u05d9\u05da", 
+    "Internal Server Error.": "\u05e9\u05d2\u05d9\u05d0\u05ea \u05e9\u05e8\u05ea \u05e4\u05e0\u05d9\u05de\u05d9\u05ea.", 
     "Introduction to Cookie Baking": "\u05de\u05d1\u05d5\u05d0 \u05dc\u05d0\u05e4\u05d9\u05d9\u05ea \u05e2\u05d5\u05d2\u05d9\u05d5\u05ea", 
     "Invalidate Certificate": "\u05e4\u05e1\u05d9\u05dc\u05ea \u05ea\u05e2\u05d5\u05d3\u05d4", 
     "Invalidated": "\u05e0\u05e4\u05e1\u05dc\u05d4", 
@@ -480,7 +479,7 @@
     "Make sure your ID is well-lit": "\u05d5\u05d3\u05d0 \u05db\u05d9 \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4 \u05d4\u05de\u05d6\u05d4\u05d4 \u05e9\u05dc\u05da \u05de\u05d5\u05d0\u05e8\u05ea \u05db\u05e8\u05d0\u05d5\u05d9", 
     "Make sure your face is well-lit": "\u05d0\u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05e4\u05e0\u05d9\u05da \u05de\u05d5\u05d0\u05e8\u05d9\u05dd \u05d4\u05d9\u05d8\u05d1.", 
     "Make this subsection available as a prerequisite to other content": "\u05d4\u05e4\u05d5\u05da \u05d0\u05ea \u05ea\u05ea \u05e4\u05e8\u05e7 \u05d6\u05d4 \u05dc\u05d6\u05de\u05d9\u05df \u05db\u05d3\u05e8\u05d9\u05e9\u05d4 \u05de\u05d5\u05e7\u05d3\u05de\u05ea \u05dc\u05ea\u05d5\u05db\u05df \u05d0\u05d7\u05e8", 
-    "Making Visible to Students": "\u05de\u05e9\u05e0\u05d4 \u05dc\u05d2\u05dc\u05d5\u05d9 \u05e2\u05d1\u05d5\u05e8 \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd", 
+    "Making Visible to Students": "\u05de\u05e6\u05d9\u05d2 \u05e2\u05d1\u05d5\u05e8 \u05d4\u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd", 
     "Manage Students": "\u05e0\u05d4\u05dc \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8\u05d9\u05dd", 
     "Manual": "\u05d9\u05d3\u05e0\u05d9", 
     "Mark Exam As Completed": "\u05e1\u05de\u05df \u05de\u05d1\u05d7\u05df \u05db\u05d4\u05d5\u05e9\u05dc\u05dd", 
@@ -584,7 +583,7 @@
     "Please enter your email address below and we will send you instructions for setting a new password.": "\u05e0\u05d0 \u05d4\u05d6\u05df \u05dc\u05d4\u05dc\u05df \u05d0\u05ea \u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\"\u05dc \u05e9\u05dc\u05da \u05d5\u05d0\u05e0\u05d5 \u05e0\u05e9\u05dc\u05d7 \u05dc\u05da \u05d4\u05e0\u05d7\u05d9\u05d5\u05ea \u05dc\u05e7\u05d1\u05d9\u05e2\u05ea \u05e1\u05d9\u05e1\u05de\u05d4 \u05d7\u05d3\u05e9\u05d4.  ", 
     "Please follow the instructions here to upload a file elsewhere and link to it: {maxFileSizeRedirectUrl}": "\u05d1\u05e6\u05e2 \u05d0\u05ea \u05d4\u05d4\u05d5\u05e8\u05d0\u05d5\u05ea \u05e9\u05dc\u05d4\u05dc\u05df \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea \u05e7\u05d5\u05d1\u05e5 \u05d1\u05de\u05e7\u05d5\u05dd \u05d0\u05d7\u05e8 \u05d5\u05dc\u05e7\u05e9\u05e8 \u05d0\u05dc\u05d9\u05d5: {maxFileSizeRedirectUrl}", 
     "Please print this page for your records; it serves as your receipt. You will also receive an email with the same information.": "\u05e0\u05d0 \u05d4\u05d3\u05e4\u05e1 \u05e2\u05de\u05d5\u05d3 \u05d6\u05d4 \u05dc\u05e8\u05e9\u05d5\u05de\u05d5\u05ea\u05d9\u05da; \u05d4\u05d5\u05d0 \u05de\u05e9\u05de\u05e9 \u05db\u05e7\u05d1\u05dc\u05d4. \u05d1\u05e0\u05d5\u05e1\u05e3, \u05ea\u05e7\u05d1\u05dc \u05d2\u05dd \u05d4\u05d5\u05d3\u05e2\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05e2\u05dd \u05de\u05d9\u05d3\u05e2 \u05d6\u05d4\u05d4. ", 
-    "Please select a Course Run": "\u05d1\u05d7\u05e8 \u05de\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d9\u05de\u05d5\u05d3\u05d9\u05dd \u05e9\u05dc \u05e7\u05d5\u05e8\u05e1", 
+    "Please select a Course Run": "\u05d1\u05d7\u05e8 \u05d4\u05e8\u05e6\u05ea \u05e7\u05d5\u05e8\u05e1", 
     "Please select a PDF file to upload.": "\u05d0\u05e0\u05d0 \u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 PDF \u05dc\u05d4\u05e2\u05dc\u05d0\u05d4.", 
     "Please select a course date": "\u05d1\u05d7\u05e8 \u05ea\u05d0\u05e8\u05d9\u05da \u05e7\u05d5\u05e8\u05e1", 
     "Please select a file in .srt format.": "\u05d0\u05e0\u05d0 \u05d1\u05d7\u05e8 \u05e7\u05d5\u05d1\u05e5 \u05d1\u05ea\u05d1\u05e0\u05d9\u05ea .srt", 
@@ -656,7 +655,7 @@
     "Reset my password": "\u05e9\u05d7\u05d6\u05e8 \u05d0\u05ea \u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05e9\u05dc\u05d9", 
     "Retake Photo": "\u05e6\u05dc\u05dd \u05e9\u05d5\u05d1 \u05ea\u05de\u05d5\u05e0\u05d4", 
     "Retake Your Photos": "\u05e6\u05dc\u05dd \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea\u05da", 
-    "Return and add email address": "\u05d7\u05d6\u05d5\u05e8 \u05d5\u05d4\u05d5\u05e1\u05e3 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\"\u05dc", 
+    "Return and add email address": "\u05d7\u05d6\u05d5\u05e8 \u05d5\u05d4\u05d5\u05e1\u05e3 \u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9", 
     "Return to Export": "\u05d7\u05d6\u05d5\u05e8 \u05dc\u05d9\u05d9\u05e6\u05d5\u05d0", 
     "Return to Your Dashboard": "\u05d7\u05d6\u05d5\u05e8 \u05dc\u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4", 
     "Return to team listing": "\u05d7\u05d6\u05d5\u05e8 \u05dc\u05e8\u05e9\u05d9\u05de\u05ea \u05e6\u05d5\u05d5\u05ea", 
@@ -717,7 +716,7 @@
     "Some Rights Reserved": "\u05d7\u05dc\u05e7 \u05de\u05d4\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05e9\u05de\u05d5\u05e8\u05d5\u05ea", 
     "Some content in this unit is visible only to particular content groups": "\u05d7\u05dc\u05e7 \u05de\u05d4\u05ea\u05d5\u05db\u05df \u05d1\u05d9\u05d7\u05d9\u05d3\u05d4 \u05d6\u05d5 \u05d2\u05dc\u05d5\u05d9 \u05e8\u05e7 \u05e2\u05d1\u05d5\u05e8 \u05e7\u05d1\u05d5\u05e6\u05d5\u05ea \u05ea\u05d5\u05db\u05df \u05de\u05e1\u05d5\u05d9\u05de\u05d5\u05ea", 
     "Sorry, no results were found.": "\u05e6\u05e8 \u05dc\u05e0\u05d5, \u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea. ", 
-    "Sorry, there was an error parsing the subtitles that you uploaded. Please check the format and try again.": "\u05d0\u05e0\u05d5 \u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e0\u05d9\u05ea\u05d5\u05d7 \u05d4\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05e9\u05d4\u05e2\u05dc\u05ea. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d4\u05ea\u05d1\u05e0\u05d9\u05ea \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
+    "Sorry, there was an error parsing the subtitles that you uploaded. Please check the format and try again.": "\u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05e0\u05d9\u05ea\u05d5\u05d7 \u05d4\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05e9\u05d4\u05e2\u05dc\u05ea. \u05d0\u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05d4\u05ea\u05d1\u05e0\u05d9\u05ea \u05d5\u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. ", 
     "Sorted by": "\u05de\u05d5\u05d9\u05d9\u05df \u05d1\u05d9\u05d3\u05d9", 
     "Specify an alternative to the official course title to display on certificates. Leave blank to use the official course title.": "\u05e6\u05d9\u05d9\u05df \u05d7\u05dc\u05d5\u05e4\u05d4 \u05dc\u05db\u05d5\u05ea\u05e8\u05ea \u05e7\u05d5\u05e8\u05e1 \u05e9\u05ea\u05d5\u05e6\u05d2 \u05d1\u05ea\u05e2\u05d5\u05d3\u05d5\u05ea. \u05d4\u05e9\u05d0\u05e8 \u05e8\u05d9\u05e7 \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05db\u05d5\u05ea\u05e8\u05ea \u05e7\u05d5\u05e8\u05e1 \u05e8\u05e9\u05de\u05d9\u05ea.", 
     "Specify any additional rules or rule exceptions that the proctoring review team should enforce when reviewing the videos. For example, you could specify that calculators are allowed.": "\u05e6\u05d9\u05d9\u05df \u05db\u05dc \u05db\u05dc\u05dc \u05e0\u05d5\u05e1\u05e3 \u05d0\u05d5 \u05d7\u05e8\u05d9\u05d2\u05d4 \u05de\u05d4\u05db\u05dc\u05dc\u05d9\u05dd \u05e9\u05d9\u05db\u05d5\u05dc \u05e6\u05d5\u05d5\u05ea \u05d4\u05d1\u05d7\u05d9\u05e0\u05d4 \u05ea\u05d7\u05ea \u05e4\u05d9\u05e7\u05d5\u05d7 \u05dc\u05d4\u05d7\u05d9\u05dc \u05d1\u05e2\u05ea \u05d1\u05d7\u05d9\u05e0\u05ea \u05e1\u05e8\u05d8\u05d5\u05e0\u05d9 \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5. \u05dc\u05d3\u05d5\u05d2\u05de\u05d4, \u05e0\u05d9\u05ea\u05df \u05dc\u05e6\u05d9\u05d9\u05df \u05e9\u05de\u05d5\u05ea\u05e8 \u05dc\u05d4\u05d9\u05e2\u05d6\u05e8 \u05d1\u05de\u05d7\u05e9\u05d1\u05d5\u05e0\u05d9\u05dd.", 
@@ -785,26 +784,26 @@
     "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 public display name of the program.": "\u05e9\u05dd \u05d4\u05ea\u05e6\u05d5\u05d2\u05d4 \u05d4\u05e6\u05d9\u05d1\u05d5\u05e8\u05d9 \u05e9\u05dc \u05d4\u05ea\u05db\u05e0\u05d9\u05ea.", 
     "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\u05d2\u05d5\u05dc\u05de\u05d9\u05ea \u05d4\u05d9\u05d0:", 
+    "The raw error message is:": "\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d4\u05d9\u05d0:", 
     "The timed transcript for the first video file does not appear to be the same as the timed transcript for the second video file.": "\u05e0\u05e8\u05d0\u05d4 \u05db\u05d9 \u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df \u05dc\u05e7\u05d5\u05d1\u05e5 \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05e8\u05d0\u05e9\u05d5\u05df \u05d0\u05d9\u05e0\u05d5 \u05d3\u05d5\u05de\u05d4 \u05dc\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df \u05e9\u05dc \u05e7\u05d5\u05d1\u05e5 \u05d4\u05d5\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05e9\u05e0\u05d9.", 
     "The timed transcript for this video on edX is out of date, but YouTube has a current timed transcript for this video.": "\u05d4\u05ea\u05de\u05dc\u05d9\u05dc \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05df \u05e2\u05d1\u05d5\u05e8 \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d6\u05d4 \u05d1-edX \u05de\u05d9\u05d5\u05e9\u05df, \u05d0\u05da \u05e7\u05d9\u05d9\u05de\u05ea \u05d2\u05e8\u05e1\u05d4 \u05e2\u05d3\u05db\u05e0\u05d9\u05ea \u05e2\u05d1\u05d5\u05e8 \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d6\u05d4 \u05dc-YouTube.", 
     "The title entered here will override the title set for the individual run of the course. It will be displayed on the XSeries progress page and in marketing presentations.": "\u05d4\u05db\u05d5\u05ea\u05e8\u05ea \u05e9\u05d4\u05d5\u05d6\u05e0\u05d4 \u05db\u05d0\u05df \u05ea\u05de\u05d7\u05e7 \u05d0\u05ea \u05d4\u05db\u05d5\u05ea\u05e8\u05ea \u05e9\u05d4\u05d5\u05d2\u05d3\u05e8\u05d4 \u05dc\u05d4\u05e8\u05e6\u05d4 \u05d9\u05d7\u05d9\u05d3\u05d4 \u05e9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1. \u05d4\u05d9\u05d0 \u05ea\u05d5\u05e6\u05d2 \u05d1\u05d3\u05e3 \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05e9\u05dc XSeries \u05d5\u05d1\u05de\u05e6\u05d2\u05d5\u05ea \u05d4\u05e9\u05d9\u05d5\u05d5\u05e7.", 
     "The unique number that identifies your course within your organization, e.g. CS101.": "\u05d4\u05de\u05e1\u05e4\u05e8 \u05d4\u05d9\u05d9\u05d7\u05d5\u05d3\u05d9 \u05d4\u05de\u05d6\u05d4\u05d4 \u05d0\u05ea \u05d4\u05e7\u05d5\u05e8\u05e1 \u05e9\u05dc\u05da \u05d1\u05ea\u05d5\u05da \u05d4\u05d0\u05e8\u05d2\u05d5\u05df, \u05dc\u05d3\u05d5\u05d2\u05de\u05d4 CS101.", 
     "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.", 
     "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 while exporting.": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d9\u05d9\u05e6\u05d5\u05d0 \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. ", 
     "There is invalid code in your content. Please check to make sure it is valid HTML.": "\u05d9\u05e9 \u05e7\u05d5\u05d3 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9 \u05d1\u05ea\u05d5\u05db\u05df \u05e9\u05dc\u05da. \u05d0\u05e0\u05d0 \u05d5\u05d3\u05d0 \u05db\u05d9 \u05d6\u05d4\u05d5 HTML \u05d7\u05d5\u05e7\u05d9.", 
     "There must be at least one group.": "\u05d7\u05d9\u05d9\u05d1\u05ea \u05dc\u05d4\u05d9\u05d5\u05ea \u05dc\u05e4\u05d7\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05d4 \u05d0\u05d7\u05ea.", 
     "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 an error changing the user's role": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\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 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 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.": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\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.": "\u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05d5\u05e8\u05d3\u05ea \u05d4\u05e7\u05d5\u05d1\u05e5.", 
-    "There was an error while verifying the file you submitted.": "\u05e7\u05e8\u05ea\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": "\u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05e2\u05dc\u05d0\u05d4", 
+    "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.", 
@@ -822,9 +821,9 @@
     "This is the Name of the Group Configuration": "\u05d6\u05d4\u05d5 \u05e9\u05dd \u05d4\u05d2\u05d3\u05e8\u05ea \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
     "This is the name of the group": "\u05d6\u05d4\u05d5 \u05e9\u05dd \u05d4\u05e7\u05d1\u05d5\u05e6\u05d4", 
     "This learner is currently sharing a limited profile.": "\u05dc\u05d5\u05de\u05d3 \u05d6\u05d4 \u05de\u05e9\u05ea\u05e3 \u05db\u05e8\u05d2\u05e2 \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05de\u05d5\u05d2\u05d1\u05dc.", 
-    "This link will open in a modal window": "\u05e7\u05d9\u05e9\u05d5\u05e8 \u05d6\u05d4 \u05d9\u05e4\u05ea\u05d7 \u05d1\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9", 
+    "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\u05d3\u05e3 \u05d0\u05d5 \u05d5\u05d3\u05d0 \u05e9\u05d4\u05d9\u05e0\u05da \u05de\u05e7\u05d5\u05d5\u05df.", 
+    "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 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 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\u05d3\u05e3 \u05d4\u05d4\u05ea\u05e7\u05d3\u05de\u05d5\u05ea \u05e9\u05dc \u05dc\u05d5\u05de\u05d3.", 
@@ -837,7 +836,6 @@
     "Timed Transcript Uploaded Successfully": "\u05ea\u05de\u05dc\u05d9\u05dc \u05de\u05ea\u05d5\u05d6\u05de\u05df \u05d4\u05d5\u05e2\u05dc\u05d4 \u05d1\u05d4\u05e6\u05dc\u05d7\u05d4", 
     "Timed Transcript from %(filename)s": "\u05ea\u05de\u05dc\u05d9\u05dc \u05de\u05ea\u05d5\u05d6\u05de\u05df \u05de%(filename)s", 
     "Tips on taking a successful photo": "\u05d8\u05d9\u05e4\u05d9\u05dd \u05dc\u05e6\u05d9\u05dc\u05d5\u05dd \u05ea\u05de\u05d5\u05e0\u05d4 \u05d8\u05d5\u05d1\u05d4", 
-    "Title": "\u05db\u05d5\u05ea\u05e8\u05ea", 
     "Title ": "\u05db\u05d5\u05ea\u05e8\u05ea ", 
     "Title of the signatory": "\u05db\u05d5\u05ea\u05e8\u05ea \u05d4\u05d7\u05d5\u05ea\u05b5\u05dd", 
     "Title:": "\u05db\u05d5\u05ea\u05e8\u05ea:", 
@@ -848,7 +846,6 @@
     "To receive a certificate, you must also verify your identity before %(date)s.": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e7\u05d1\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05d5\u05d5\u05d3\u05d0 \u05d2\u05dd \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da \u05dc\u05e4\u05e0\u05d9 %(date)s.", 
     "To receive a certificate, you must also verify your identity.": "\u05db\u05d3\u05d9 \u05dc\u05e7\u05d1\u05dc \u05ea\u05e2\u05d5\u05d3\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05d0\u05de\u05ea \u05d2\u05dd \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da.", 
     "To receive credit on a problem, you must click \"Check\" or \"Final Check\" on it before you select \"End My Exam\".": "\u05db\u05d3\u05d9 \u05dc\u05e7\u05d1\u05dc \u05e0\u05e7\u05d5\u05d3\u05ea \u05d6\u05db\u05d5\u05ea \u05e2\u05dc \u05d1\u05e2\u05d9\u05d4, \u05e2\u05dc\u05d9\u05da \u05dc\u05dc\u05d7\u05d5\u05e5 \u05e2\u05dc \"\u05d1\u05d3\u05d5\u05e7\" \u05d0\u05d5 \u05e2\u05dc \"\u05d1\u05d3\u05d9\u05e7\u05d4 \u05e1\u05d5\u05e4\u05d9\u05ea\" \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05d1\u05d7\u05e8 \"\u05e1\u05d9\u05d5\u05dd \u05d4\u05de\u05d1\u05d7\u05df \u05e9\u05dc\u05d9\".", 
-    "To review student cohort assignments or see the results of uploading a CSV file, download course profile information or cohort results on the {link_start}Data Download{link_end} page.": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e1\u05e7\u05d5\u05e8 \u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05e1\u05d8\u05d5\u05d3\u05e0\u05d8 \u05d1\u05e7\u05d1\u05d5\u05e6\u05ea \u05dc\u05de\u05d9\u05d3\u05d4 \u05d0\u05d5 \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05d4\u05e2\u05dc\u05d0\u05ea \u05e7\u05d5\u05d1\u05e5 \u05d4-CSV, \u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05d5\u05e8\u05d9\u05d3 \u05d0\u05ea \u05de\u05d9\u05d3\u05e2 \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d0\u05d5 \u05ea\u05d5\u05e6\u05d0\u05d5\u05ea \u05e7\u05d1\u05d5\u05e6\u05ea \u05d4\u05dc\u05de\u05d9\u05d3\u05d4 \u05d1\u05e2\u05de\u05d5\u05d3 {link_start}Data Download{link_end}.", 
     "To share your certificate on Mozilla Backpack, you must first have a Backpack account. Complete the following steps to add your certificate to Backpack.": "\u05db\u05d3\u05d9 \u05dc\u05e9\u05ea\u05e3 \u05d0\u05ea \u05ea\u05e2\u05d5\u05d3\u05ea\u05da \u05d1-Mozilla Backpack, \u05e2\u05dc\u05d9\u05da \u05dc\u05e4\u05ea\u05d5\u05d7 \u05d7\u05e9\u05d1\u05d5\u05df Backpack \u05ea\u05d7\u05d9\u05dc\u05d4. \u05d4\u05e9\u05dc\u05dd \u05d0\u05ea \u05d4\u05e9\u05dc\u05d1\u05d9\u05dd \u05d4\u05d1\u05d0\u05d9\u05dd \u05db\u05d3\u05d9 \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d0\u05ea \u05ea\u05e2\u05d5\u05d3\u05ea\u05da \u05dc-Backpack.", 
     "To take a successful photo, make sure that:": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e6\u05dc\u05dd \u05ea\u05de\u05d5\u05e0\u05d4 \u05de\u05d5\u05e6\u05dc\u05d7\u05ea, \u05d5\u05d3\u05d0 \u05db\u05d9:", 
     "To use the current photo, select the camera button {icon}. To take another photo, select the retake button {icon}.": "\u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05ea\u05de\u05d5\u05e0\u05d4 \u05d4\u05e2\u05d3\u05db\u05e0\u05d9\u05ea, \u05d1\u05d7\u05e8 \u05d1\u05dc\u05d7\u05e6\u05df \u05d4\u05de\u05e6\u05dc\u05de\u05d4 {icon}. \u05db\u05d3\u05d9 \u05dc\u05e6\u05dc\u05dd \u05ea\u05de\u05d5\u05e0\u05d4 \u05d0\u05d7\u05e8\u05ea, \u05d1\u05d7\u05e8 \u05d1\u05dc\u05d7\u05e6\u05df \u05d4\u05e6\u05d9\u05dc\u05d5\u05dd \u05de\u05d7\u05d3\u05e9 {icon}.", 
@@ -877,7 +874,7 @@
     "Update post": "\u05e2\u05d3\u05db\u05df \u05e4\u05d5\u05e1\u05d8", 
     "Update response": "\u05e2\u05d3\u05db\u05df \u05ea\u05d2\u05d5\u05d1\u05d4", 
     "Update team.": "\u05e2\u05d3\u05db\u05df \u05e6\u05d5\u05d5\u05ea.", 
-    "Updating Tags": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d2\u05d9\u05dd", 
+    "Updating Tags": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d2\u05d9\u05d5\u05ea", 
     "Upgrade Deadline": "\u05de\u05d5\u05e2\u05d3 \u05e9\u05d3\u05e8\u05d5\u05d2", 
     "Upgrade Now": "\u05e9\u05d3\u05e8\u05d2 \u05e2\u05db\u05e9\u05d9\u05d5", 
     "Upgrade to a Verified Certificate for {courseName}": "\u05e9\u05d3\u05e8\u05d2 \u05dc\u05ea\u05e2\u05d5\u05d3\u05d4 \u05de\u05d0\u05d5\u05de\u05ea\u05ea \u05e2\u05d1\u05d5\u05e8 {courseName}", 
@@ -949,7 +946,7 @@
     "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 1-2 days). In the meantime, you can still access all available course content.": "\u05e7\u05d9\u05d1\u05dc\u05e0\u05d5 \u05d0\u05ea \u05d4\u05de\u05d9\u05d3\u05e2 \u05e9\u05dc\u05da \u05d5\u05d0\u05e0\u05d5 \u05de\u05d0\u05de\u05ea\u05d9\u05dd \u05d0\u05ea \u05d6\u05d4\u05d5\u05ea\u05da. \u05ea\u05e8\u05d0\u05d4 \u05d4\u05d5\u05d3\u05e2\u05d4 \u05d1\u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4 \u05db\u05d0\u05e9\u05e8 \u05d9\u05d5\u05e9\u05dc\u05dd \u05ea\u05d4\u05dc\u05d9\u05da \u05d4\u05d0\u05d9\u05de\u05d5\u05ea  (\u05dc\u05e8\u05d5\u05d1 \u05ea\u05d5\u05da \u05d9\u05d5\u05dd \u05d0\u05d5 \u05d9\u05d5\u05de\u05d9\u05d9\u05dd). \u05d1\u05d9\u05e0\u05ea\u05d9\u05d9\u05dd, \u05ea\u05d5\u05db\u05dc  \u05dc\u05d2\u05e9\u05ea \u05e2\u05d3\u05d9\u05d9\u05df \u05dc\u05db\u05dc \u05ea\u05d5\u05db\u05df \u05d4\u05e7\u05d5\u05e8\u05e1 \u05d4\u05d6\u05de\u05d9\u05df.", 
     "We just need a little more information before you start learning with %(platformName)s.": "\u05d0\u05e0\u05d7\u05e0\u05d5 \u05d6\u05e7\u05d5\u05e7\u05d9\u05dd \u05e8\u05e7 \u05dc\u05de\u05d9\u05d3\u05e2 \u05de\u05d5\u05e2\u05d8 \u05e0\u05d5\u05e1\u05e3 \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05ea\u05d7\u05d9\u05dc \u05dc\u05dc\u05de\u05d5\u05d3 \u05e2\u05dd %(platformName)s.", 
     "We use the highest levels of security available to encrypt your photo and send it to our authorization service for review. Your photo and information are not saved or visible anywhere on %(platformName)s after the verification process is complete.": "\u05d0\u05e0\u05d5 \u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d1\u05e8\u05de\u05d5\u05ea \u05d4\u05d2\u05d1\u05d5\u05d4\u05d5\u05ea \u05d1\u05d9\u05d5\u05ea\u05e8 \u05e9\u05dc \u05d0\u05d1\u05d8\u05d7\u05d4 \u05dc\u05d4\u05e6\u05e4\u05d9\u05df \u05d0\u05ea \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05e9\u05dc\u05da \u05d5\u05dc\u05e9\u05dc\u05d5\u05d7 \u05d0\u05d5\u05ea\u05d4 \u05dc\u05d1\u05d3\u05d9\u05e7\u05d4 \u05d1\u05e9\u05d9\u05e8\u05d5\u05ea \u05d4\u05d0\u05d9\u05de\u05d5\u05ea \u05e9\u05dc\u05e0\u05d5.  \u05d4\u05ea\u05de\u05d5\u05e0\u05d4 \u05d5\u05d4\u05de\u05d9\u05d3\u05e2 \u05d4\u05d0\u05d9\u05e9\u05d9 \u05e9\u05dc\u05da \u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d9\u05dd \u05d0\u05d5 \u05d2\u05dc\u05d5\u05d9\u05d9\u05dd \u05d1\u05d0\u05e3 \u05de\u05e7\u05d5\u05dd \u05d1-%(platformName)s \u05dc\u05d0\u05d7\u05e8 \u05d4\u05e9\u05dc\u05de\u05ea \u05ea\u05d4\u05dc\u05d9\u05da \u05d0\u05d9\u05de\u05d5\u05ea \u05d4\u05d6\u05d4\u05d5\u05ea.  ", 
-    "We're sorry, there was an error": "\u05d0\u05e0\u05d5 \u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05e7\u05e8\u05ea\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4", 
+    "We're sorry, there was an error": "\u05de\u05e6\u05d8\u05e2\u05e8\u05d9\u05dd, \u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4", 
     "Web:": "\u05d0\u05ea\u05e8 \u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8:", 
     "Webcam": "\u05de\u05e6\u05dc\u05de\u05ea \u05e8\u05e9\u05ea", 
     "Weight of Total Grade": "\u05de\u05e9\u05e7\u05dc \u05e1\u05da \u05d4\u05e6\u05d9\u05d5\u05df", 
@@ -988,11 +985,11 @@
     "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. 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 \u05d3\u05e3 \u05d6\u05d4?", 
+    "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 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\"\u05dc \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 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 specify a name": "\u05e2\u05dc\u05d9\u05da \u05dc\u05ea\u05ea \u05e9\u05dd", 
     "You need a certificate in this course to be eligible for a program certificate.": "\u05d0\u05ea\u05d4 \u05e6\u05e8\u05d9\u05da \u05ea\u05e2\u05d5\u05d3\u05d4 \u05d1\u05e7\u05d5\u05e8\u05e1 \u05d6\u05d4 \u05db\u05d3\u05d9 \u05dc\u05e7\u05d1\u05dc \u05ea\u05e2\u05d5\u05d3\u05ea \u05ea\u05db\u05e0\u05d9\u05ea.", 
     "You need a computer that has a webcam. When you receive a browser prompt, make sure that you allow access to the camera.": "\u05d4\u05d9\u05e0\u05da \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 \u05d4\u05d9\u05e0\u05da \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05dc\u05de\u05e6\u05dc\u05de\u05d4.", 
@@ -1002,7 +999,7 @@
     "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page.": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05d7\u05e9\u05d1\u05d5\u05e0\u05da \u05dc\u05e4\u05e0\u05d9 \u05e9\u05ea\u05d5\u05db\u05dc \u05dc\u05d4\u05d9\u05e8\u05e9\u05dd \u05dc\u05e7\u05d5\u05e8\u05e1. \u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05ea\u05d9\u05d1\u05ea \u05d4\u05d3\u05d5\u05d0\u05e8 \u05d4\u05e0\u05db\u05e0\u05e1 \u05e9\u05dc\u05da \u05dc\u05d4\u05d5\u05d3\u05e2\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4. \u05dc\u05d0\u05d7\u05e8 \u05d4\u05e9\u05dc\u05de\u05ea \u05e9\u05dc\u05d1 \u05d4\u05d4\u05e4\u05e2\u05dc\u05d4, \u05d9\u05e9 \u05d1\u05d0\u05e4\u05e9\u05e8\u05d5\u05ea\u05da \u05dc\u05d7\u05d6\u05d5\u05e8 \u05d5\u05dc\u05e8\u05e2\u05e0\u05df \u05d3\u05e3 \u05d6\u05d4. ", 
     "You reserve all rights for your work": " \u05db\u05dc \u05d4\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05e2\u05dc \u05e2\u05d1\u05d5\u05d3\u05ea\u05da \u05e9\u05de\u05d5\u05e8\u05d5\u05ea \u05e2\u05de\u05da.", 
     "You still need to visit the %(display_name)s website to complete the credit process.": "\u05e2\u05dc\u05d9\u05da \u05dc\u05d1\u05e7\u05e8 \u05e2\u05d3\u05d9\u05d9\u05df \u05d1\u05d0\u05ea\u05e8 \u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8 %(display_name)s \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e9\u05dc\u05d9\u05dd \u05d0\u05ea \u05ea\u05d4\u05dc\u05d9\u05da \u05e7\u05d1\u05dc\u05ea \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05d4\u05d6\u05db\u05d5\u05ea.", 
-    "You waive some rights for your work, such that others can use it too": "\u05d0\u05ea\u05d4 \u05de\u05d5\u05d5\u05ea\u05e8 \u05e2\u05dc \u05db\u05de\u05d4 \u05de\u05d6\u05db\u05d5\u05d9\u05d5\u05ea\u05d9\u05d9\u05da \u05e2\u05dc \u05e2\u05d1\u05d5\u05d3\u05ea\u05da \u05db\u05d3\u05d9 \u05e9\u05d2\u05dd \u05d0\u05d7\u05e8\u05d9\u05dd \u05d9\u05d5\u05db\u05dc\u05d5 \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d4", 
+    "You waive some rights for your work, such that others can use it too": "\u05d0\u05ea\u05d4 \u05de\u05d5\u05d5\u05ea\u05e8 \u05e2\u05dc \u05de\u05e1\u05e4\u05e8 \u05d6\u05db\u05d5\u05d9\u05d5\u05ea\u05d9\u05d9\u05da \u05e2\u05dc \u05e2\u05d1\u05d5\u05d3\u05ea\u05da \u05db\u05d3\u05d9 \u05e9\u05d0\u05d7\u05e8\u05d9\u05dd \u05d9\u05d5\u05db\u05dc\u05d5 \u05d2\u05dd \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d4", 
     "You will not receive notification for emails that bounce, so double-check your spelling.": "\u05dc\u05d0 \u05ea\u05e7\u05d1\u05dc \u05d4\u05ea\u05e8\u05d0\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05d4\u05d5\u05d3\u05e2\u05d5\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05e9\u05dc\u05d0 \u05d9\u05d2\u05d9\u05e2\u05d5 \u05dc\u05d9\u05e2\u05d3\u05df, \u05e0\u05d0 \u05d1\u05d3\u05d5\u05e7 \u05e9\u05d5\u05d1 \u05d0\u05ea \u05d4\u05d0\u05d9\u05d5\u05ea. ", 
     "You will use your webcam to take a picture of your face and of your government-issued photo ID.": "\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e6\u05dc\u05de\u05ea \u05d4\u05e8\u05e9\u05ea \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05e6\u05dc\u05dd \u05d0\u05ea \u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e0\u05d9\u05da \u05d5\u05d0\u05ea \u05d4\u05ea\u05e2\u05d5\u05d3\u05d4, \u05e9\u05d4\u05d5\u05e0\u05e4\u05e7\u05d4 \u05d1\u05d9\u05d3\u05d9 \u05d4\u05de\u05de\u05e9\u05dc\u05d4, \u05e2\u05dd \u05d4\u05ea\u05de\u05d5\u05e0\u05d4.", 
     "You!": "\u05d0\u05ea\u05d4!", 
@@ -1074,7 +1071,7 @@
     "section.title": "section.title", 
     "send an email message to {email}": "\u05e9\u05dc\u05d7 \u05d4\u05d5\u05d3\u05e2\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05dc{email}", 
     "status": "\u05d3\u05d5\u05d7 \u05de\u05e6\u05d1", 
-    "subsection": "\u05ea\u05ea \u05de\u05e7\u05d8\u05e2", 
+    "subsection": "\u05ea\u05ea \u05e4\u05e8\u05e7", 
     "timed": "\u05de\u05ea\u05d5\u05d6\u05de\u05df", 
     "title": "\u05db\u05d5\u05ea\u05e8\u05ea", 
     "unanswered question": "\u05e9\u05d0\u05dc\u05d4 \u05e9\u05dc\u05d0 \u05e0\u05e2\u05e0\u05ea\u05d4", 
@@ -1086,12 +1083,18 @@
     "{0} is invalid": "{0} \u05d0\u05d9\u05e0\u05d5 \u05d7\u05d5\u05e7\u05d9", 
     "{0} is required": "{0} \u05d4\u05d5\u05d0 \u05e9\u05d3\u05d4 \u05d7\u05d5\u05d1\u05d4", 
     "{0} must be a number": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05de\u05e1\u05e4\u05e8", 
-    "{0} must be a valid email": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d3\u05d5\u05d0\"\u05dc \u05d7\u05d5\u05e7\u05d9", 
-    "{0} must be a valid url": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea url \u05d7\u05d5\u05e7\u05d9", 
+    "{0} must be a valid email": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d3\u05d5\u05d0\u05e8 \u05d0\u05dc\u05e7\u05d8\u05e8\u05d5\u05e0\u05d9 \u05d7\u05d5\u05e7\u05d9", 
+    "{0} must be a valid url": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05ea URL \u05d7\u05d5\u05e7\u05d9\u05ea", 
     "{0} must be accepted": "\u05d7\u05d5\u05d1\u05d4 \u05dc\u05e7\u05d1\u05dc {0} ", 
+    "{0} must be at least {1} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e2\u05dc {1} \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05db\u05dc \u05d4\u05e4\u05d7\u05d5\u05ea", 
+    "{0} must be at most {1} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e2\u05dc {1} \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05db\u05dc \u05d4\u05d9\u05d5\u05ea\u05e8", 
     "{0} must be between {1} and {2}": "{0}  \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05d9\u05df {1} \u05dc-{2}", 
+    "{0} must be between {1} and {2} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05d9\u05df {1} \u05d5-{2} \u05ea\u05d5\u05d5\u05d9\u05dd ", 
+    "{0} must be greater than or equal to {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc \u05d0\u05d5 \u05e9\u05d5\u05d5\u05d4 \u05dc-{1}", 
+    "{0} must be less than or equal to {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05e7\u05d8\u05df \u05d0\u05d5 \u05e9\u05d5\u05d5\u05d4 \u05dc- {1}", 
     "{0} must be one of: {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d0\u05d7\u05d3 \u05de:  {1}", 
     "{0} must be the same as {1}": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d6\u05d4\u05d4 \u05dc-{1}", 
+    "{0} must be {1} characters": "{0} \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05d9\u05d5\u05ea \u05d1\u05e2\u05dc {1} \u05ea\u05d5\u05d5\u05d9\u05dd", 
     "{0} must only contain digits": "{0}  \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05db\u05d9\u05dc \u05e8\u05e7 \u05e1\u05e4\u05e8\u05d5\u05ea", 
     "{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.", 
diff --git a/lms/static/js/i18n/pt-br/djangojs.js b/lms/static/js/i18n/pt-br/djangojs.js
index 2bc117fe91..bcd41c61d8 100644
--- a/lms/static/js/i18n/pt-br/djangojs.js
+++ b/lms/static/js/i18n/pt-br/djangojs.js
@@ -506,7 +506,6 @@
     "Edit Membership": "Editar assinatura.", 
     "Edit Team": "Editar equipe", 
     "Edit Your Name": "Edite o seu nome", 
-    "Edit post title": "Editar t\u00edtulo da publica\u00e7\u00e3o", 
     "Edit the name": "Editar nome", 
     "Edit this certificate?": "Gostaria de editar este certificado?", 
     "Editable": "Edit\u00e1vel", 
@@ -546,7 +545,6 @@
     "Enter the page number you'd like to quickly navigate to.": "Entre com o n\u00famero da p\u00e1gina que voc\u00ea gostaria de acessar rapidamente", 
     "Enter the username or email address of each learner that you want to add as an exception.": "Informe o nome de usu\u00e1rio ou endere\u00e7o de e-mail de cada aluno que voc\u00ea deseja adicionar como uma exce\u00e7\u00e3o.", 
     "Enter username or email": "Digite um nome de usu\u00e1rio ou email", 
-    "Enter your question or comment": "Insira sua pergunta ou coment\u00e1rio", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "Zerando n\u00famero de tentativas de Exame de Admiss\u00e3o para o aluno '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "O Exame de admiss\u00e3o do aluno '{student_id}' est\u00e1 sendo apagado.", 
     "Error": "Erro", 
@@ -1623,7 +1621,6 @@
     "less than a minute": "menos de um minuto", 
     "marked as answer %(time_ago)s": "marcado como resposta %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "marcado como resposta %(time_ago)s por %(user)s", 
-    "message": "mensagem", 
     "name": "nome", 
     "off": "Desligado", 
     "on": "Ligado", 
diff --git a/lms/static/js/i18n/rtl/djangojs.js b/lms/static/js/i18n/rtl/djangojs.js
index f34c6c746e..753fb851f1 100644
--- a/lms/static/js/i18n/rtl/djangojs.js
+++ b/lms/static/js/i18n/rtl/djangojs.js
@@ -412,6 +412,7 @@
     "Common Problem Types": "\u0630\u062e\u0648\u0648\u062e\u0631 \u062d\u0642\u062e\u0632\u0645\u062b\u0648 \u0641\u063a\u062d\u062b\u0633", 
     "Community TA": "\u0630\u062e\u0648\u0648\u0639\u0631\u0647\u0641\u063a \u0641\u0634", 
     "Component": "\u0630\u062e\u0648\u062d\u062e\u0631\u062b\u0631\u0641", 
+    "Component Location ID": "\u0630\u062e\u0648\u062d\u062e\u0631\u062b\u0631\u0641 \u0645\u062e\u0630\u0634\u0641\u0647\u062e\u0631 \u0647\u064a", 
     "Configure": "\u0630\u062e\u0631\u0628\u0647\u0644\u0639\u0642\u062b", 
     "Confirm": "\u0630\u062e\u0631\u0628\u0647\u0642\u0648", 
     "Confirm Timed Transcript": "\u0630\u062e\u0631\u0628\u0647\u0642\u0648 \u0641\u0647\u0648\u062b\u064a \u0641\u0642\u0634\u0631\u0633\u0630\u0642\u0647\u062d\u0641", 
@@ -528,7 +529,6 @@
     "Discussion": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631", 
     "Discussion Home": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631 \u0627\u062e\u0648\u062b", 
     "Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631 \u0634\u064a\u0648\u0647\u0631\u0633, \u0648\u062e\u064a\u062b\u0642\u0634\u0641\u062e\u0642\u0633, \u0634\u0631\u064a \u0641\u0634\u0633 \u0630\u0634\u0631 \u0648\u0634\u0646\u062b \u0641\u0627\u062b\u0647\u0642 \u062d\u062e\u0633\u0641\u0633 \u062f\u0647\u0633\u0647\u0632\u0645\u062b \u0641\u062e \u0634\u0645\u0645 \u0633\u0641\u0639\u064a\u062b\u0631\u0641\u0633 \u062e\u0642 \u0633\u062d\u062b\u0630\u0647\u0628\u063a \u0634 \u0633\u0647\u0631\u0644\u0645\u062b \u0630\u062e\u0627\u062e\u0642\u0641.", 
-    "Discussion topics; currently listing: ": "\u064a\u0647\u0633\u0630\u0639\u0633\u0633\u0647\u062e\u0631 \u0641\u062e\u062d\u0647\u0630\u0633; \u0630\u0639\u0642\u0642\u062b\u0631\u0641\u0645\u063a \u0645\u0647\u0633\u0641\u0647\u0631\u0644: ", 
     "Display Name": "\u064a\u0647\u0633\u062d\u0645\u0634\u063a \u0631\u0634\u0648\u062b", 
     "Div": "\u064a\u0647\u062f", 
     "Do not show again": "\u064a\u062e \u0631\u062e\u0641 \u0633\u0627\u062e\u0635 \u0634\u0644\u0634\u0647\u0631", 
@@ -691,7 +691,6 @@
     "Files must be in JPEG or PNG format.": "\u0628\u0647\u0645\u062b\u0633 \u0648\u0639\u0633\u0641 \u0632\u062b \u0647\u0631 \u062a\u062d\u062b\u0644 \u062e\u0642 \u062d\u0631\u0644 \u0628\u062e\u0642\u0648\u0634\u0641.", 
     "Fill browser": "\u0628\u0647\u0645\u0645 \u0632\u0642\u062e\u0635\u0633\u062b\u0642", 
     "Filter and sort topics": "\u0628\u0647\u0645\u0641\u062b\u0642 \u0634\u0631\u064a \u0633\u062e\u0642\u0641 \u0641\u062e\u062d\u0647\u0630\u0633", 
-    "Filter topics": "\u0628\u0647\u0645\u0641\u062b\u0642 \u0641\u062e\u062d\u0647\u0630\u0633", 
     "Financial Assistance": "\u0628\u0647\u0631\u0634\u0631\u0630\u0647\u0634\u0645 \u0634\u0633\u0633\u0647\u0633\u0641\u0634\u0631\u0630\u062b", 
     "Financial Assistance Application": "\u0628\u0647\u0631\u0634\u0631\u0630\u0647\u0634\u0645 \u0634\u0633\u0633\u0647\u0633\u0641\u0634\u0631\u0630\u062b \u0634\u062d\u062d\u0645\u0647\u0630\u0634\u0641\u0647\u062e\u0631", 
     "Find": "\u0628\u0647\u0631\u064a", 
diff --git a/lms/static/js/i18n/ru/djangojs.js b/lms/static/js/i18n/ru/djangojs.js
index 471e72d492..438a905b67 100644
--- a/lms/static/js/i18n/ru/djangojs.js
+++ b/lms/static/js/i18n/ru/djangojs.js
@@ -618,7 +618,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\u0443\u0439\u0442\u0435 \u0421\u0432\u043e\u0451 \u0418\u043c\u044f", 
-    "Edit post title": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\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 the program marketing slug": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u0440\u0430\u0442\u043a\u043e\u0435 \u0442\u043e\u0440\u0433\u043e\u0432\u043e\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b", 
     "Edit the program subtitle": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u0434\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b", 
@@ -667,7 +666,6 @@
     "Enter the page number you'd like to quickly navigate to.": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u043e\u043c\u0435\u0440 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b, \u043a \u043a\u043e\u0442\u043e\u0440\u043e\u0439 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0439\u0442\u0438.", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043b\u0438 \u0430\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439.", 
     "Enter username or email": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043b\u0438 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441", 
-    "Enter your question or comment": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0441\u0432\u043e\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 \u0438\u043b\u0438 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u0441\u044f \u0441\u0431\u0440\u043e\u0441 \u0441\u0447\u0451\u0442\u0447\u0438\u043a\u0430 \u043f\u043e\u043f\u044b\u0442\u043e\u043a \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0432\u0441\u0442\u0443\u043f\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u044f \u0434\u043b\u044f \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u044f '{student_id}'.", 
     "Entrance exam state is being deleted for student '{student_id}'.": "\u0423\u0434\u0430\u043b\u044f\u0435\u0442\u0441\u044f \u0441\u0442\u0430\u0442\u0443\u0441 \u0432\u0441\u0442\u0443\u043f\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u044f \u0434\u043b\u044f '{student_id}'.", 
     "Error": "\u041e\u0448\u0438\u0431\u043a\u0430", 
@@ -838,6 +836,7 @@
     "If you leave, you can no longer post in this team's discussions. Your place will be available to another learner.": "\u041f\u043e\u043a\u0438\u043d\u0443\u0432 \u043a\u043e\u043c\u0430\u043d\u0434\u0443, \u0432\u044b \u0431\u043e\u043b\u044c\u0448\u0435 \u043d\u0435 \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u0447\u0430\u0441\u0442\u0432\u043e\u0432\u0430\u0442\u044c \u0432 \u0435\u0451 \u043e\u0431\u0441\u0443\u0436\u0434\u0435\u043d\u0438\u044f\u0445.  \u0412\u0430\u0448\u0435 \u043c\u0435\u0441\u0442\u043e \u0441\u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u043d\u044f\u0442\u044c \u0434\u0440\u0443\u0433\u043e\u0439 \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u044c.", 
     "If you make significant changes, make sure you notify members of the team before making these changes.": "\u041f\u0435\u0440\u0435\u0434 \u0442\u0435\u043c, \u043a\u0430\u043a \u0432\u043d\u043e\u0441\u0438\u0442\u044c \u0437\u043d\u0430\u0447\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f, \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e \u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0434\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u0438\u0445 \u0447\u043b\u0435\u043d\u043e\u0432 \u043a\u043e\u043c\u0430\u043d\u0434\u044b.", 
     "If you make this %(xblockType)s visible to learners, learners will be able to see its content after the release date has passed and you have published the unit. Only units that are explicitly hidden from learners will remain hidden after you clear this option for the %(xblockType)s.": "\u0415\u0441\u043b\u0438 \u0441\u0434\u0435\u043b\u0430\u0442\u044c \u044d\u0442\u043e\u0442 %(xblockType)s \u0432\u0438\u0434\u0438\u043c\u044b\u043c \u0434\u043b\u044f \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0435\u0439, \u043d\u0430\u0447\u0438\u043d\u0430\u044f \u0441 \u0434\u0430\u0442\u044b \u0432\u044b\u043f\u0443\u0441\u043a\u0430 \u0438 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0438 \u0431\u043b\u043e\u043a\u0430 \u0441\u043b\u0443\u0448\u0430\u0442\u0435\u043b\u0438 \u0441\u043c\u043e\u0433\u0443\u0442 \u043f\u0440\u043e\u0441\u043c\u0430\u0442\u0440\u0438\u0432\u0430\u0442\u044c \u0435\u0433\u043e \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435. \u0422\u043e\u043b\u044c\u043a\u043e \u0431\u043b\u043e\u043a\u0438, \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u043d\u043e \u043f\u043e\u043c\u0435\u0447\u0435\u043d\u043d\u044b\u0435 \u043a\u0430\u043a \u0441\u043a\u0440\u044b\u0442\u044b\u0435, \u043e\u0441\u0442\u0430\u043d\u0443\u0442\u0441\u044f \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u044b\u043c\u0438, \u043f\u043e\u0441\u043b\u0435 \u0442\u043e\u0433\u043e, \u043a\u0430\u043a \u0412\u044b \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u0435 \u044d\u0442\u0443 \u043e\u043f\u0446\u0438\u044e \u0434\u043b\u044f %(xblockType)s.", 
+    "If you select an option other than \"%(hide_label)s\", after the subsection release date has passed, published units in this subsection will become available to learners unless units are explicitly hidden.": "\u0415\u0441\u043b\u0438 \u0412\u044b \u0432\u044b\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u0430\u043a\u043e\u0439-\u043b\u0438\u0431\u043e \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u043a\u0440\u043e\u043c\u0435 \"%(hide_label)s\", \u043f\u0440\u0438 \u043d\u0430\u0441\u0442\u0443\u043f\u043b\u0435\u043d\u0438\u0438 \u0434\u0430\u0442\u044b \u0432\u044b\u043f\u0443\u0441\u043a\u0430 \u043f\u043e\u0434\u0440\u0430\u0437\u0434\u0435\u043b\u0430 \u043e\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0431\u043b\u043e\u043a\u0438 \u0438\u0437 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0434\u0435\u043b\u0430 \u0441\u0442\u0430\u043d\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u043e\u0431\u0443\u0447\u0430\u044e\u0449\u0438\u043c\u0441\u044f, \u0437\u0430 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u043c \u0431\u043b\u043e\u043a\u043e\u0432, \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u043d\u043e \u0441\u043a\u0440\u044b\u0442\u044b\u0445 \u0430\u0432\u0442\u043e\u0440\u0430\u043c\u0438.", 
     "If you use the Advanced Editor, this problem will be converted to XML and you will not be able to return to the Simple Editor Interface.\n\nProceed to the Advanced Editor and convert this problem to XML?": "\u0415\u0441\u043b\u0438 \u0432\u044b \u0432\u043e\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0435\u0441\u044c \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u043c \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u043e\u043c, \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u043e \u0432 \u0444\u043e\u0440\u043c\u0430\u0442 XML, \u0438 \u0432\u044b \u043d\u0435 \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a \u043f\u0440\u043e\u0441\u0442\u043e\u043c\u0443 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u0443.\n\n\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u043c\u0443 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u0443 \u0438 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u0442\u044c \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u0432 \u0444\u043e\u0440\u043c\u0430\u0442 XML?", 
     "Ignore": "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c", 
     "Ignore all": "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0432\u0441\u0435", 
@@ -1989,7 +1988,6 @@
     "less than a minute": "\u043c\u0435\u043d\u044c\u0448\u0435 \u043c\u0438\u043d\u0443\u0442\u044b", 
     "marked as answer %(time_ago)s": "\u043e\u0442\u043c\u0435\u0447\u0435\u043d\u043e \u043a\u0430\u043a \u043e\u0442\u0432\u0435\u0442 %(time_ago)s", 
     "marked as answer %(time_ago)s by %(user)s": "\u043e\u0442\u043c\u0435\u0447\u0435\u043d\u043e \u043a\u0430\u043a \u043e\u0442\u0432\u0435\u0442 %(time_ago)s \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c %(user)s", 
-    "message": "\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435", 
     "name": "\u0438\u043c\u044f", 
     "not enrolled": "\u043d\u0435 \u0437\u0430\u0447\u0438\u0441\u043b\u0435\u043d", 
     "off": "\u0432\u044b\u043a\u043b", 
diff --git a/lms/static/js/i18n/zh-cn/djangojs.js b/lms/static/js/i18n/zh-cn/djangojs.js
index a2a99d2657..6d0e31e0d2 100644
--- a/lms/static/js/i18n/zh-cn/djangojs.js
+++ b/lms/static/js/i18n/zh-cn/djangojs.js
@@ -427,7 +427,6 @@
     "Edit Membership": "\u7f16\u8f91\u56e2\u961f\u6210\u5458\u4fe1\u606f", 
     "Edit Team": "\u7f16\u8f91\u56e2\u961f", 
     "Edit Your Name": "\u7f16\u8f91\u4f60\u7684\u540d\u5b57", 
-    "Edit post title": "\u7f16\u8f91\u8ba8\u8bba\u5e16\u6807\u9898", 
     "Editable": "\u53ef\u7f16\u8f91", 
     "Editing comment": "\u7f16\u8f91\u8bc4\u8bba", 
     "Editing post": "\u7f16\u8f91\u8ba8\u8bba\u5e16", 
@@ -467,7 +466,6 @@
     "Enter the page number you'd like to quickly navigate to.": "\u8f93\u5165\u60a8\u9700\u8981\u5feb\u901f\u524d\u5f80\u7684\u9875\u7801\u3002", 
     "Enter the username or email address of each learner that you want to add as an exception.": "\u8f93\u5165\u60a8\u8981\u6dfb\u52a0\u4e3a\u7279\u6b8a\u5904\u7406\u7684\u6bcf\u4e00\u4f4d\u5b66\u5458\u7684\u7528\u6237\u540d\u6216\u7535\u5b50\u90ae\u4ef6\u3002", 
     "Enter username or email": "\u8f93\u5165\u7528\u6237\u540d\u6216\u8005\u7535\u5b50\u90ae\u4ef6\u5730\u5740", 
-    "Enter your question or comment": "\u8bf7\u8f93\u5165\u60a8\u7684\u95ee\u9898\u6216\u8005\u8bc4\u8bba", 
     "Entrance exam attempts is being reset for student '{student_id}'.": "\u6b63\u5728\u91cd\u7f6e\u5b66\u751f\u201c{student_id}\u201d\u7684\u5165\u5b66\u8003\u8bd5\u5c1d\u8bd5\u6b21\u6570\u3002", 
     "Entrance exam state is being deleted for student '{student_id}'.": "\u5b66\u751f'{student_id}'\u7684\u5165\u5b66\u8003\u8bd5\u7684\u72b6\u6001\u5df2\u88ab\u5220\u9664\u3002", 
     "Error": "\u9519\u8bef", 
diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss
index 51519f6d84..fdee6dab87 100644
--- a/lms/static/sass/discussion/elements/_navigation.scss
+++ b/lms/static/sass/discussion/elements/_navigation.scss
@@ -55,6 +55,22 @@
     width: 100%;
 }
 
+.forum-nav-browse-menu-following {
+    .icon {
+        @include float(left);
+        @include left($baseline / 2);
+        position: relative;
+        top: 13px;
+    }
+    .forum-nav-browse-title {
+        @include padding-left($baseline * 1.5);
+    }
+}
+
+.forum-nav-browse-menu-item {
+  margin-bottom: 0;
+}
+
 .forum-nav-browse-title {
     @include text-align(left);
     display: block;
@@ -66,10 +82,11 @@
     background: transparent;
     box-shadow: none;
     background-image: none;
-    color: $link-color;
+    cursor: pointer;
 
     &:hover,
-    &:focus {
+    &:focus,
+    &.is-focused {
         // switched from a to button;
         // need to override button styles
         background-image: none !important;
@@ -166,6 +183,11 @@
     background-color: $forum-color-background;
     margin-bottom: 0;
 
+    &:last-child {
+        // Overrides pattern library default li:last-child style
+        border-bottom: 1px solid $forum-color-border;
+    }
+
     .forum-nav-thread-link {
         @include border-left(3px solid transparent);
         display: flex;
diff --git a/lms/static/sass/discussion/utilities/_shame.scss b/lms/static/sass/discussion/utilities/_shame.scss
index 5e2dfdc802..d04a574fe7 100644
--- a/lms/static/sass/discussion/utilities/_shame.scss
+++ b/lms/static/sass/discussion/utilities/_shame.scss
@@ -21,11 +21,6 @@
 // navigation - browse menu
 // ------------------------
 
-// Override global a rules
-.forum-nav-browse-title {
-  color: inherit !important;
-}
-
 // Override global label rules
 .forum-nav-browse-filter label {
   margin-bottom: 0;
diff --git a/lms/templates/discussion/_filter_dropdown.html b/lms/templates/discussion/_filter_dropdown.html
index c9bf9bc298..4ed62fef3d 100644
--- a/lms/templates/discussion/_filter_dropdown.html
+++ b/lms/templates/discussion/_filter_dropdown.html
@@ -19,38 +19,40 @@ from openedx.core.djangolib.markup import HTML
     <li
         class="forum-nav-browse-menu-item"
         data-discussion-id='${entries[entry]["id"]}'
+        id='${entries[entry]["id"]}'
         data-cohorted="${str(entries[entry]['is_cohorted']).lower()}"
+        role="option"
     >
-        <button type="button" class="forum-nav-browse-title">${entry}</button>
+        <span class="forum-nav-browse-title">${entry}</span>
     </li>
 </%def>
 
 <%def name="render_category(categories, category)">
-    <li class="forum-nav-browse-menu-item">
-        <button type="button" class="forum-nav-browse-title">${category}</button>
+    <li class="forum-nav-browse-menu-item"
+        id='${category | u}'
+    >
+        <span class="forum-nav-browse-title">${category}</span>
         <ul class="forum-nav-browse-submenu">
             ${HTML(render_dropdown(categories[category]))}
         </ul>
     </li>
 </%def>
 
-<div class="forum-nav-browse-menu-wrapper" style="display: none">
-    <form class="forum-nav-browse-filter">
+<div class="forum-nav-browse-menu-wrapper" style="display: none" aria-label="${_("Discussion topics list")}">
+    <form class="forum-nav-browse-filter" autocomplete="off">
         <label>
             <span class="sr">${_("Filter Topics")}</span>
-            <input type="text" class="forum-nav-browse-filter-input" placeholder="${_("filter topics")}">
+            <input type="text" id="forum-nav-browse-filter-input" role="combobox" aria-expanded="true" aria-owns="discussion_topics_listbox" aria-autocomplete="list" class="forum-nav-browse-filter-input" placeholder="${_("filter topics")}">
             <span class="icon fa fa-filter" aria-hidden="true"></span>
         </label>
     </form>
-    <ul class="forum-nav-browse-menu">
-        <li class="forum-nav-browse-menu-item forum-nav-browse-menu-all">
-            <button type="button" class="forum-nav-browse-title">${_("All Discussions")}</button>
+    <ul class="forum-nav-browse-menu" role="listbox" id="discussion_topics_listbox">
+        <li class="forum-nav-browse-menu-item forum-nav-browse-menu-all" role="option" id="all_discussions">
+            <span class="forum-nav-browse-title">${_("All Discussions")}</span>
         </li>
-        <li class="forum-nav-browse-menu-item forum-nav-browse-menu-following">
-            <button type="button" class="forum-nav-browse-title">
-                <span class="icon fa fa-star" aria-hidden="true"></span>
-                ${_("Posts I'm Following")}
-            </button>
+        <li class="forum-nav-browse-menu-item forum-nav-browse-menu-following" role="option" id="posts_following">
+            <span class="icon fa fa-star" aria-hidden="true"></span>
+            <span class="forum-nav-browse-title">${_("Posts I'm Following")}</span>
         </li>
         ${HTML(render_dropdown(category_map))}
     </ul>
diff --git a/lms/templates/problem_ajax.html b/lms/templates/problem_ajax.html
index 6794032a54..664b7567c0 100644
--- a/lms/templates/problem_ajax.html
+++ b/lms/templates/problem_ajax.html
@@ -1,7 +1 @@
-<%! from django.utils.translation import ugettext as _ %>
-<div id="problem_${element_id}" class="problems-wrapper" data-problem-id="${id}" data-url="${ajax_url}" data-progress_status="${progress_status}" data-progress_detail="${progress_detail}" data-content="${content | h}">
-    <p class="loading-spinner">
-        <span class="icon fa fa-spinner fa-pulse fa-2x fa-fw" aria-hidden="true"></span>
-        <span class="sr">${_('Loading')}</span>
-    </p>
-</div>
+<div id="problem_${element_id}" class="problems-wrapper" data-problem-id="${id}" data-url="${ajax_url}" data-progress_status="${progress_status}" data-progress_detail="${progress_detail}" data-content="${content | h}"></div>
diff --git a/lms/templates/video.html b/lms/templates/video.html
index a9a9ed86fc..0c0a0484f0 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -39,52 +39,49 @@ from openedx.core.djangolib.js_utils import js_escaped_string
     </div>
 
     <div class="focus_grabber last"></div>
-  <ul class="wrapper-downloads">
-    % if download_video_link:
-        <li class="video-sources video-download-button">
-            <a href="${download_video_link}">${_('Download video')}</a>
-        </li>
-    % endif
-    % if track:
-        <li class="video-tracks video-download-button">
-          % if transcript_download_format:
-            <a href="${track}">${_('Download transcript')}</a>
-            <div class="a11y-menu-container">
-                <a class="a11y-menu-button" href="#" title="${'.' + transcript_download_format}" role="button" aria-disabled="false">${'.' + transcript_download_format}</a>
-                <ol class="a11y-menu-list" role="menu">
+    
+    % if download_video_link or track or handout or branding_info:
+    <h3 class="hd hd-4 downloads-heading sr" id="video-download-transcripts_${id}">${_('Downloads and transcripts')}</h3>
+    <div class="wrapper-downloads" role="region" aria-labelledby="video-download-transcripts_${id}">
+        % if download_video_link:
+        <div class="wrapper-download-video">
+            <h4 class="hd hd-5">${_('Video')}</h4>
+            <a class="btn-link video-sources video-download-button" href="${download_video_link}">
+                ${_('Download video file')}
+            </a>
+        </div>
+        % endif
+        % if track:
+        <div class="wrapper-download-transcripts">
+            <h4 class="hd hd-5">${_('Transcripts')}</h4>
+            % if transcript_download_format:
+            <ul class="list-download-transcripts">
                 % for item in transcript_download_formats_list:
-                  % if item['value'] == transcript_download_format:
-                  <li class="a11y-menu-item active">
-                  % else:
-                  <li class="a11y-menu-item">
-                  % endif
-                  ## This is necessary so we don't scrape 'display_name' as a string.
-                  <% dname = item['display_name'] %>
-                      <a class="a11y-menu-item-link" href="#${item['value']}" title="${_(dname)}" data-value="${item['value']}" role="menuitem" aria-disabled="false">
-                        ${_(dname)}
-                      </a>
-                  </li>
+                    <li class="transcript-option">
+                        <% dname = _("Download {file}").format(file=item['display_name']) %>
+                        <a class="btn btn-link" href="${track}" data-value="${item['value']}">${dname}</a>
+                    </li>
                 % endfor
-                </ol>
-            </div>
-          % else:
-            <a href="${track}" class="external-track">${_('Download transcript')}</a>
-          % endif
-        </li>
+            </ul>
+            % else:
+            <a class="btn-link external-track" href="${track}">${_('Download transcript')}</a>
+            % endif
+        </div>
+        % endif
+        % if handout:
+        <div class="wrapper-handouts">
+            <h4 class="hd hd-5">${_('Handouts')}</h4>
+            <a class="btn-link" href="${handout}">${_('Download Handout')}</a>
+        </div>
+        % endif
+        % if branding_info:
+        <div class="branding">
+            <span class="host-tag">${branding_info['logo_tag']}</span>
+            <a href="${branding_info['url']}"><img class="brand-logo" src="${branding_info['logo_src']}" alt="${branding_info['logo_tag']}" /></a>
+        </div>
+        % endif
+    </div>
     % endif
-    % if handout:
-        <li class="video-handout video-download-button">
-            <a href="${handout}" target="_blank">${_('Download Handout')}</a>
-        </li>
-    % endif
-
-    % if branding_info:
-      <li id="branding" class="branding">
-        <span class="host-tag">${branding_info['logo_tag']}</span>
-        <a href="${branding_info['url']}" target="_blank" title="${branding_info['logo_tag']}"><img class="brand-logo" src="${branding_info['logo_src']}" alt="${branding_info['logo_tag']}" /></a>
-      </li>
-    % endif
-  </ul>
 </div>
 % if cdn_eval:
 <script>
diff --git a/openedx.yaml b/openedx.yaml
new file mode 100644
index 0000000000..551a97567e
--- /dev/null
+++ b/openedx.yaml
@@ -0,0 +1,7 @@
+# This file describes this Open edX repo, as described in OEP-2:
+# http://open-edx-proposals.readthedocs.io/en/latest/oeps/oep-0002.html#specification
+
+nick: edx
+oeps: {}
+openedx-release: {ref: release, requirements: requirements/edx/github.txt}
+track-pulls: true
diff --git a/openedx/core/djangoapps/site_configuration/migrations/0003_siteconfiguration_receipt_page_url.py b/openedx/core/djangoapps/site_configuration/migrations/0003_siteconfiguration_receipt_page_url.py
deleted file mode 100644
index 35eb9a8cda..0000000000
--- a/openedx/core/djangoapps/site_configuration/migrations/0003_siteconfiguration_receipt_page_url.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('site_configuration', '0002_auto_20160720_0231'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='siteconfiguration',
-            name='receipt_page_url',
-            field=models.CharField(default=b'/commerce/checkout/receipt/?orderNum=', help_text='Path to order receipt page.', max_length=255),
-        ),
-    ]
diff --git a/openedx/core/djangoapps/site_configuration/models.py b/openedx/core/djangoapps/site_configuration/models.py
index e9c5d3a5ff..61c05eb044 100644
--- a/openedx/core/djangoapps/site_configuration/models.py
+++ b/openedx/core/djangoapps/site_configuration/models.py
@@ -7,7 +7,6 @@ from django.db import models
 from django.contrib.sites.models import Site
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
 
 from django_extensions.db.models import TimeStampedModel
 from jsonfield.fields import JSONField
@@ -26,8 +25,6 @@ class SiteConfiguration(models.Model):
         site (OneToOneField): one to one field relating each configuration to a single site
         values (JSONField):  json field to store configurations for a site
     """
-    DEFAULT_RECEIPT_PAGE_URL = '/commerce/checkout/receipt/?orderNum='
-
     site = models.OneToOneField(Site, related_name='configuration')
     enabled = models.BooleanField(default=False, verbose_name="Enabled")
     values = JSONField(
@@ -35,11 +32,6 @@ class SiteConfiguration(models.Model):
         blank=True,
         load_kwargs={'object_pairs_hook': collections.OrderedDict}
     )
-    receipt_page_url = models.CharField(
-        max_length=255,
-        default=DEFAULT_RECEIPT_PAGE_URL,
-        help_text=_('Path to order receipt page.')
-    )
 
     def __unicode__(self):
         return u"<SiteConfiguration: {site} >".format(site=self.site)
diff --git a/openedx/core/djangoapps/theming/core.py b/openedx/core/djangoapps/theming/core.py
index 27865f2efc..5004686d50 100644
--- a/openedx/core/djangoapps/theming/core.py
+++ b/openedx/core/djangoapps/theming/core.py
@@ -2,6 +2,7 @@
 Core logic for Comprehensive Theming.
 """
 from django.conf import settings
+from path import Path as path
 
 from .helpers import get_themes
 
@@ -21,9 +22,16 @@ def enable_theming():
         )
 
     for theme in get_themes():
-        locale_dir = theme.path / "conf" / "locale"
-        if locale_dir.isdir():
-            settings.LOCALE_PATHS = (locale_dir, ) + settings.LOCALE_PATHS
-
         if theme.themes_base_dir not in settings.MAKO_TEMPLATES['main']:
             settings.MAKO_TEMPLATES['main'].insert(0, theme.themes_base_dir)
+
+    _add_theming_locales()
+
+
+def _add_theming_locales():
+    """
+    Add locale paths to settings for comprehensive theming.
+    """
+    theme_locale_paths = settings.COMPREHENSIVE_THEME_LOCALE_PATHS
+    for locale_path in theme_locale_paths:
+        settings.LOCALE_PATHS += (path(locale_path), )  # pylint: disable=no-member
diff --git a/openedx/core/djangoapps/theming/tests/test_theme_locales.py b/openedx/core/djangoapps/theming/tests/test_theme_locales.py
new file mode 100644
index 0000000000..f577ef23bd
--- /dev/null
+++ b/openedx/core/djangoapps/theming/tests/test_theme_locales.py
@@ -0,0 +1,26 @@
+"""
+Tests for Themeing locales
+"""
+
+import unittest
+from django.conf import settings
+from django.test import TestCase
+import os
+
+
+class TestComprehensiveThemeLocale(TestCase):
+    """
+    Test Comprehensive Theme Locales
+    """
+    @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
+    def test_theme_locale_path_in_settings(self):
+        """
+        test comprehensive theming paths in settings.
+        """
+        self.assertIn(settings.REPO_ROOT / 'themes/conf/locale', settings.LOCALE_PATHS)  # pylint: disable=no-member
+
+    def test_theme_locale_path_exist(self):
+        """
+        test comprehensive theming directory path exist.
+        """
+        self.assertTrue(os.path.exists(settings.REPO_ROOT / "themes/conf/locale"))
diff --git a/openedx/core/djangoapps/user_api/views.py b/openedx/core/djangoapps/user_api/views.py
index 70215786c7..2d62520990 100644
--- a/openedx/core/djangoapps/user_api/views.py
+++ b/openedx/core/djangoapps/user_api/views.py
@@ -807,7 +807,7 @@ class RegistrationView(APIView):
         # Translators: This is a legal document users must agree to
         # in order to register a new account.
         terms_label = _(u"Terms of Service")
-        terms_link = marketing_link("TIS")
+        terms_link = marketing_link("TOS")
         terms_text = _(u"Review the Terms of Service")
 
         # Translators: "Terms of service" is a legal document users must agree to
diff --git a/themes/conf/locale/en/LC_MESSAGES/django.po b/themes/conf/locale/en/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..e5062169fe
--- /dev/null
+++ b/themes/conf/locale/en/LC_MESSAGES/django.po
@@ -0,0 +1,13 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-09-01 10:46+0500\n"
+"PO-Revision-Date: 2016-09-01 10:48+0500\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: en\n"