remove use of ngettext in discussion jasmine test
Update translations (autogenerated message)
Merge pull request #5156 from edx/sarina/update-aspen-i18n

Sarina/update aspen i18n
CodeMirror should use monospace fonts.

TNL-197
Merge pull request #5160 from edx/ned/cherry-pick-monospace-code-mirror-fonts

CodeMirror should use monospace fonts.
Moved imports to startup.py.
Update platform to use the latest ORA release
Update djpyfs

And move from base.txt to github.txt

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
update password reset template (TNL-503)
Add SGA to reqs
Revert "Add SGA to reqs"

This reverts commit 35668da16a0906fd3d69951af62ad64d46caf773.
Install analytics repo from a SHA _not_ a tag

The v0.1 tag was mistakenly removed from upstream. While attempting to
restore it, it was restored to point to an earlier, incorrect
SHA/object.

Git does not support "renaming" of tags (changes to existing tags are
ignored), so environments which still had a local, cached copy of the
original tag were unaffected. Fresh installs were broken.

This change pins the version to the original source SHA, instead of a
tag.

Conflicts:
	requirements/edx/github.txt
Merge tag 'aspen.1' into docker_release

Conflicts:
	conf/locale/am/LC_MESSAGES/django.mo
	conf/locale/am/LC_MESSAGES/django.po
	conf/locale/am/LC_MESSAGES/djangojs.mo
	conf/locale/am/LC_MESSAGES/djangojs.po
	conf/locale/ar/LC_MESSAGES/django.mo
	conf/locale/ar/LC_MESSAGES/django.po
	conf/locale/ar/LC_MESSAGES/djangojs.mo
	conf/locale/ar/LC_MESSAGES/djangojs.po
	conf/locale/az/LC_MESSAGES/django.mo
	conf/locale/az/LC_MESSAGES/django.po
	conf/locale/az/LC_MESSAGES/djangojs.mo
	conf/locale/az/LC_MESSAGES/djangojs.po
	conf/locale/bg_BG/LC_MESSAGES/django.mo
	conf/locale/bg_BG/LC_MESSAGES/django.po
	conf/locale/bg_BG/LC_MESSAGES/djangojs.mo
	conf/locale/bg_BG/LC_MESSAGES/djangojs.po
	conf/locale/bn_BD/LC_MESSAGES/django.mo
	conf/locale/bn_BD/LC_MESSAGES/django.po
	conf/locale/bn_BD/LC_MESSAGES/djangojs.mo
	conf/locale/bn_BD/LC_MESSAGES/djangojs.po
	conf/locale/bn_IN/LC_MESSAGES/django.mo
	conf/locale/bn_IN/LC_MESSAGES/django.po
	conf/locale/bn_IN/LC_MESSAGES/djangojs.mo
	conf/locale/bn_IN/LC_MESSAGES/djangojs.po
	conf/locale/bs/LC_MESSAGES/django.mo
	conf/locale/bs/LC_MESSAGES/django.po
	conf/locale/bs/LC_MESSAGES/djangojs.mo
	conf/locale/bs/LC_MESSAGES/djangojs.po
	conf/locale/ca/LC_MESSAGES/django.mo
	conf/locale/ca/LC_MESSAGES/django.po
	conf/locale/ca/LC_MESSAGES/djangojs.mo
	conf/locale/ca/LC_MESSAGES/djangojs.po
	conf/locale/ca@valencia/LC_MESSAGES/django.mo
	conf/locale/ca@valencia/LC_MESSAGES/django.po
	conf/locale/ca@valencia/LC_MESSAGES/djangojs.mo
	conf/locale/ca@valencia/LC_MESSAGES/djangojs.po
	conf/locale/cs/LC_MESSAGES/django.mo
	conf/locale/cs/LC_MESSAGES/django.po
	conf/locale/cs/LC_MESSAGES/djangojs.mo
	conf/locale/cs/LC_MESSAGES/djangojs.po
	conf/locale/cy/LC_MESSAGES/django.mo
	conf/locale/cy/LC_MESSAGES/django.po
	conf/locale/cy/LC_MESSAGES/djangojs.mo
	conf/locale/cy/LC_MESSAGES/djangojs.po
	conf/locale/da/LC_MESSAGES/django.mo
	conf/locale/da/LC_MESSAGES/django.po
	conf/locale/da/LC_MESSAGES/djangojs.mo
	conf/locale/da/LC_MESSAGES/djangojs.po
	conf/locale/de_DE/LC_MESSAGES/django.mo
	conf/locale/de_DE/LC_MESSAGES/django.po
	conf/locale/de_DE/LC_MESSAGES/djangojs.mo
	conf/locale/de_DE/LC_MESSAGES/djangojs.po
	conf/locale/el/LC_MESSAGES/django.mo
	conf/locale/el/LC_MESSAGES/django.po
	conf/locale/el/LC_MESSAGES/djangojs.mo
	conf/locale/el/LC_MESSAGES/djangojs.po
	conf/locale/en_GB/LC_MESSAGES/django.mo
	conf/locale/en_GB/LC_MESSAGES/django.po
	conf/locale/en_GB/LC_MESSAGES/djangojs.mo
	conf/locale/en_GB/LC_MESSAGES/djangojs.po
	conf/locale/eo/LC_MESSAGES/django.mo
	conf/locale/eo/LC_MESSAGES/django.po
	conf/locale/eo/LC_MESSAGES/djangojs.mo
	conf/locale/eo/LC_MESSAGES/djangojs.po
	conf/locale/es_419/LC_MESSAGES/django.mo
	conf/locale/es_419/LC_MESSAGES/django.po
	conf/locale/es_419/LC_MESSAGES/djangojs.mo
	conf/locale/es_419/LC_MESSAGES/djangojs.po
	conf/locale/es_AR/LC_MESSAGES/django.mo
	conf/locale/es_AR/LC_MESSAGES/django.po
	conf/locale/es_AR/LC_MESSAGES/djangojs.mo
	conf/locale/es_AR/LC_MESSAGES/djangojs.po
	conf/locale/es_EC/LC_MESSAGES/django.mo
	conf/locale/es_EC/LC_MESSAGES/django.po
	conf/locale/es_EC/LC_MESSAGES/djangojs.mo
	conf/locale/es_EC/LC_MESSAGES/djangojs.po
	conf/locale/es_ES/LC_MESSAGES/django.mo
	conf/locale/es_ES/LC_MESSAGES/django.po
	conf/locale/es_ES/LC_MESSAGES/djangojs.mo
	conf/locale/es_ES/LC_MESSAGES/djangojs.po
	conf/locale/es_MX/LC_MESSAGES/django.mo
	conf/locale/es_MX/LC_MESSAGES/django.po
	conf/locale/es_MX/LC_MESSAGES/djangojs.mo
	conf/locale/es_MX/LC_MESSAGES/djangojs.po
	conf/locale/es_PE/LC_MESSAGES/django.mo
	conf/locale/es_PE/LC_MESSAGES/django.po
	conf/locale/es_PE/LC_MESSAGES/djangojs.mo
	conf/locale/es_PE/LC_MESSAGES/djangojs.po
	conf/locale/et_EE/LC_MESSAGES/django.mo
	conf/locale/et_EE/LC_MESSAGES/django.po
	conf/locale/et_EE/LC_MESSAGES/djangojs.mo
	conf/locale/et_EE/LC_MESSAGES/djangojs.po
	conf/locale/eu_ES/LC_MESSAGES/django.mo
	conf/locale/eu_ES/LC_MESSAGES/django.po
	conf/locale/eu_ES/LC_MESSAGES/djangojs.mo
	conf/locale/eu_ES/LC_MESSAGES/djangojs.po
	conf/locale/fa/LC_MESSAGES/django.mo
	conf/locale/fa/LC_MESSAGES/django.po
	conf/locale/fa/LC_MESSAGES/djangojs.mo
	conf/locale/fa/LC_MESSAGES/djangojs.po
	conf/locale/fa_IR/LC_MESSAGES/django.mo
	conf/locale/fa_IR/LC_MESSAGES/django.po
	conf/locale/fa_IR/LC_MESSAGES/djangojs.mo
	conf/locale/fa_IR/LC_MESSAGES/djangojs.po
	conf/locale/fi_FI/LC_MESSAGES/django.mo
	conf/locale/fi_FI/LC_MESSAGES/django.po
	conf/locale/fi_FI/LC_MESSAGES/djangojs.mo
	conf/locale/fi_FI/LC_MESSAGES/djangojs.po
	conf/locale/fil/LC_MESSAGES/django.mo
	conf/locale/fil/LC_MESSAGES/django.po
	conf/locale/fil/LC_MESSAGES/djangojs.mo
	conf/locale/fil/LC_MESSAGES/djangojs.po
	conf/locale/fr/LC_MESSAGES/django.mo
	conf/locale/fr/LC_MESSAGES/django.po
	conf/locale/fr/LC_MESSAGES/djangojs.mo
	conf/locale/fr/LC_MESSAGES/djangojs.po
	conf/locale/gl/LC_MESSAGES/django.mo
	conf/locale/gl/LC_MESSAGES/django.po
	conf/locale/gl/LC_MESSAGES/djangojs.mo
	conf/locale/gl/LC_MESSAGES/djangojs.po
	conf/locale/gu/LC_MESSAGES/django.mo
	conf/locale/gu/LC_MESSAGES/django.po
	conf/locale/gu/LC_MESSAGES/djangojs.mo
	conf/locale/gu/LC_MESSAGES/djangojs.po
	conf/locale/he/LC_MESSAGES/django.mo
	conf/locale/he/LC_MESSAGES/django.po
	conf/locale/he/LC_MESSAGES/djangojs.mo
	conf/locale/he/LC_MESSAGES/djangojs.po
	conf/locale/hi/LC_MESSAGES/django.mo
	conf/locale/hi/LC_MESSAGES/django.po
	conf/locale/hi/LC_MESSAGES/djangojs.mo
	conf/locale/hi/LC_MESSAGES/djangojs.po
	conf/locale/hr/LC_MESSAGES/django.mo
	conf/locale/hr/LC_MESSAGES/django.po
	conf/locale/hr/LC_MESSAGES/djangojs.mo
	conf/locale/hr/LC_MESSAGES/djangojs.po
	conf/locale/hu/LC_MESSAGES/django.mo
	conf/locale/hu/LC_MESSAGES/django.po
	conf/locale/hu/LC_MESSAGES/djangojs.mo
	conf/locale/hu/LC_MESSAGES/djangojs.po
	conf/locale/hy_AM/LC_MESSAGES/django.mo
	conf/locale/hy_AM/LC_MESSAGES/django.po
	conf/locale/hy_AM/LC_MESSAGES/djangojs.mo
	conf/locale/hy_AM/LC_MESSAGES/djangojs.po
	conf/locale/id/LC_MESSAGES/django.mo
	conf/locale/id/LC_MESSAGES/django.po
	conf/locale/id/LC_MESSAGES/djangojs.mo
	conf/locale/id/LC_MESSAGES/djangojs.po
	conf/locale/it_IT/LC_MESSAGES/django.mo
	conf/locale/it_IT/LC_MESSAGES/django.po
	conf/locale/it_IT/LC_MESSAGES/djangojs.mo
	conf/locale/it_IT/LC_MESSAGES/djangojs.po
	conf/locale/ja_JP/LC_MESSAGES/django.mo
	conf/locale/ja_JP/LC_MESSAGES/django.po
	conf/locale/ja_JP/LC_MESSAGES/djangojs.mo
	conf/locale/ja_JP/LC_MESSAGES/djangojs.po
	conf/locale/kk_KZ/LC_MESSAGES/django.mo
	conf/locale/kk_KZ/LC_MESSAGES/django.po
	conf/locale/kk_KZ/LC_MESSAGES/djangojs.mo
	conf/locale/kk_KZ/LC_MESSAGES/djangojs.po
	conf/locale/km_KH/LC_MESSAGES/django.mo
	conf/locale/km_KH/LC_MESSAGES/django.po
	conf/locale/km_KH/LC_MESSAGES/djangojs.mo
	conf/locale/km_KH/LC_MESSAGES/djangojs.po
	conf/locale/kn/LC_MESSAGES/django.mo
	conf/locale/kn/LC_MESSAGES/django.po
	conf/locale/kn/LC_MESSAGES/djangojs.mo
	conf/locale/kn/LC_MESSAGES/djangojs.po
	conf/locale/ko_KR/LC_MESSAGES/django.mo
	conf/locale/ko_KR/LC_MESSAGES/django.po
	conf/locale/ko_KR/LC_MESSAGES/djangojs.mo
	conf/locale/ko_KR/LC_MESSAGES/djangojs.po
	conf/locale/lt_LT/LC_MESSAGES/django.mo
	conf/locale/lt_LT/LC_MESSAGES/django.po
	conf/locale/lt_LT/LC_MESSAGES/djangojs.mo
	conf/locale/lt_LT/LC_MESSAGES/djangojs.po
	conf/locale/ml/LC_MESSAGES/django.mo
	conf/locale/ml/LC_MESSAGES/django.po
	conf/locale/ml/LC_MESSAGES/djangojs.mo
	conf/locale/ml/LC_MESSAGES/djangojs.po
	conf/locale/mn/LC_MESSAGES/django.mo
	conf/locale/mn/LC_MESSAGES/django.po
	conf/locale/mn/LC_MESSAGES/djangojs.mo
	conf/locale/mn/LC_MESSAGES/djangojs.po
	conf/locale/mr/LC_MESSAGES/django.mo
	conf/locale/mr/LC_MESSAGES/django.po
	conf/locale/mr/LC_MESSAGES/djangojs.mo
	conf/locale/mr/LC_MESSAGES/djangojs.po
	conf/locale/ms/LC_MESSAGES/django.mo
	conf/locale/ms/LC_MESSAGES/django.po
	conf/locale/ms/LC_MESSAGES/djangojs.mo
	conf/locale/ms/LC_MESSAGES/djangojs.po
	conf/locale/nb/LC_MESSAGES/django.mo
	conf/locale/nb/LC_MESSAGES/django.po
	conf/locale/nb/LC_MESSAGES/djangojs.mo
	conf/locale/nb/LC_MESSAGES/djangojs.po
	conf/locale/ne/LC_MESSAGES/django.mo
	conf/locale/ne/LC_MESSAGES/django.po
	conf/locale/ne/LC_MESSAGES/djangojs.mo
	conf/locale/ne/LC_MESSAGES/djangojs.po
	conf/locale/nl_NL/LC_MESSAGES/django.mo
	conf/locale/nl_NL/LC_MESSAGES/django.po
	conf/locale/nl_NL/LC_MESSAGES/djangojs.mo
	conf/locale/nl_NL/LC_MESSAGES/djangojs.po
	conf/locale/or/LC_MESSAGES/django.mo
	conf/locale/or/LC_MESSAGES/django.po
	conf/locale/or/LC_MESSAGES/djangojs.mo
	conf/locale/or/LC_MESSAGES/djangojs.po
	conf/locale/pl/LC_MESSAGES/django.mo
	conf/locale/pl/LC_MESSAGES/django.po
	conf/locale/pl/LC_MESSAGES/djangojs.mo
	conf/locale/pl/LC_MESSAGES/djangojs.po
	conf/locale/pt_BR/LC_MESSAGES/django.mo
	conf/locale/pt_BR/LC_MESSAGES/django.po
	conf/locale/pt_BR/LC_MESSAGES/djangojs.mo
	conf/locale/pt_BR/LC_MESSAGES/djangojs.po
	conf/locale/pt_PT/LC_MESSAGES/django.mo
	conf/locale/pt_PT/LC_MESSAGES/django.po
	conf/locale/pt_PT/LC_MESSAGES/djangojs.mo
	conf/locale/pt_PT/LC_MESSAGES/djangojs.po
	conf/locale/ro/LC_MESSAGES/django.mo
	conf/locale/ro/LC_MESSAGES/django.po
	conf/locale/ro/LC_MESSAGES/djangojs.mo
	conf/locale/ro/LC_MESSAGES/djangojs.po
	conf/locale/ru/LC_MESSAGES/django.mo
	conf/locale/ru/LC_MESSAGES/django.po
	conf/locale/ru/LC_MESSAGES/djangojs.mo
	conf/locale/ru/LC_MESSAGES/djangojs.po
	conf/locale/si/LC_MESSAGES/django.mo
	conf/locale/si/LC_MESSAGES/django.po
	conf/locale/si/LC_MESSAGES/djangojs.mo
	conf/locale/si/LC_MESSAGES/djangojs.po
	conf/locale/sk/LC_MESSAGES/django.mo
	conf/locale/sk/LC_MESSAGES/django.po
	conf/locale/sk/LC_MESSAGES/djangojs.mo
	conf/locale/sk/LC_MESSAGES/djangojs.po
	conf/locale/sl/LC_MESSAGES/django.mo
	conf/locale/sl/LC_MESSAGES/django.po
	conf/locale/sl/LC_MESSAGES/djangojs.mo
	conf/locale/sl/LC_MESSAGES/djangojs.po
	conf/locale/sq/LC_MESSAGES/django.mo
	conf/locale/sq/LC_MESSAGES/django.po
	conf/locale/sq/LC_MESSAGES/djangojs.mo
	conf/locale/sq/LC_MESSAGES/djangojs.po
	conf/locale/sr/LC_MESSAGES/django.mo
	conf/locale/sr/LC_MESSAGES/django.po
	conf/locale/sr/LC_MESSAGES/djangojs.mo
	conf/locale/sr/LC_MESSAGES/djangojs.po
	conf/locale/ta/LC_MESSAGES/django.mo
	conf/locale/ta/LC_MESSAGES/django.po
	conf/locale/ta/LC_MESSAGES/djangojs.mo
	conf/locale/ta/LC_MESSAGES/djangojs.po
	conf/locale/te/LC_MESSAGES/django.mo
	conf/locale/te/LC_MESSAGES/django.po
	conf/locale/te/LC_MESSAGES/djangojs.mo
	conf/locale/te/LC_MESSAGES/djangojs.po
	conf/locale/th/LC_MESSAGES/django.mo
	conf/locale/th/LC_MESSAGES/django.po
	conf/locale/th/LC_MESSAGES/djangojs.mo
	conf/locale/th/LC_MESSAGES/djangojs.po
	conf/locale/tr_TR/LC_MESSAGES/django.mo
	conf/locale/tr_TR/LC_MESSAGES/django.po
	conf/locale/tr_TR/LC_MESSAGES/djangojs.mo
	conf/locale/tr_TR/LC_MESSAGES/djangojs.po
	conf/locale/uk/LC_MESSAGES/django.mo
	conf/locale/uk/LC_MESSAGES/django.po
	conf/locale/uk/LC_MESSAGES/djangojs.mo
	conf/locale/uk/LC_MESSAGES/djangojs.po
	conf/locale/ur/LC_MESSAGES/django.mo
	conf/locale/ur/LC_MESSAGES/django.po
	conf/locale/ur/LC_MESSAGES/djangojs.mo
	conf/locale/ur/LC_MESSAGES/djangojs.po
	conf/locale/uz/LC_MESSAGES/django.mo
	conf/locale/uz/LC_MESSAGES/django.po
	conf/locale/uz/LC_MESSAGES/djangojs.mo
	conf/locale/uz/LC_MESSAGES/djangojs.po
	conf/locale/vi/LC_MESSAGES/django.mo
	conf/locale/vi/LC_MESSAGES/django.po
	conf/locale/vi/LC_MESSAGES/djangojs.mo
	conf/locale/vi/LC_MESSAGES/djangojs.po
	conf/locale/zh_CN/LC_MESSAGES/django.mo
	conf/locale/zh_CN/LC_MESSAGES/django.po
	conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
	conf/locale/zh_CN/LC_MESSAGES/djangojs.po
	conf/locale/zh_HK/LC_MESSAGES/django.mo
	conf/locale/zh_HK/LC_MESSAGES/django.po
	conf/locale/zh_HK/LC_MESSAGES/djangojs.mo
	conf/locale/zh_HK/LC_MESSAGES/djangojs.po
	conf/locale/zh_TW/LC_MESSAGES/django.mo
	conf/locale/zh_TW/LC_MESSAGES/django.po
	conf/locale/zh_TW/LC_MESSAGES/djangojs.mo
	conf/locale/zh_TW/LC_MESSAGES/djangojs.po
	requirements/edx/base.txt
	requirements/edx/github.txt