      description = _("Multi-line string")
  
  class MultiPolygonField(GeometryField):
      geom_type = 'MULTIPOLYGON'
  
  class GeometryCollectionField(GeometryField):
      geom_type = 'GEOMETRYCOLLECTION'
      description = _("Geometry collection")
 
</s> remove     """Multi polygon"""
 </s> add  </s> remove     """Geometry collection"""
 </s> add 
    description = _("Multi polygon")
      description = _("Multi-line string")
  
  class MultiPolygonField(GeometryField):
      geom_type = 'MULTIPOLYGON'
    description = _("Multi polygon")
  
  class GeometryCollectionField(GeometryField):
      geom_type = 'GEOMETRYCOLLECTION'
      description = _("Geometry collection")
keep keep keep add 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/contrib/gis/db/models/fields/__init__.py