diff --git a/python/core/composer/qgscomposermapgrid.sip b/python/core/composer/qgscomposermapgrid.sip index 13ca0f6e66e..1cdfb0b1faa 100644 --- a/python/core/composer/qgscomposermapgrid.sip +++ b/python/core/composer/qgscomposermapgrid.sip @@ -142,8 +142,8 @@ class QgsComposerMapGrid : QgsComposerMapItem enum GridUnit { MapUnit, /*!< grid units follow map units */ - MM, /*!< grid units in millimetres */ - CM /*!< grid units in centimetres */ + MM, /*!< grid units in millimeters */ + CM /*!< grid units in centimeters */ }; /** Grid drawing style @@ -297,7 +297,7 @@ class QgsComposerMapGrid : QgsComposerMapItem /** Calculates the maximum distance the grid extends beyond the QgsComposerMap's * item rect - * @returns maximum extension in millimetres + * @returns maximum extension in millimeters */ double maxExtension(); @@ -416,14 +416,14 @@ class QgsComposerMapGrid : QgsComposerMapItem /** Sets the length of the cross segments drawn for the grid. This is only used for grids * with QgsComposerMapGrid::Cross styles - * @param length cross length in millimetres + * @param length cross length in millimeters * @see crossLength */ void setCrossLength( const double length ); /** Retrieves the length of the cross segments drawn for the grid. This is only used for grids * with QgsComposerMapGrid::Cross styles - * @returns cross length in millimetres + * @returns cross length in millimeters * @see setCrossLength */ double crossLength() const; @@ -569,13 +569,13 @@ class QgsComposerMapGrid : QgsComposerMapItem */ AnnotationPosition annotationPosition( const BorderSide border ) const; - /** Sets the distance between the map frame and annotations. Units are in millimetres. + /** Sets the distance between the map frame and annotations. Units are in millimeters. * @param distance margin between map frame and annotations * @see annotationFrameDistance */ void setAnnotationFrameDistance( const double distance ); - /** Gets the distance between the map frame and annotations. Units are in millimetres. + /** Gets the distance between the map frame and annotations. Units are in millimeters. * @returns margin between map frame and annotations * @see setAnnotationFrameDistance */ @@ -701,7 +701,7 @@ class QgsComposerMapGrid : QgsComposerMapItem /** Sets the grid frame width. This property controls how wide the grid frame is. * The size of the line outlines drawn in the frame is controlled through the * setFramePenSize method. - * @param width width of grid frame in millimetres + * @param width width of grid frame in millimeters * @see frameWidth */ void setFrameWidth( const double width ); @@ -709,7 +709,7 @@ class QgsComposerMapGrid : QgsComposerMapItem /** Gets the grid frame width. This property controls how wide the grid frame is. * The size of the line outlines drawn in the frame can be retrieved via the * framePenSize method. - * @returns width of grid frame in millimetres + * @returns width of grid frame in millimeters * @see setFrameWidth */ double frameWidth() const; diff --git a/python/gui/symbology-ng/qgsstylev2exportimportdialog.sip b/python/gui/symbology-ng/qgsstylev2exportimportdialog.sip index 5e5b0377903..3c7e1193fc7 100644 --- a/python/gui/symbology-ng/qgsstylev2exportimportdialog.sip +++ b/python/gui/symbology-ng/qgsstylev2exportimportdialog.sip @@ -46,7 +46,7 @@ class QgsStyleV2ExportImportDialog : QDialog */ void selectGroup( const QString& groupName ); /** - * Unselect the symbols belonging to the given group + * Deselect the symbols belonging to the given group * @param groupName the name of the group to be deselected */ void deselectGroup( const QString& groupName); diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh index d14be66ca96..e81d9039576 100755 --- a/scripts/chkspelling.sh +++ b/scripts/chkspelling.sh @@ -17,6 +17,6 @@ RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\|/;') | sed -e 's/| /|/g; s/|$//;') -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" +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" -egrep --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX" +egrep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api} --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX" diff --git a/scripts/spelling.dat b/scripts/spelling.dat index e38b975baa4..569e83bd6e7 100644 --- a/scripts/spelling.dat +++ b/scripts/spelling.dat @@ -485,3 +485,11 @@ occurence:occurrence overide:override supress:suppress surpress:suppress +artefact:artifact +artefacts:artifacts +metres:meters +millimetres:millimeters +centimetres:centimers +kilometres:kilometers +unselect:deselect + diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 2fe6741f88a..6c8120c03ee 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -7568,7 +7568,7 @@ void QgisApp::layerSubsetString() if ( QMessageBox::question( NULL, tr( "Filter on joined fields" ), tr( "You are about to set a subset filter on a layer that has joined fields. " "Joined fields cannot be filtered, unless you convert the layer to a virtual layer first. " - "Would you like to create a virtual layer out of this layer first ?" ), + "Would you like to create a virtual layer out of this layer first?" ), QMessageBox::Yes | QMessageBox::No ) == QMessageBox::Yes ) { QgsVirtualLayerDefinition def = QgsVirtualLayerDefinitionUtils::fromJoinedLayer( vlayer ); diff --git a/src/app/qgsdecorationscalebardialog.cpp b/src/app/qgsdecorationscalebardialog.cpp index 60afd9cd68d..27ecf9caf9f 100644 --- a/src/app/qgsdecorationscalebardialog.cpp +++ b/src/app/qgsdecorationscalebardialog.cpp @@ -36,7 +36,7 @@ QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar& switch ( units ) { case 0: - spnSize->setSuffix( tr( " metres/km" ) ); + spnSize->setSuffix( tr( " meters/km" ) ); break; case 1: spnSize->setSuffix( tr( " feet/miles" ) ); diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h index 57aa18a1206..ab32a347505 100644 --- a/src/app/qgsprojectproperties.h +++ b/src/app/qgsprojectproperties.h @@ -109,13 +109,13 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui: void on_mWMSInspireScenario2_toggled( bool on ); /*! - * Slots to select/unselect all the WFS layers + * Slots to select/deselect all the WFS layers */ void on_pbnWFSLayersSelectAll_clicked(); void on_pbnWFSLayersUnselectAll_clicked(); /*! - * Slots to select/unselect all the WCS layers + * Slots to select/deselect all the WCS layers */ void on_pbnWCSLayersSelectAll_clicked(); void on_pbnWCSLayersUnselectAll_clicked(); diff --git a/src/core/composer/qgscomposermapgrid.h b/src/core/composer/qgscomposermapgrid.h index fe54489cbb4..6dd95b96a02 100644 --- a/src/core/composer/qgscomposermapgrid.h +++ b/src/core/composer/qgscomposermapgrid.h @@ -172,8 +172,8 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem enum GridUnit { MapUnit, /*!< grid units follow map units */ - MM, /*!< grid units in millimetres */ - CM /*!< grid units in centimetres */ + MM, /*!< grid units in millimeters */ + CM /*!< grid units in centimeters */ }; /** Grid drawing style @@ -327,7 +327,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem /** Calculates the maximum distance the grid extends beyond the QgsComposerMap's * item rect - * @returns maximum extension in millimetres + * @returns maximum extension in millimeters */ double maxExtension(); @@ -446,14 +446,14 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem /** Sets the length of the cross segments drawn for the grid. This is only used for grids * with QgsComposerMapGrid::Cross styles - * @param length cross length in millimetres + * @param length cross length in millimeters * @see crossLength */ void setCrossLength( const double length ) { mCrossLength = length; } /** Retrieves the length of the cross segments drawn for the grid. This is only used for grids * with QgsComposerMapGrid::Cross styles - * @returns cross length in millimetres + * @returns cross length in millimeters * @see setCrossLength */ double crossLength() const { return mCrossLength; } @@ -617,13 +617,13 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem */ AnnotationPosition annotationPosition( const BorderSide border ) const; - /** Sets the distance between the map frame and annotations. Units are in millimetres. + /** Sets the distance between the map frame and annotations. Units are in millimeters. * @param distance margin between map frame and annotations * @see annotationFrameDistance */ void setAnnotationFrameDistance( const double distance ) { mAnnotationFrameDistance = distance; } - /** Gets the distance between the map frame and annotations. Units are in millimetres. + /** Gets the distance between the map frame and annotations. Units are in millimeters. * @returns margin between map frame and annotations * @see setAnnotationFrameDistance */ @@ -749,7 +749,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem /** Sets the grid frame width. This property controls how wide the grid frame is. * The size of the line outlines drawn in the frame is controlled through the * setFramePenSize method. - * @param width width of grid frame in millimetres + * @param width width of grid frame in millimeters * @see frameWidth */ void setFrameWidth( const double width ) { mGridFrameWidth = width; } @@ -757,7 +757,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem /** Gets the grid frame width. This property controls how wide the grid frame is. * The size of the line outlines drawn in the frame can be retrieved via the * framePenSize method. - * @returns width of grid frame in millimetres + * @returns width of grid frame in millimeters * @see setFrameWidth */ double frameWidth() const { return mGridFrameWidth; } diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp index 7cdae47db6d..96bf5b00c57 100644 --- a/src/gui/qgsprojectionselector.cpp +++ b/src/gui/qgsprojectionselector.cpp @@ -251,7 +251,7 @@ void QgsProjectionSelector::applySelection( int column, QString value ) else { QgsDebugMsg( QString( "nothing found for %1,%2" ).arg( column ).arg( value ) ); - // unselect the selected item to avoid confusing the user + // deselect the selected item to avoid confusing the user lstCoordinateSystems->clearSelection(); lstRecent->clearSelection(); teProjection->setText( "" ); diff --git a/src/gui/symbology-ng/qgsstylev2exportimportdialog.h b/src/gui/symbology-ng/qgsstylev2exportimportdialog.h index b288a3c7c87..89fc82d880a 100644 --- a/src/gui/symbology-ng/qgsstylev2exportimportdialog.h +++ b/src/gui/symbology-ng/qgsstylev2exportimportdialog.h @@ -77,7 +77,7 @@ class GUI_EXPORT QgsStyleV2ExportImportDialog : public QDialog, private Ui::QgsS */ void selectGroup( const QString& groupName ); /** - * Unselect the symbols belonging to the given group + * Deselect the symbols belonging to the given group * @param groupName the name of the group to be deselected */ void deselectGroup( const QString& groupName ); diff --git a/src/plugins/offline_editing/offline_editing_plugin_guibase.ui b/src/plugins/offline_editing/offline_editing_plugin_guibase.ui index 8271b0b6b50..6f5d8ee1971 100644 --- a/src/plugins/offline_editing/offline_editing_plugin_guibase.ui +++ b/src/plugins/offline_editing/offline_editing_plugin_guibase.ui @@ -15,8 +15,7 @@ - - + .. @@ -65,7 +64,7 @@ - select all + Select all @@ -85,7 +84,7 @@ - unselect all + Deselect all diff --git a/src/providers/virtual/qgsvirtuallayersourceselect.cpp b/src/providers/virtual/qgsvirtuallayersourceselect.cpp index 32aef2b10dc..98100c0631f 100644 --- a/src/providers/virtual/qgsvirtuallayersourceselect.cpp +++ b/src/providers/virtual/qgsvirtuallayersourceselect.cpp @@ -218,7 +218,7 @@ void QgsVirtualLayerSourceSelect::on_buttonBox_accepted() QString id( mLayerNameCombo->itemData( idx ).toString() ); if ( !id.isEmpty() && mLayerNameCombo->currentText() == QgsMapLayerRegistry::instance()->mapLayer( id )->name() ) { - 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 ); + 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 ); if ( r == QMessageBox::Yes ) { emit replaceVectorLayer( id, def.toString(), layerName, "virtual" ); diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp index 509b2de90d7..8582770785f 100644 --- a/src/providers/wms/qgswmssourceselect.cpp +++ b/src/providers/wms/qgswmssourceselect.cpp @@ -684,7 +684,7 @@ void QgsWMSSourceSelect::applySelectionConstraints( QTreeWidgetItem *item ) if ( firstNewStyle || style ) { - // individual style selected => unselect layer and all parent groups + // individual style selected => deselect layer and all parent groups QTreeWidgetItem *parent = item; while ( parent ) { diff --git a/tests/src/python/test_qgsgraduatedsymbolrendererv2.py b/tests/src/python/test_qgsgraduatedsymbolrendererv2.py index 5125fc86030..8cfa854aa76 100644 --- a/tests/src/python/test_qgsgraduatedsymbolrendererv2.py +++ b/tests/src/python/test_qgsgraduatedsymbolrendererv2.py @@ -78,7 +78,7 @@ def createColorRamp(): def createLabelFormat(): format = QgsRendererRangeV2LabelFormat() - template = "%1 - %2 metres" + template = "%1 - %2 meters" precision = 5 format.setFormat(template) format.setPrecision(precision) @@ -189,7 +189,7 @@ class TestQgsGraduatedSymbolRendererV2(TestCase): """Test QgsRendererRangeV2LabelFormat getter/setter functions""" format = QgsRendererRangeV2LabelFormat() self.assertTrue(format, "QgsRendererRangeV2LabelFomat construction failed") - template = "%1 - %2 metres" + template = "%1 - %2 meters" precision = 5 format.setFormat(template) self.assertEqual(format.format(), template, "Format getter/setter failed") @@ -249,8 +249,8 @@ class TestQgsGraduatedSymbolRendererV2(TestCase): ("%2", "2.34"), ("%2%", "2.34%"), ("%1%1", "1.231.23"), - ("from %1 to %2 metres", "from 1.23 to 2.34 metres"), - ("from %2 to %1 metres", "from 2.34 to 1.23 metres"), + ("from %1 to %2 meters", "from 1.23 to 2.34 meters"), + ("from %2 to %1 meters", "from 2.34 to 1.23 meters"), ) format.setPrecision(2) format.setTrimTrailingZeroes(False)