Skip to content

Commit f3c7ab6

Browse files
nyalldawsonnyalldawson
committedFeb 2, 2016
Spelling fixes, updates to chkspelling.sh
·
ltr-3_40archive/master_2
1 parent d1cc6cc commit f3c7ab6

File tree

14 files changed

+44
-37
lines changed

14 files changed

+44
-37
lines changed
 

‎python/core/composer/qgscomposermapgrid.sip

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ class QgsComposerMapGrid : QgsComposerMapItem
142142
enum GridUnit
143143
{
144144
MapUnit, /*!< grid units follow map units */
145-
MM, /*!< grid units in millimetres */
146-
CM /*!< grid units in centimetres */
145+
MM, /*!< grid units in millimeters */
146+
CM /*!< grid units in centimeters */
147147
};
148148

149149
/** Grid drawing style
@@ -297,7 +297,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
297297

298298
/** Calculates the maximum distance the grid extends beyond the QgsComposerMap's
299299
* item rect
300-
* @returns maximum extension in millimetres
300+
* @returns maximum extension in millimeters
301301
*/
302302
double maxExtension();
303303

@@ -416,14 +416,14 @@ class QgsComposerMapGrid : QgsComposerMapItem
416416

417417
/** Sets the length of the cross segments drawn for the grid. This is only used for grids
418418
* with QgsComposerMapGrid::Cross styles
419-
* @param length cross length in millimetres
419+
* @param length cross length in millimeters
420420
* @see crossLength
421421
*/
422422
void setCrossLength( const double length );
423423

424424
/** Retrieves the length of the cross segments drawn for the grid. This is only used for grids
425425
* with QgsComposerMapGrid::Cross styles
426-
* @returns cross length in millimetres
426+
* @returns cross length in millimeters
427427
* @see setCrossLength
428428
*/
429429
double crossLength() const;
@@ -569,13 +569,13 @@ class QgsComposerMapGrid : QgsComposerMapItem
569569
*/
570570
AnnotationPosition annotationPosition( const BorderSide border ) const;
571571

572-
/** Sets the distance between the map frame and annotations. Units are in millimetres.
572+
/** Sets the distance between the map frame and annotations. Units are in millimeters.
573573
* @param distance margin between map frame and annotations
574574
* @see annotationFrameDistance
575575
*/
576576
void setAnnotationFrameDistance( const double distance );
577577

578-
/** Gets the distance between the map frame and annotations. Units are in millimetres.
578+
/** Gets the distance between the map frame and annotations. Units are in millimeters.
579579
* @returns margin between map frame and annotations
580580
* @see setAnnotationFrameDistance
581581
*/
@@ -701,15 +701,15 @@ class QgsComposerMapGrid : QgsComposerMapItem
701701
/** Sets the grid frame width. This property controls how wide the grid frame is.
702702
* The size of the line outlines drawn in the frame is controlled through the
703703
* setFramePenSize method.
704-
* @param width width of grid frame in millimetres
704+
* @param width width of grid frame in millimeters
705705
* @see frameWidth
706706
*/
707707
void setFrameWidth( const double width );
708708

709709
/** Gets the grid frame width. This property controls how wide the grid frame is.
710710
* The size of the line outlines drawn in the frame can be retrieved via the
711711
* framePenSize method.
712-
* @returns width of grid frame in millimetres
712+
* @returns width of grid frame in millimeters
713713
* @see setFrameWidth
714714
*/
715715
double frameWidth() const;

‎python/gui/symbology-ng/qgsstylev2exportimportdialog.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsStyleV2ExportImportDialog : QDialog
4646
*/
4747
void selectGroup( const QString& groupName );
4848
/**
49-
* Unselect the symbols belonging to the given group
49+
* Deselect the symbols belonging to the given group
5050
* @param groupName the name of the group to be deselected
5151
*/
5252
void deselectGroup( const QString& groupName);

‎scripts/chkspelling.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717

1818

1919
RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
20-
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs"
20+
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs"
2121

22-
egrep --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"
22+
egrep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api} --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"

