Merge branch 'weblate'
Merge branch 'weblate'
Merge remote-tracking branch 'origin/weblate'
Fixing translations for egypt
Merge remote branch 'origin/master' into weblate

Conflicts:
	ar_EG/LC_MESSAGES/django.mo
	ar_EG/LC_MESSAGES/django.po