merge from trunk r10800:10850

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11128 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: wonder

i18n/qgis_ar.ts

@@ -272,16 +272,16 @@ not disjoint with existing polygons of the feature*/
         if wkbType is WKBPolygon, otherwise an empty list */
     QgsPolygon asPolygon();
 
-    /** return contents of the geometry as a polygon
-        if wkbType is WKBPolygon, otherwise an empty list */
+    /** return contents of the geometry as a multi point
+        if wkbType is WKBMultiPint, otherwise an empty list */
     QgsMultiPoint asMultiPoint();
 
-    /** return contents of the geometry as a polygon
-        if wkbType is WKBPolygon, otherwise an empty list */
+    /** return contents of the geometry as a multi linestring
+        if wkbType is WKBMultiLineString, otherwise an empty list */
     QgsMultiPolyline asMultiPolyline();
 
-    /** return contents of the geometry as a polygon
-        if wkbType is WKBPolygon, otherwise an empty list */
+    /** return contents of the geometry as a multi polygon
+        if wkbType is WKBMultiPolygon, otherwise an empty list */
     QgsMultiPolygon asMultiPolygon();
 
     /** return contents of the geometry as a list of geometries

i18n/qgis_cs_CZ.ts

@@ -381,6 +381,26 @@ public:
   /**access range */
   RangeData &range(int idx);
 
+    /**Adds a new overlay to this class. QgsVectorLayer takes ownership of the object
+    @note this method was added in version 1.1
+    */
+    void addOverlay( QgsVectorOverlay* overlay /Transfer/);
+
+    /**Removes all overlays of a given type
+    @note this method was added in version 1.1
+    */
+    void removeOverlay( const QString& typeName );
+
+    /**Returns pointers to the overlays of this layer
+    @note this method was added in version 1.1
+    */
+    void vectorOverlays( QList<QgsVectorOverlay*>& overlayList /Out/);
+
+    /**Returns the (first) overlay of a type, e.g. diagram or label
+    @note this method was added in version 1.1
+    */
+    QgsVectorOverlay* findOverlayByType( const QString& typeName );
+
 public slots:
 
   /** Select feature by its ID, optionally emit signal selectionChanged() */

i18n/qgis_de.ts

@@ -574,7 +574,7 @@ def extractAsSimple( self, geom, tolerance ):
       if geom.isMultipart():
         multi_geom = geom.asMultiPolyline() 
         for i in multi_geom:
-          simple = self.simlifyLine( i, 1, tolerance )
+          simple = self.simplifyLine( i, 1, tolerance )
           if simple is None:
             return None
           else: