Skip to content

Commit ae52aab

Browse files
committed
more spelling fixes
1 parent 265f53c commit ae52aab

17 files changed

+25
-21
lines changed

python/analysis/interpolation/DualEdgeTriangulation.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class DualEdgeTriangulation: Triangulation
7979
//const static int nBaseOfRuns;
8080
/** Returns the number of an edge which points to the point with number 'point' or -1 if there is an error*/
8181
int baseEdgeOfPoint( int point );
82-
/** 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*/
82+
/** 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*/
8383
int baseEdgeOfTriangle( Point3D* point );
8484
/** Checks, if 'edge' has to be swapped because of the empty circle criterion. If so, doSwap(...) is called.*/
8585
bool checkSwap( unsigned int edge, unsigned int recursiveDeep );

python/core/qgscoordinatetransform.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,6 @@ class QgsCoordinateTransform : QObject
210210
bool writeXML( QDomNode & theNode, QDomDocument & theDoc );
211211

212212
signals:
213-
/** Signal when an invalid pj_transform() has occured */
213+
/** Signal when an invalid pj_transform() has occurred */
214214
void invalidTransformInput() const;
215215
};

python/core/qgssnapper.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct QgsSnappingResult
2323
int afterVertexNr;
2424
/** Index of the snapped geometry*/
2525
qint64 snappedAtGeometry;
26-
/** Layer where the snap occured*/
26+
/** Layer where the snap occurred*/
2727
const QgsVectorLayer* layer;
2828
};
2929

python/gui/qgsmapmouseevent.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class QgsMapMouseEvent : QMouseEvent
4444
/**
4545
* Creates a new QgsMapMouseEvent. Should only be required to be called from the QgsMapCanvas.
4646
*
47-
* @param mapCanvas The map canvas on which the event occured
47+
* @param mapCanvas The map canvas on which the event occurred
4848
* @param event The original mouse event
4949
*/
5050
QgsMapMouseEvent( QgsMapCanvas* mapCanvas, QMouseEvent* event );

python/plugins/db_manager/ui/DlgDbError.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<item>
2828
<widget class="QLabel" name="label_3">
2929
<property name="text">
30-
<string>An error occured:</string>
30+
<string>An error occurred:</string>
3131
</property>
3232
</widget>
3333
</item>
@@ -51,7 +51,7 @@
5151
<item>
5252
<widget class="QLabel" name="label">
5353
<property name="text">
54-
<string>An error occured when executing a query:</string>
54+
<string>An error occurred when executing a query:</string>
5555
</property>
5656
</widget>
5757
</item>

python/plugins/processing/algs/qgis/FieldsCalculator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def processAlgorithm(self, progress):
148148

149149
if not calculationSuccess:
150150
raise GeoAlgorithmExecutionException(
151-
self.tr('An error occured while evaluating the calculation '
151+
self.tr('An error occurred while evaluating the calculation '
152152
'string:\n%s' % error))
153153

154154
def checkParameterValuesBeforeExecuting(self):

python/plugins/processing/algs/qgis/SplitLinesWithLines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def processAlgorithm(self, progress):
109109

110110
# splitGeometry: If there are several intersections
111111
# between geometry and splitLine, only the first one is considered.
112-
if result == 0: # split occured
112+
if result == 0: # split occurred
113113

114114
if inPoints == vector.extractPoints(inGeom):
115115
# bug in splitGeometry: sometimes it returns 0 but

python/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def showWarning(message, category, filename, lineno, file=None, line=None):
6565

6666
def showException(type, value, tb, msg, messagebar=False):
6767
if msg is None:
68-
msg = QCoreApplication.translate('Python', 'An error has occured while executing Python code:')
68+
msg = QCoreApplication.translate('Python', 'An error has occurred while executing Python code:')
6969

7070
logmessage = ''
7171
for s in traceback.format_exception(type, value, tb):
@@ -117,7 +117,7 @@ def open_stack_dialog(type, value, tb, msg, pop_error=True):
117117
iface.messageBar().popWidget()
118118

119119
if msg is None:
120-
msg = QCoreApplication.translate('Python', 'An error has occured while executing Python code:')
120+
msg = QCoreApplication.translate('Python', 'An error has occurred while executing Python code:')
121121

122122
# TODO Move this to a template HTML file
123123
txt = u'''<font color="red"><b>{msg}</b></font>

scripts/fix_allows_to.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ simplify:simplifying
6161
speed-up:speeding up
6262
split:splitting
6363
store:storing
64-
surpress:surpressing
64+
suppress:suppressing
6565
use:using
6666
write:writing
6767
you to show:showing

scripts/spelling.dat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,3 +480,7 @@ symetrical:symmetrical
480480
occurence:occurrence
481481
occured:occurred
482482
occuring:occurring
483+
occurence:occurrence
484+
overide:override
485+
supress:suppress
486+
surpress:suppress

src/app/qgisapp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,9 +947,9 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
947947
//! Print the current map view frame
948948
void newPrintComposer();
949949
void showComposerManager();
950-
//! Add all loaded layers into the overview - overides qgisappbase method
950+
//! Add all loaded layers into the overview - overrides qgisappbase method
951951
void addAllToOverview();
952-
//! Remove all loaded layers from the overview - overides qgisappbase method
952+
//! Remove all loaded layers from the overview - overrides qgisappbase method
953953
void removeAllFromOverview();
954954
//reimplements method from base (gui) class
955955
void hideAllLayers();

src/core/qgsvectorlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2156,7 +2156,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )
21562156
{
21572157
bool deleted = false;
21582158

2159-
// Remove multiple occurences of same attribute
2159+
// Remove multiple occurrences of same attribute
21602160
attrs = attrs.toSet().toList();
21612161

21622162
qSort( attrs.begin(), attrs.end(), qGreater<int>() );

src/core/raster/qgscontrastenhancement.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ bool QgsContrastEnhancement::isValueInDisplayableRange( double theValue )
239239
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.
240240
241241
@param theAlgorithm The new contrast enhancement algorithm
242-
@param generateTable Flag to overide automatic look up table generation
242+
@param generateTable Flag to override automatic look up table generation
243243
*/
244244
void QgsContrastEnhancement::setContrastEnhancementAlgorithm( ContrastEnhancementAlgorithm theAlgorithm, bool generateTable )
245245
{
@@ -297,7 +297,7 @@ void QgsContrastEnhancement::setContrastEnhancementFunction( QgsContrastEnhancem
297297
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.
298298
299299
@param theValue The new maximum value for the band
300-
@param generateTable Flag to overide automatic look up table generation
300+
@param generateTable Flag to override automatic look up table generation
301301
*/
302302
void QgsContrastEnhancement::setMaximumValue( double theValue, bool generateTable )
303303
{
@@ -329,7 +329,7 @@ void QgsContrastEnhancement::setMaximumValue( double theValue, bool generateTabl
329329
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.
330330
331331
@param theValue The new minimum value for the band
332-
@param generateTable Flag to overide automatic look up table generation
332+
@param generateTable Flag to override automatic look up table generation
333333
*/
334334
void QgsContrastEnhancement::setMinimumValue( double theValue, bool generateTable )
335335
{

src/gui/qgscolorswatchgrid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class GUI_EXPORT QgsColorSwatchGridAction: public QWidgetAction
229229
QMenu* mMenu;
230230
QgsColorSwatchGrid* mColorSwatchGrid;
231231

232-
//used to supress recursion with hover events
232+
//used to suppress recursion with hover events
233233
bool mSuppressRecurse;
234234
bool mDismissOnColorSelection;
235235

src/gui/qgscolorwidgets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ class GUI_EXPORT QgsColorWidgetAction: public QWidgetAction
235235
QMenu* mMenu;
236236
QgsColorWidget* mColorWidget;
237237

238-
//used to supress recursion with hover events
238+
//used to suppress recursion with hover events
239239
bool mSuppressRecurse;
240240

241241
bool mDismissOnColorSelection;

src/ui/qgsoptionsbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4620,7 +4620,7 @@
46204620
<item row="1" column="0" colspan="2">
46214621
<widget class="QLabel" name="label_7">
46224622
<property name="text">
4623-
<string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing overide on local requires an application restart</string>
4623+
<string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing override on local requires an application restart</string>
46244624
</property>
46254625
<property name="wordWrap">
46264626
<bool>true</bool>

src/ui/qgsvectorlayersaveasdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<item>
123123
<widget class="QCheckBox" name="mSkipAttributeCreation">
124124
<property name="toolTip">
125-
<string>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don't support it.</string>
125+
<string>This allows one to suppress attribute creation as some OGR drivers (eg. DGN, DXF) don't support it.</string>
126126
</property>
127127
<property name="text">
128128
<string>Skip attribute creation</string>

0 commit comments

Comments
 (0)