Replace flavour by flavor

qgis · Dec 29, 2016 · ee1abdc · ee1abdc
1 parent 8dca115
commit ee1abdc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip
@@ -129,9 +129,9 @@
  * Caveats
  * =======
  *
- * There are two different flavours of WKT: one is defined by OGC, the other is the standard
+ * There are two different flavors of WKT: one is defined by OGC, the other is the standard
  * used by ESRI. They look very similar, but they are not the same. QGIS is able to consume
- * both flavours.
+ * both flavors.
  *
  * \see QgsCoordinateTransform
  */

diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -196,6 +196,8 @@ familar:familiar
 fatser:faster
 fetaures:features
 feture:feature
+flavour:flavor
+flavours:flavors
 forse:force
 fortan:fortran
 forwardig:forwarding

diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -176,9 +176,9 @@ typedef void ( *CUSTOM_CRS_VALIDATION )( QgsCoordinateReferenceSystem& );
  * Caveats
  * =======
  *
- * There are two different flavours of WKT: one is defined by OGC, the other is the standard
+ * There are two different flavors of WKT: one is defined by OGC, the other is the standard
  * used by ESRI. They look very similar, but they are not the same. QGIS is able to consume
- * both flavours.
+ * both flavors.
  *
  * \see QgsCoordinateTransform
  */

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1621,14 +1621,14 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
                        ) );
 
   layerOptions.insert( QStringLiteral( "SPATIAL_INDEX" ), new BoolOption(
-                         QObject::tr( "If the database is of the SpatiaLite flavour, and if OGR is linked "
+                         QObject::tr( "If the database is of the SpatiaLite flavor, and if OGR is linked "
                                       "against libspatialite, this option can be used to control if a spatial "
                                       "index must be created." ),
                          true  // Default value
                        ) );
 
   layerOptions.insert( QStringLiteral( "COMPRESS_GEOM" ), new BoolOption(
-                         QObject::tr( "If the format of the geometry BLOB is of the SpatiaLite flavour, "
+                         QObject::tr( "If the format of the geometry BLOB is of the SpatiaLite flavor, "
                                       "this option can be used to control if the compressed format for "
                                       "geometries (LINESTRINGs, POLYGONs) must be used" ),
                          false  // Default value