      """Multi-line string"""
      geom_type = 'MULTILINESTRING'
  
  class MultiPolygonField(GeometryField):
      """Multi polygon"""
      geom_type = 'MULTIPOLYGON'
  
  class GeometryCollectionField(GeometryField):
      """Geometry collection"""
      geom_type = 'GEOMETRYCOLLECTION'
 
</s> remove     """Geometry collection"""
 </s> add  </s> remove     """Multi-line string"""
 </s> add  </s> remove     """Multi-point"""
 </s> add 
      """Multi-line string"""
      geom_type = 'MULTILINESTRING'
  
  class MultiPolygonField(GeometryField):

      geom_type = 'MULTIPOLYGON'
  
  class GeometryCollectionField(GeometryField):
      """Geometry collection"""
      geom_type = 'GEOMETRYCOLLECTION'
keep keep keep keep 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/contrib/gis/db/models/fields/__init__.py