Merge branch 'master' into zzzarius/seo-240-cookie-policy-feature

cms/static/js/i18n/es-419/djangojs.js

@@ -730,6 +730,7 @@
     "Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single group.": "Los administradores de la discusi\u00f3n, moderadores, y profesores asociados pueden hacer sus publicaciones visibles a todos los estudiantes o especificar un grupo en particular.",
     "Discussion topics in the course are not divided.": "Temas de discusi\u00f3n en el curso no son divididos.",
     "Discussions are unified; all learners interact with posts from other learners, regardless of the group they are in.": "Las discusiones son unificadas; todos los estudiantes interact\u00faan con publicaciones de otros estudiantes, sin considerar su grupo.",
+    "Discussions enabled": "Discusiones habilitadas",
     "Display Name": "Nombre para mostrar:",
     "Div": "Div",
     "Divide the selected content-specific discussion topics": "Divide los contenidos espec\u00edficos seleccionados de los temas de la discusi\u00f3n",

cms/static/js/i18n/tr-tr/djangojs.js

@@ -782,6 +782,7 @@
     "Error retrieving grading configuration.": "Notland\u0131rma yap\u0131land\u0131rmas\u0131n\u0131 al\u0131rken hata.",
     "Error sending email.": "E-posta g\u00f6nderiminde hata.",
     "Error starting a task to rescore entrance exam for student '{student_id}'. Make sure that entrance exam has problems in it and student identifier is correct.": "'{student_id}' \u00f6\u011frencisi i\u00e7in giri\u015f s\u0131nav\u0131n\u0131 yeniden puanlamak i\u00e7in g\u00f6reve ba\u015flarken hata olu\u015ftu. Giri\u015f s\u0131nav\u0131n\u0131n problemleri ve \u00f6\u011frenci belirleyicisinin do\u011fru oldu\u011fundan emin olun.",
+    "Error starting a task to rescore problem '<%- problem_id %>' for student '<%- student_id %>'. Make sure that the the problem and student identifiers are complete and correct.": "\u00d6\u011frenci '<%- student_id %>' i\u00e7in '<%- problem_id %>' problemini yeniden puanlamak i\u00e7in bir g\u00f6rev ba\u015flat\u0131l\u0131rken hata olu\u015ftu. Problemin ve \u00f6\u011frenci tan\u0131mlay\u0131c\u0131lar\u0131n\u0131n eksiksiz ve do\u011fru oldu\u011fundan emin olun.",
     "Error starting a task to reset attempts for all students on problem '<%- problem_id %>'. Make sure that the problem identifier is complete and correct.": "T\u00fcm \u00f6\u011frencilerin '<%- problem_id %>' problemi i\u00e7in denemelerini s\u0131f\u0131rlamak i\u00e7in g\u00f6rev ba\u015flat\u0131l\u0131rken hatayla kar\u015f\u0131la\u015f\u0131ld\u0131. Problem tan\u0131mlay\u0131c\u0131s\u0131n\u0131n tam ve do\u011fru yaz\u0131ld\u0131\u011f\u0131na emin olunuz.",
     "Error while fetching student data.": "\u00d6\u011frenci verisi al\u0131n\u0131rken hata olu\u015ftu.",
     "Error while generating certificates. Please try again.": "Sertifika olu\u015ftururken hata olu\u015ftu. L\u00fctfen tekrar deneyiniz.",
@@ -1650,6 +1651,7 @@
     "Start search": "Aramaya ba\u015fla",
     "Start working toward your next learning goal.": "Bir sonraki hedefin i\u00e7in \u00e7al\u0131\u015fmaya ba\u015fla.",
     "Started": "Ba\u015flad\u0131",
+    "Started entrance exam rescore task for student '{student_id}'. Click the 'Show Task Status' button to see the status of the task.": "'{student_id}' \u00f6\u011frencisi i\u00e7in giri\u015f s\u0131nav\u0131 yeniden puanlama g\u00f6revi ba\u015flat\u0131ld\u0131. G\u00f6revin durumunu g\u00f6rmek i\u00e7in 'G\u00f6rev Durumunu G\u00f6ster' d\u00fc\u011fmesine t\u0131klay\u0131n.",
     "Started rescore problem task for problem '<%- problem_id %>' and student '<%- student_id %>'. Click the 'Show Task Status' button to see the status of the task.": "<%- problem_id %>' nolu problem ve '<%- student_id %>' nolu \u00f6\u011frenci i\u00e7in problemi yeniden notland\u0131rma g\u00f6revi ba\u015flad\u0131. Bu g\u00f6revin durumunu g\u00f6rmek i\u00e7in 'G\u00f6rev Durumunu G\u00f6r' d\u00fc\u011fmesine bas\u0131n\u0131z.",
     "Started {start}": "Ba\u015flad\u0131 {start}",
     "Starting Exam": "S\u0131nav Ba\u015flat\u0131l\u0131yor",
@@ -1693,6 +1695,7 @@
     "Successfully reset the attempts for user {user}": "{user} adl\u0131 kullan\u0131c\u0131n\u0131n denemeleri ba\u015far\u0131yla s\u0131f\u0131rland\u0131",
     "Successfully sent enrollment emails to the following users. They will be allowed to enroll once they register:": "A\u015fa\u011f\u0131daki kullan\u0131c\u0131lara kay\u0131t e-postalar\u0131 ba\u015far\u0131yla g\u00f6nderildi. Kay\u0131t bilgilerini girdikten sonra sonra kay\u0131t yapmalar\u0131na izin verilecek:",
     "Successfully sent enrollment emails to the following users. They will be enrolled once they register:": "A\u015fa\u011f\u0131daki kullan\u0131c\u0131lara kay\u0131t e-postalar\u0131 ba\u015far\u0131yla g\u00f6nderildi. Kay\u0131t bilgilerini girdikten sonra sonra kay\u0131tlar\u0131 yap\u0131lacakt\u0131r:",
+    "Successfully started task to rescore problem '<%- problem_id %>' for all students. Click the 'Show Task Status' button to see the status of the task.": "T\u00fcm \u00f6\u011frenciler i\u00e7in '<%- problem_id %>' problemini yeniden puanlamak i\u00e7in g\u00f6rev ba\u015far\u0131yla ba\u015flat\u0131ld\u0131. G\u00f6revin durumunu g\u00f6rmek i\u00e7in 'G\u00f6rev Durumunu G\u00f6ster' d\u00fc\u011fmesine t\u0131klay\u0131n.",
     "Successfully started task to reset attempts for problem '<%- problem_id %>'. Click the 'Show Task Status' button to see the status of the task.": "'<%- problem_id %>' nolu problem i\u00e7in denemeleri s\u0131f\u0131rlama g\u00f6revi ba\u015far\u0131yla ba\u015flat\u0131ld\u0131. Bu g\u00f6revin durumunu g\u00f6rmek i\u00e7in 'G\u00f6rev Durumunu G\u00f6r' d\u00fc\u011fmesine bas\u0131n\u0131z.",
     "Successfully unlinked.": "Ba\u011flant\u0131 ba\u015far\u0131yla kald\u0131r\u0131ld\u0131.",
     "Superscript": "\u00dcst simge",