Conflicts:
	locale/cs/LC_MESSAGES/django.po
	locale/es/LC_MESSAGES/django.po
	locale/nl/LC_MESSAGES/django.po
	locale/tr/LC_MESSAGES/django.po