          defaults.update(kwargs)
          return super(IntegerField, self).formfield(**defaults)
  
  class IPAddressField(Field):
      """IP address"""
      
      empty_strings_allowed = False
  
      def __init__(self, *args, **kwargs):
          kwargs['max_length'] = 15
          Field.__init__(self, *args, **kwargs)
 
</s> remove 
 </s> add     description = ugettext_lazy("IP address") </s> remove     """E-mail address"""
    
 </s> add     description = ugettext_lazy("E-mail address") </s> remove     """Boolean (Either True, False or None)"""

 </s> add  </s> remove 
 </s> add     description = ugettext_lazy("Boolean (Either True, False or None)") </s> remove 
 </s> add     description = ugettext_lazy("Boolean (Either True or False)")
          defaults.update(kwargs)
          return super(IntegerField, self).formfield(**defaults)
  
  class IPAddressField(Field):


      empty_strings_allowed = False
  
      def __init__(self, *args, **kwargs):
          kwargs['max_length'] = 15
          Field.__init__(self, *args, **kwargs)
keep keep keep keep replace replace keep keep keep keep keep
 Fixed #12385: Made built-in field type descriptions in admindocs translatable again.  Many thanks to Ramiro for the problem report and patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11878 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/db/models/fields/__init__.py