add a bunch of missing i18n markup tags
add german django.po
fix typo
more i18n fixes (thanks to Pter)
update translation, thanks to Christopher
Merge branch 'master' into bugfix/i18n

Conflicts:
	fwadmin/locale/de/LC_MESSAGES/django.po
more i18n translation fixes
add i18n to the fwadmin/model.py to get a fully i18n form
add another missing blocktrans
fix pep8 error and add verbose_name to models.GenericIPAddressField
more translations
fix incorrect var in translation
add redirect
update README
stock port -> Standard Port (thanks to alitt)
add two more i18n strings
Merge branch 'bugfix/i18n'
Merge branch 'master' into feature/ansible

Conflicts:
	django_project/settings.py