          defaults.update(kwargs)
          return super(PositiveSmallIntegerField, self).formfield(**defaults)
  
  class SlugField(CharField):
      """String (up to %(max_length)s)"""
  
      def __init__(self, *args, **kwargs):
          kwargs['max_length'] = kwargs.get('max_length', 50)
          # Set db_index=True unless it's been set manually.
          if 'db_index' not in kwargs:
              kwargs['db_index'] = True
 
</s> remove     """String (up to %(max_length)s)"""
    
 </s> add     description = ugettext_lazy("String (up to %(max_length)s)") </s> remove     """Boolean (Either True or False)"""

 </s> add  </s> remove 
 </s> add     description = ugettext_lazy("Boolean (Either True or False)") </s> remove     """E-mail address"""
    
 </s> add     description = ugettext_lazy("E-mail address") </s> remove     """IP address"""
    
 </s> add 
    description = ugettext_lazy("String (up to %(max_length)s)")
          defaults.update(kwargs)
          return super(PositiveSmallIntegerField, self).formfield(**defaults)
  
  class SlugField(CharField):
    description = ugettext_lazy("String (up to %(max_length)s)")
    description = ugettext_lazy("String (up to %(max_length)s)")
      def __init__(self, *args, **kwargs):
          kwargs['max_length'] = kwargs.get('max_length', 50)
          # Set db_index=True unless it's been set manually.
          if 'db_index' not in kwargs:
              kwargs['db_index'] = True
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