Skip to content

Commit

Permalink
Merge pull request #992 from edx/rc/1.3.1
Browse files Browse the repository at this point in the history
Version 1.3.1 release
  • Loading branch information
Eric Fischer authored Mar 23, 2017
2 parents a7ea607 + 0f70ae3 commit 6014592
Show file tree
Hide file tree
Showing 300 changed files with 1,815 additions and 705 deletions.
Binary file modified openassessment/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
25 changes: 20 additions & 5 deletions openassessment/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-21 19:56+0000\n"
"POT-Creation-Date: 2017-03-23 17:31+0000\n"
"PO-Revision-Date: 2017-03-21 19:48+0000\n"
"Last-Translator: Eric Fischer <[email protected]>\n"
"Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n"
Expand All @@ -42,20 +42,24 @@ msgid ""
msgstr "إذا كان واجبك يتضمّن خطوة تدريب للمتعلّمين، فيجب أن يتضمّن سلّم التقييم معيارًا واحدًا على الأقل، وعلى هذا المعيار أن يتضمّن خيارًا واحدًا على الأقل."

#: openassessment/assessment/api/student_training.py:204
#, python-brace-format
msgid "Example {example_number} has a validation error: {error}"
msgstr "نأسف لحدوث خطأ في عملية التحقق في المثال {example_number}: {error}"

#: openassessment/assessment/api/student_training.py:218
#, python-brace-format
msgid ""
"Example {example_number} has an invalid option for \"{criterion_name}\": "
"\"{option_name}\""
msgstr "يوجد في المثال {example_number} خيار غير صحيح بالنسبة لـ \"{criterion_name}\": \"{option_name}\""

#: openassessment/assessment/api/student_training.py:228
#, python-brace-format
msgid "Example {example_number} has an extra option for \"{criterion_name}\""
msgstr "يوجد في المثال {example_number} خيار إضافي لـ \"{criterion_name}\""

#: openassessment/assessment/api/student_training.py:241
#, python-brace-format
msgid "Example {example_number} is missing an option for \"{criterion_name}\""
msgstr "ينقُصُ هذا المثال {example_number} خيارٌ لـ \"{criterion_name}\""

Expand Down Expand Up @@ -876,7 +880,7 @@ msgstr "قيِّم الزملاء"
#: openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html:24
#: openassessment/templates/openassessmentblock/response/oa_response.html:20
#: openassessment/templates/openassessmentblock/student_training/student_training.html:20
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(start_date)s\" data-string=\"available {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand All @@ -895,7 +899,7 @@ msgstr "\n<span class=\"date ora-datetime\" data-datetime=\"%(start_date)s\" dat
#: openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html:31
#: openassessment/templates/openassessmentblock/response/oa_response.html:27
#: openassessment/templates/openassessmentblock/student_training/student_training.html:27
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(due_date)s\" data-string=\"due {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand Down Expand Up @@ -1197,7 +1201,7 @@ msgstr "قيّم ردّك"
#. time until that date. Example: "available August 13th, 2014 (in 5 days and
#. 45 minutes)"
#: openassessment/templates/openassessmentblock/self/oa_self_assessment.html:21
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(start_date)s\" data-string=\"available {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand All @@ -1208,7 +1212,7 @@ msgstr "\n<span class=\"date ora-datetime\" data-datetime=\"%(start_date)s\" dat
#. time until that date. Example: "due August 13th, 2014 (in 5 days and 45
#. minutes)"
#: openassessment/templates/openassessmentblock/self/oa_self_assessment.html:28
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(due_date)s\" data-string=\"due {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand Down Expand Up @@ -1679,6 +1683,7 @@ msgstr "متوسّط درجة الزملاء"

#: openassessment/xblock/grade_mixin.py:357
#: openassessment/xblock/grade_mixin.py:501
#, python-brace-format
msgid "Peer {peer_index}"
msgstr "الزميل {peer_index}"

Expand Down Expand Up @@ -1748,32 +1753,38 @@ msgid "Submit your assessment and move to next step"
msgstr "قدِّم تقييمك ثم انتقل إلى الخطوة التالية."

#: openassessment/xblock/peer_assessment_mixin.py:218
#, python-brace-format
msgid "Submit your assessment and move to response #{response_number}"
msgstr "قدِّم تقييمك ثم انتقل إلى الرد #{response_number}."

#: openassessment/xblock/resolve_dates.py:50
#, python-brace-format
msgid ""
"'{date}' is an invalid date format. Make sure the date is formatted as YYYY-"
"MM-DDTHH:MM:SS."
msgstr "تُعدّ '{date}' صيغة غير صحيحة للتاريخ. يُرجى التأكّد من كتابة التاريخ بهذه الصيغة YYYY-MM-DDTHH:MM:SS."

#: openassessment/xblock/resolve_dates.py:56
#, python-brace-format
msgid "'{date}' must be a date string or datetime"
msgstr "يجب على '{date}' أن يكون سلسلة من التواريخ أو من التواريخ والوقت"

