fix typo and merge translations to django.po/mo files