‎scripts/spelling.dat

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,3 +485,11 @@ occurence:occurrence
485485
overide:override
486486
supress:suppress
487487
surpress:suppress
488+
artefact:artifact
489+
artefacts:artifacts
490+
metres:meters
491+
millimetres:millimeters
492+
centimetres:centimers
Code has comments. Press enter to view.
493+
kilometres:kilometers
494+
unselect:deselect
495+

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7568,7 +7568,7 @@ void QgisApp::layerSubsetString()
75687568
if ( QMessageBox::question( NULL, tr( "Filter on joined fields" ),
75697569
tr( "You are about to set a subset filter on a layer that has joined fields. "
75707570
"Joined fields cannot be filtered, unless you convert the layer to a virtual layer first. "
7571-
"Would you like to create a virtual layer out of this layer first ?" ),
7571+
"Would you like to create a virtual layer out of this layer first?" ),
75727572
QMessageBox::Yes | QMessageBox::No ) == QMessageBox::Yes )
75737573
{
75747574
QgsVirtualLayerDefinition def = QgsVirtualLayerDefinitionUtils::fromJoinedLayer( vlayer );

‎src/app/qgsdecorationscalebardialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar&
3636
switch ( units )
3737
{
3838
case 0:
39-
spnSize->setSuffix( tr( " metres/km" ) );
39+
spnSize->setSuffix( tr( " meters/km" ) );
4040
break;
4141
case 1:
4242
spnSize->setSuffix( tr( " feet/miles" ) );

‎src/app/qgsprojectproperties.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
109109
void on_mWMSInspireScenario2_toggled( bool on );
110110

111111
/*!
112-
* Slots to select/unselect all the WFS layers
112+
* Slots to select/deselect all the WFS layers
113113
*/
114114
void on_pbnWFSLayersSelectAll_clicked();
115115
void on_pbnWFSLayersUnselectAll_clicked();
116116

117117
/*!
118-
* Slots to select/unselect all the WCS layers
118+
* Slots to select/deselect all the WCS layers
119119
*/
120120
void on_pbnWCSLayersSelectAll_clicked();
121121
void on_pbnWCSLayersUnselectAll_clicked();

‎src/core/composer/qgscomposermapgrid.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
172172
enum GridUnit
173173
{
174174
MapUnit, /*!< grid units follow map units */
175-
MM, /*!< grid units in millimetres */
176-
CM /*!< grid units in centimetres */
175+
MM, /*!< grid units in millimeters */
176+
CM /*!< grid units in centimeters */
177177
};
178178

179179
/** Grid drawing style
@@ -327,7 +327,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
327327

328328
/** Calculates the maximum distance the grid extends beyond the QgsComposerMap's
329329
* item rect
330-
* @returns maximum extension in millimetres
330+
* @returns maximum extension in millimeters
331331
*/
332332
double maxExtension();
333333

@@ -446,14 +446,14 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
446446

447447
/** Sets the length of the cross segments drawn for the grid. This is only used for grids
448448
* with QgsComposerMapGrid::Cross styles
449-
* @param length cross length in millimetres
449+
* @param length cross length in millimeters
450450
* @see crossLength
451451
*/
452452
void setCrossLength( const double length ) { mCrossLength = length; }
453453

454454
/** Retrieves the length of the cross segments drawn for the grid. This is only used for grids
455455
* with QgsComposerMapGrid::Cross styles
456-
* @returns cross length in millimetres
456+
* @returns cross length in millimeters
457457
* @see setCrossLength
458458
*/
459459
double crossLength() const { return mCrossLength; }
@@ -617,13 +617,13 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
617617
*/
618618
AnnotationPosition annotationPosition( const BorderSide border ) const;
619619

620-
/** Sets the distance between the map frame and annotations. Units are in millimetres.
620+
/** Sets the distance between the map frame and annotations. Units are in millimeters.
621621
* @param distance margin between map frame and annotations
622622
* @see annotationFrameDistance
623623
*/
624624
void setAnnotationFrameDistance( const double distance ) { mAnnotationFrameDistance = distance; }
625625

626-
/** Gets the distance between the map frame and annotations. Units are in millimetres.
626+
/** Gets the distance between the map frame and annotations. Units are in millimeters.
627627
* @returns margin between map frame and annotations
628628
* @see setAnnotationFrameDistance
629629
*/
@@ -749,15 +749,15 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
749749
/** Sets the grid frame width. This property controls how wide the grid frame is.
750750
* The size of the line outlines drawn in the frame is controlled through the
751751
* setFramePenSize method.
752-
* @param width width of grid frame in millimetres
752+
* @param width width of grid frame in millimeters
753753
* @see frameWidth
754754
*/
755755
void setFrameWidth( const double width ) { mGridFrameWidth = width; }
756756

757757
/** Gets the grid frame width. This property controls how wide the grid frame is.
758758
* The size of the line outlines drawn in the frame can be retrieved via the
759759
* framePenSize method.
760-
* @returns width of grid frame in millimetres
760+
* @returns width of grid frame in millimeters
761761
* @see setFrameWidth
762762
*/
763763
double frameWidth() const { return mGridFrameWidth; }

‎src/gui/qgsprojectionselector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ void QgsProjectionSelector::applySelection( int column, QString value )
251251
else
252252
{
253253
QgsDebugMsg( QString( "nothing found for %1,%2" ).arg( column ).arg( value ) );
254-
// unselect the selected item to avoid confusing the user
254+
// deselect the selected item to avoid confusing the user
255255
lstCoordinateSystems->clearSelection();
256256
lstRecent->clearSelection();
257257
teProjection->setText( "" );

‎src/gui/symbology-ng/qgsstylev2exportimportdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class GUI_EXPORT QgsStyleV2ExportImportDialog : public QDialog, private Ui::QgsS
7777
*/
7878
void selectGroup( const QString& groupName );
7979
/**
80-
* Unselect the symbols belonging to the given group
80+
* Deselect the symbols belonging to the given group
8181
* @param groupName the name of the group to be deselected
8282
*/
8383
void deselectGroup( const QString& groupName );

‎src/plugins/offline_editing/offline_editing_plugin_guibase.ui

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
</property>
1616
<property name="windowIcon">
1717
<iconset>
18-
<normaloff/>
19-
</iconset>
18+
<normaloff>.</normaloff>.</iconset>
2019
</property>
2120
<layout class="QVBoxLayout" name="verticalLayout_2">
2221
<item>
@@ -65,7 +64,7 @@
6564
<item>
6665
<widget class="QPushButton" name="mSelectAllButton">
6766
<property name="text">
68-
<string>select all</string>
67+
<string>Select all</string>
6968
</property>
7069
</widget>
7170
</item>
@@ -85,7 +84,7 @@
8584
<item>
8685
<widget class="QPushButton" name="mUnselectAllButton">
8786
<property name="text">
88-
<string>unselect all</string>
87+
<string>Deselect all</string>
8988
</property>
9089
</widget>
9190
</item>

‎src/providers/virtual/qgsvirtuallayersourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ void QgsVirtualLayerSourceSelect::on_buttonBox_accepted()
218218
QString id( mLayerNameCombo->itemData( idx ).toString() );
219219
if ( !id.isEmpty() && mLayerNameCombo->currentText() == QgsMapLayerRegistry::instance()->mapLayer( id )->name() )
220220
{
221-
int r = QMessageBox::warning( nullptr, tr( "Warning" ), tr( "A virtual layer of this name already exists, would you like to overwrite it ?" ), QMessageBox::Yes | QMessageBox::No );
221+
int r = QMessageBox::warning( nullptr, tr( "Warning" ), tr( "A virtual layer of this name already exists, would you like to overwrite it?" ), QMessageBox::Yes | QMessageBox::No );
222222
if ( r == QMessageBox::Yes )
223223
{
224224
emit replaceVectorLayer( id, def.toString(), layerName, "virtual" );

‎src/providers/wms/qgswmssourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ void QgsWMSSourceSelect::applySelectionConstraints( QTreeWidgetItem *item )
684684

685685
if ( firstNewStyle || style )
686686
{
687-
// individual style selected => unselect layer and all parent groups
687+
// individual style selected => deselect layer and all parent groups
688688
QTreeWidgetItem *parent = item;
689689
while ( parent )
690690
{

‎tests/src/python/test_qgsgraduatedsymbolrendererv2.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def createColorRamp():
7878

7979
def createLabelFormat():
8080
format = QgsRendererRangeV2LabelFormat()
81-
template = "%1 - %2 metres"
81+
template = "%1 - %2 meters"
8282
precision = 5
8383
format.setFormat(template)
8484
format.setPrecision(precision)
@@ -189,7 +189,7 @@ def testQgsRendererRangeV2LabelFormat_1(self):
189189
"""Test QgsRendererRangeV2LabelFormat getter/setter functions"""
190190
format = QgsRendererRangeV2LabelFormat()
191191
self.assertTrue(format, "QgsRendererRangeV2LabelFomat construction failed")
192-
template = "%1 - %2 metres"
192+
template = "%1 - %2 meters"
193193
precision = 5
194194
format.setFormat(template)
195195
self.assertEqual(format.format(), template, "Format getter/setter failed")
@@ -249,8 +249,8 @@ def testQgsRendererRangeV2LabelFormat_2(self):
249249
("%2", "2.34"),
250250
("%2%", "2.34%"),
251251
("%1%1", "1.231.23"),
252-
("from %1 to %2 metres", "from 1.23 to 2.34 metres"),
253-
("from %2 to %1 metres", "from 2.34 to 1.23 metres"),
252+
("from %1 to %2 meters", "from 1.23 to 2.34 meters"),
253+
("from %2 to %1 meters", "from 2.34 to 1.23 meters"),
254254
)
255255
format.setPrecision(2)
256256
format.setTrimTrailingZeroes(False)

0 commit comments

Comments
 (0)
Please sign in to comment.