#: openassessment/xblock/resolve_dates.py:209
#, python-brace-format
msgid ""
"This step's start date '{start}' cannot be earlier than the previous step's "
"start date '{prev}'."
msgstr "لا يمكن لتاريخ البدء بهذه الخطوة '{start}' أن يسبق تاريخ البدء بالخطوة السابقة '{prev}'."

#: openassessment/xblock/resolve_dates.py:217
#, python-brace-format
msgid ""
"This step's due date '{due}' cannot be later than the next step's due date "
"'{prev}'."
msgstr "لا يمكن لتاريخ استحقاق هذه الخطوة '{due}' أن يأتي بعد تاريخ استحقاق الخطوة التالية '{prev}'."

#: openassessment/xblock/resolve_dates.py:233
#, python-brace-format
msgid "The start date '{start}' cannot be later than the due date '{due}'"
msgstr "لا يمكن لتاريخ البدء '{start}' أن يأتي بعد تاريخ الاستحقاق '{due}'."

Expand Down Expand Up @@ -1807,10 +1818,12 @@ msgid "You do not have permission to access ORA staff grading."
msgstr "عذرًا، ليست لديك صلاحية الوصول إلى صفحة طاقم \"اسئلة الإجابات المفتوحة\" للمساق."

#: openassessment/xblock/staff_area_mixin.py:212
#, python-brace-format
msgid "Training scheduled with new Workflow UUID: {uuid}"
msgstr "جرت جدولة التدريب مع أسلوب سير عمل جديد UUID: {uuid}"

#: openassessment/xblock/staff_area_mixin.py:217
#, python-brace-format
msgid "An error occurred scheduling classifier training: {error}"
msgstr "نأسف لحدوث خطأ أثناء جدولة التدريب على أداة التصنيف: {error}"

Expand Down Expand Up @@ -1918,6 +1931,7 @@ msgid ""
msgstr "خطأ في التحقّق: لم تُحدّد أي أمثلة للتقييم القائم على الأمثلة."

#: openassessment/xblock/studio_mixin.py:232
#, python-brace-format
msgid "Validation error: {error}"
msgstr "خطأ في التحقّق: {error}"

Expand Down Expand Up @@ -2035,6 +2049,7 @@ msgid "This rubric definition is not valid."
msgstr "تعريف سلّم التقييم هذا غير صالح."

#: openassessment/xblock/validation.py:206
#, python-brace-format
msgid "Options in '{criterion}' have duplicate name(s): {duplicates}"
msgstr "تحتوي الخيارات في المعيار ’{criterion}‘ على اسم (أسماء) مزدوج: {duplicates}"

Expand Down
Binary file modified openassessment/locale/ar/LC_MESSAGES/djangojs.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions openassessment/locale/ar/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-21 19:56+0000\n"
"PO-Revision-Date: 2017-03-21 19:48+0000\n"
"POT-Creation-Date: 2017-03-23 17:31+0000\n"
"PO-Revision-Date: 2017-03-23 18:42+0000\n"
"Last-Translator: Eric Fischer <[email protected]>\n"
"Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -112,12 +112,12 @@ msgstr "تعذّر إجراء التحميل."

#: openassessment/xblock/static/js/openassessment-lms.min.js:1
#: openassessment/xblock/static/js/src/lms/oa_course_items_listing.js:48
msgid "Parent Section"
msgid "Unit Name"
msgstr ""

#: openassessment/xblock/static/js/openassessment-lms.min.js:1
#: openassessment/xblock/static/js/src/lms/oa_course_items_listing.js:48
msgid "Parent Sections"
msgid "Units"
msgstr ""

#: openassessment/xblock/static/js/openassessment-lms.min.js:1
Expand Down
Binary file modified openassessment/locale/bg/LC_MESSAGES/django.mo
Binary file not shown.
25 changes: 20 additions & 5 deletions openassessment/locale/bg/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-21 19:56+0000\n"
"POT-Creation-Date: 2017-03-23 17:31+0000\n"
"PO-Revision-Date: 2017-03-21 19:47+0000\n"
"Last-Translator: Eric Fischer <[email protected]>\n"
"Language-Team: Bulgarian (http://www.transifex.com/open-edx/edx-platform/language/bg/)\n"
Expand All @@ -29,20 +29,24 @@ msgid ""
msgstr ""

#: openassessment/assessment/api/student_training.py:204
#, python-brace-format
msgid "Example {example_number} has a validation error: {error}"
msgstr ""

#: openassessment/assessment/api/student_training.py:218
#, python-brace-format
msgid ""
"Example {example_number} has an invalid option for \"{criterion_name}\": "
"\"{option_name}\""
msgstr ""

#: openassessment/assessment/api/student_training.py:228
#, python-brace-format
msgid "Example {example_number} has an extra option for \"{criterion_name}\""
msgstr ""

#: openassessment/assessment/api/student_training.py:241
#, python-brace-format
msgid "Example {example_number} is missing an option for \"{criterion_name}\""
msgstr ""

