more spelling fixes

qgis · Jan 24, 2016 · ae52aab · ae52aab
1 parent 265f53c
commit ae52aab
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 21 deletions.
diff --git a/python/analysis/interpolation/DualEdgeTriangulation.sip b/python/analysis/interpolation/DualEdgeTriangulation.sip
@@ -79,7 +79,7 @@ class DualEdgeTriangulation: Triangulation
     //const static int nBaseOfRuns;
     /** Returns the number of an edge which points to the point with number 'point' or -1 if there is an error*/
     int baseEdgeOfPoint( int point );
-    /** Returns the number of a HalfEdge from a triangle in which 'point' is in. If the number -10 is returned, this means, that 'point' is outside the convex hull. If -5 is returned, then numerical problems with the leftOfTest occured (and the value of the possible edge is stored in the variable 'mUnstableEdge'. -20 means, that the inserted point is exactly on an edge (the number is stored in the variable 'mEdgeWithPoint'). -25 means, that the point is already in the triangulation (the number of the point is stored in the member 'mTwiceInsPoint'. If -100 is returned, this means that something else went wrong*/
+    /** Returns the number of a HalfEdge from a triangle in which 'point' is in. If the number -10 is returned, this means, that 'point' is outside the convex hull. If -5 is returned, then numerical problems with the leftOfTest occurred (and the value of the possible edge is stored in the variable 'mUnstableEdge'. -20 means, that the inserted point is exactly on an edge (the number is stored in the variable 'mEdgeWithPoint'). -25 means, that the point is already in the triangulation (the number of the point is stored in the member 'mTwiceInsPoint'. If -100 is returned, this means that something else went wrong*/
     int baseEdgeOfTriangle( Point3D* point );
     /** Checks, if 'edge' has to be swapped because of the empty circle criterion. If so, doSwap(...) is called.*/
     bool checkSwap( unsigned int edge, unsigned int recursiveDeep );

diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
@@ -210,6 +210,6 @@ class QgsCoordinateTransform : QObject
     bool writeXML( QDomNode & theNode, QDomDocument & theDoc );
 
   signals:
-    /** Signal when an invalid pj_transform() has occured */
+    /** Signal when an invalid pj_transform() has occurred */
     void  invalidTransformInput() const;
 };
diff --git a/python/core/qgssnapper.sip b/python/core/qgssnapper.sip
@@ -23,7 +23,7 @@ struct QgsSnappingResult
   int afterVertexNr;
   /** Index of the snapped geometry*/
   qint64 snappedAtGeometry;
-  /** Layer where the snap occured*/
+  /** Layer where the snap occurred*/
   const QgsVectorLayer* layer;
 };
 

diff --git a/python/gui/qgsmapmouseevent.sip b/python/gui/qgsmapmouseevent.sip
@@ -44,7 +44,7 @@ class QgsMapMouseEvent : QMouseEvent
     /**
      * Creates a new QgsMapMouseEvent. Should only be required to be called from the QgsMapCanvas.
      *
-     * @param mapCanvas The map canvas on which the event occured
+     * @param mapCanvas The map canvas on which the event occurred
      * @param event     The original mouse event
      */
     QgsMapMouseEvent( QgsMapCanvas* mapCanvas, QMouseEvent* event );

diff --git a/python/plugins/db_manager/ui/DlgDbError.ui b/python/plugins/db_manager/ui/DlgDbError.ui
@@ -27,7 +27,7 @@
        <item>
         <widget class="QLabel" name="label_3">
          <property name="text">
-          <string>An error occured:</string>
+          <string>An error occurred:</string>
          </property>
         </widget>
        </item>
@@ -51,7 +51,7 @@
        <item>
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>An error occured when executing a query:</string>
+          <string>An error occurred when executing a query:</string>
          </property>
         </widget>
        </item>

diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py
@@ -148,7 +148,7 @@ def processAlgorithm(self, progress):
 
         if not calculationSuccess:
             raise GeoAlgorithmExecutionException(
-                self.tr('An error occured while evaluating the calculation '
+                self.tr('An error occurred while evaluating the calculation '
                         'string:\n%s' % error))
 
     def checkParameterValuesBeforeExecuting(self):

diff --git a/python/plugins/processing/algs/qgis/SplitLinesWithLines.py b/python/plugins/processing/algs/qgis/SplitLinesWithLines.py
@@ -109,7 +109,7 @@ def processAlgorithm(self, progress):
 
                                 # splitGeometry: If there are several intersections
                                 # between geometry and splitLine, only the first one is considered.
-                                if result == 0:  # split occured
+                                if result == 0:  # split occurred
 
                                     if inPoints == vector.extractPoints(inGeom):
                                         # bug in splitGeometry: sometimes it returns 0 but

diff --git a/python/utils.py b/python/utils.py
@@ -65,7 +65,7 @@ def showWarning(message, category, filename, lineno, file=None, line=None):
 
 def showException(type, value, tb, msg, messagebar=False):
     if msg is None:
-        msg = QCoreApplication.translate('Python', 'An error has occured while executing Python code:')
+        msg = QCoreApplication.translate('Python', 'An error has occurred while executing Python code:')
 
     logmessage = ''
     for s in traceback.format_exception(type, value, tb):
@@ -117,7 +117,7 @@ def open_stack_dialog(type, value, tb, msg, pop_error=True):
         iface.messageBar().popWidget()
 
     if msg is None:
-        msg = QCoreApplication.translate('Python', 'An error has occured while executing Python code:')
+        msg = QCoreApplication.translate('Python', 'An error has occurred while executing Python code:')
 
     # TODO Move this to a template HTML file
     txt = u'''<font color="red"><b>{msg}</b></font>

diff --git a/scripts/fix_allows_to.sh b/scripts/fix_allows_to.sh
@@ -61,7 +61,7 @@ simplify:simplifying
 speed-up:speeding up
 split:splitting
 store:storing
-surpress:surpressing
+suppress:suppressing
 use:using
 write:writing
 you to show:showing

diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -480,3 +480,7 @@ symetrical:symmetrical
 occurence:occurrence
 occured:occurred
 occuring:occurring
+occurence:occurrence
+overide:override
+supress:suppress
+surpress:suppress
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -947,9 +947,9 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     //! Print the current map view frame
     void newPrintComposer();
     void showComposerManager();
-    //! Add all loaded layers into the overview - overides qgisappbase method
+    //! Add all loaded layers into the overview - overrides qgisappbase method
     void addAllToOverview();
-    //! Remove all loaded layers from the overview - overides qgisappbase method
+    //! Remove all loaded layers from the overview - overrides qgisappbase method
     void removeAllFromOverview();
     //reimplements method from base (gui) class
     void hideAllLayers();

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2156,7 +2156,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )
 {
   bool deleted = false;
 
-  // Remove multiple occurences of same attribute
+  // Remove multiple occurrences of same attribute
   attrs = attrs.toSet().toList();
 
   qSort( attrs.begin(), attrs.end(), qGreater<int>() );

diff --git a/src/core/raster/qgscontrastenhancement.cpp b/src/core/raster/qgscontrastenhancement.cpp
@@ -239,7 +239,7 @@ bool QgsContrastEnhancement::isValueInDisplayableRange( double theValue )
     Set the contrast enhancement algorithm. The second parameter is optional and is for performace improvements. If you know you are immediately going to set the Minimum or Maximum value, you can elect to not generate the lookup tale. By default it will be generated.
 
     @param theAlgorithm The new contrast enhancement algorithm
-    @param generateTable Flag to overide automatic look up table generation
+    @param generateTable Flag to override automatic look up table generation
 */
 void QgsContrastEnhancement::setContrastEnhancementAlgorithm( ContrastEnhancementAlgorithm theAlgorithm, bool generateTable )
 {
@@ -297,7 +297,7 @@ void QgsContrastEnhancement::setContrastEnhancementFunction( QgsContrastEnhancem
     Set the maximum value for the contrast enhancement. The second parameter is option an is for performace improvements. If you know you are immediately going to set the Minimum value or the contrast enhancement algorithm, you can elect to not generate the lookup tale. By default it will be generated.
 
     @param theValue The new maximum value for the band
-    @param generateTable Flag to overide automatic look up table generation
+    @param generateTable Flag to override automatic look up table generation
 */
 void QgsContrastEnhancement::setMaximumValue( double theValue, bool generateTable )
 {
@@ -329,7 +329,7 @@ void QgsContrastEnhancement::setMaximumValue( double theValue, bool generateTabl
     Set the maximum value for the contrast enhancement. The second parameter is option an is for performace improvements. If you know you are immediately going to set the Maximum value or the contrast enhancement algorithm, you can elect to not generate the lookup tale. By default it will be generated.
 
     @param theValue The new minimum value for the band
-    @param generateTable Flag to overide automatic look up table generation
+    @param generateTable Flag to override automatic look up table generation
 */
 void QgsContrastEnhancement::setMinimumValue( double theValue, bool generateTable )
 {

diff --git a/src/gui/qgscolorswatchgrid.h b/src/gui/qgscolorswatchgrid.h
@@ -229,7 +229,7 @@ class GUI_EXPORT QgsColorSwatchGridAction: public QWidgetAction
     QMenu* mMenu;
     QgsColorSwatchGrid* mColorSwatchGrid;
 
-    //used to supress recursion with hover events
+    //used to suppress recursion with hover events
     bool mSuppressRecurse;
     bool mDismissOnColorSelection;
 

diff --git a/src/gui/qgscolorwidgets.h b/src/gui/qgscolorwidgets.h
@@ -235,7 +235,7 @@ class GUI_EXPORT QgsColorWidgetAction: public QWidgetAction
     QMenu* mMenu;
     QgsColorWidget* mColorWidget;
 
-    //used to supress recursion with hover events
+    //used to suppress recursion with hover events
     bool mSuppressRecurse;
 
     bool mDismissOnColorSelection;

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -4620,7 +4620,7 @@
                   <item row="1" column="0" colspan="2">
                    <widget class="QLabel" name="label_7">
                     <property name="text">
-                     <string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing overide on local requires an application restart</string>
+                     <string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing override on local requires an application restart</string>
                     </property>
                     <property name="wordWrap">
                      <bool>true</bool>

diff --git a/src/ui/qgsvectorlayersaveasdialogbase.ui b/src/ui/qgsvectorlayersaveasdialogbase.ui
@@ -122,7 +122,7 @@
        <item>
         <widget class="QCheckBox" name="mSkipAttributeCreation">
          <property name="toolTip">
-          <string>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don't support it.</string>
+          <string>This allows one to suppress attribute creation as some OGR drivers (eg. DGN, DXF) don't support it.</string>
          </property>
          <property name="text">
           <string>Skip attribute creation</string>