      def formfield(self, **kwargs):
          return None
  
  class BooleanField(Field):
      """Boolean (Either True or False)"""
  
      empty_strings_allowed = False
  
      def __init__(self, *args, **kwargs):
          kwargs['blank'] = True
          if 'default' not in kwargs and not kwargs.get('null'):
 
</s> remove 
 </s> add     description = ugettext_lazy("Boolean (Either True or False)") </s> remove 
 </s> add     description = ugettext_lazy("Boolean (Either True, False or None)") </s> remove     """Boolean (Either True, False or None)"""

 </s> add  </s> remove     """String (up to %(max_length)s)"""

 </s> add     description = ugettext_lazy("String (up to %(max_length)s)") </s> remove     """Integer"""
    
 </s> add     description = ugettext_lazy("Integer")
      def formfield(self, **kwargs):
          return None
  
  class BooleanField(Field):


      empty_strings_allowed = False
  
      def __init__(self, *args, **kwargs):
          kwargs['blank'] = True
          if 'default' not in kwargs and not kwargs.get('null'):
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