Expand Down Expand Up @@ -859,7 +863,7 @@ msgstr ""
#: openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html:24
#: openassessment/templates/openassessmentblock/response/oa_response.html:20
#: openassessment/templates/openassessmentblock/student_training/student_training.html:20
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(start_date)s\" data-string=\"available {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand All @@ -878,7 +882,7 @@ msgstr ""
#: openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html:31
#: openassessment/templates/openassessmentblock/response/oa_response.html:27
#: openassessment/templates/openassessmentblock/student_training/student_training.html:27
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(due_date)s\" data-string=\"due {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand Down Expand Up @@ -1180,7 +1184,7 @@ msgstr ""
#. time until that date. Example: "available August 13th, 2014 (in 5 days and
#. 45 minutes)"
#: openassessment/templates/openassessmentblock/self/oa_self_assessment.html:21
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(start_date)s\" data-string=\"available {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand All @@ -1191,7 +1195,7 @@ msgstr ""
#. time until that date. Example: "due August 13th, 2014 (in 5 days and 45
#. minutes)"
#: openassessment/templates/openassessmentblock/self/oa_self_assessment.html:28
#, python-format
#, python-format, python-brace-format
msgid ""
"\n"
" <span class=\"date ora-datetime\" data-datetime=\"%(due_date)s\" data-string=\"due {date} (in %(time_until)s)\" data-timezone=\"%(user_timezone)s\" data-language=\"%(user_language)s\"></span>\n"
Expand Down Expand Up @@ -1658,6 +1662,7 @@ msgstr ""

#: openassessment/xblock/grade_mixin.py:357
#: openassessment/xblock/grade_mixin.py:501
#, python-brace-format
msgid "Peer {peer_index}"
msgstr ""

Expand Down Expand Up @@ -1727,32 +1732,38 @@ msgid "Submit your assessment and move to next step"
msgstr ""

#: openassessment/xblock/peer_assessment_mixin.py:218
#, python-brace-format
msgid "Submit your assessment and move to response #{response_number}"
msgstr ""

#: openassessment/xblock/resolve_dates.py:50
#, python-brace-format
msgid ""
"'{date}' is an invalid date format. Make sure the date is formatted as YYYY-"
"MM-DDTHH:MM:SS."
msgstr ""

#: openassessment/xblock/resolve_dates.py:56
#, python-brace-format
msgid "'{date}' must be a date string or datetime"
msgstr ""

#: openassessment/xblock/resolve_dates.py:209
#, python-brace-format
msgid ""
"This step's start date '{start}' cannot be earlier than the previous step's "
"start date '{prev}'."
msgstr ""

#: openassessment/xblock/resolve_dates.py:217
#, python-brace-format
msgid ""
"This step's due date '{due}' cannot be later than the next step's due date "
"'{prev}'."
msgstr ""

#: openassessment/xblock/resolve_dates.py:233
#, python-brace-format
msgid "The start date '{start}' cannot be later than the due date '{due}'"
msgstr ""

Expand Down Expand Up @@ -1786,10 +1797,12 @@ msgid "You do not have permission to access ORA staff grading."
msgstr ""

#: openassessment/xblock/staff_area_mixin.py:212
#, python-brace-format
msgid "Training scheduled with new Workflow UUID: {uuid}"
msgstr ""

#: openassessment/xblock/staff_area_mixin.py:217
#, python-brace-format
msgid "An error occurred scheduling classifier training: {error}"
msgstr ""

Expand Down Expand Up @@ -1897,6 +1910,7 @@ msgid ""
msgstr ""

#: openassessment/xblock/studio_mixin.py:232
#, python-brace-format
msgid "Validation error: {error}"
msgstr ""

Expand Down Expand Up @@ -2014,6 +2028,7 @@ msgid "This rubric definition is not valid."
msgstr ""

#: openassessment/xblock/validation.py:206
#, python-brace-format
msgid "Options in '{criterion}' have duplicate name(s): {duplicates}"
msgstr ""

Expand Down
Binary file modified openassessment/locale/bg/LC_MESSAGES/djangojs.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions openassessment/locale/bg/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-21 19:56+0000\n"
"PO-Revision-Date: 2017-03-21 19:47+0000\n"
"POT-Creation-Date: 2017-03-23 17:31+0000\n"
"PO-Revision-Date: 2017-03-23 18:42+0000\n"
"Last-Translator: Eric Fischer <[email protected]>\n"
"Language-Team: Bulgarian (http://www.transifex.com/open-edx/edx-platform/language/bg/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -106,12 +106,12 @@ msgstr ""

#: openassessment/xblock/static/js/openassessment-lms.min.js:1
#: openassessment/xblock/static/js/src/lms/oa_course_items_listing.js:48
msgid "Parent Section"
msgid "Unit Name"
msgstr ""

#: openassessment/xblock/static/js/openassessment-lms.min.js:1
#: openassessment/xblock/static/js/src/lms/oa_course_items_listing.js:48
msgid "Parent Sections"
msgid "Units"
msgstr ""

#: openassessment/xblock/static/js/openassessment-lms.min.js:1
Expand Down
Binary file modified openassessment/locale/bg_BG/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit 6014592

Please sign in to comment.