diff --git a/NEWS b/NEWS index 756fcec52af5..2eb3142a045f 100644 --- a/NEWS +++ b/NEWS @@ -1055,7 +1055,7 @@ we recommend that you use a copy of QGIS from our Long Term Support (LTS)1.0.x release series. In all other cases we recommend that you use this version. This release includes around 200 bug fixes, nearly 30 new features and has had -a lot of love and attention poured in to it to take our favourite desktop GIS +a lot of love and attention poured into it to take our favorite desktop GIS application another step on the road to GIS nirvana! So much has happened in the 3 months since our last release that it is impossible to document everything here. Instead we will just highlight a couple of important new diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in index 42a41571f01b..3b1fb1e6bb3a 100644 --- a/cmake_templates/Doxyfile.in +++ b/cmake_templates/Doxyfile.in @@ -1448,7 +1448,7 @@ DOT_NUM_THREADS = 0 # By default doxygen will write a font called FreeSans.ttf to the output # directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need +# font does not include all possible Unicode characters however, so when you need # these (or just want a differently looking font) you can specify the font name # using DOT_FONTNAME. You need need to make sure dot is able to find the font, # which can be done by putting it in a standard location or by setting the diff --git a/doc/news.t2t b/doc/news.t2t index deedb690d69a..6c300f3e9151 100644 --- a/doc/news.t2t +++ b/doc/news.t2t @@ -1023,7 +1023,7 @@ release series. In all other cases we recommend that you use this version. This release includes around 200 bug fixes, nearly 30 new features and has had -a lot of love and attention poured in to it to take our favourite desktop GIS +a lot of love and attention poured in to it to take our favorite desktop GIS application another step on the road to GIS nirvana! So much has happened in the 3 months since our last release that it is impossible to document everything here. Instead we will just highlight a couple of important new diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip index 8173e47bc30d..441a933c215f 100644 --- 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/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip index ad52f0fcb06c..5b5f936d028e 100644 --- a/python/core/qgspallabeling.sip +++ b/python/core/qgspallabeling.sip @@ -408,7 +408,7 @@ class QgsPalLayerSettings bool centroidInside; // whether centroid-point calculated must be inside polygon /** Ordered list of predefined label positions for points. Positions earlier - * in the list will be prioritised over later positions. Only used when the placement + * in the list will be prioritized over later positions. Only used when the placement * is set to QgsPalLayerSettings::OrderedPositionsAroundPoint. * @note not available in Python bindings */ diff --git a/python/plugins/db_manager/db_plugins/data_model.py b/python/plugins/db_manager/db_plugins/data_model.py index 6ffc3f522326..de0ddd2208b3 100644 --- a/python/plugins/db_manager/db_plugins/data_model.py +++ b/python/plugins/db_manager/db_plugins/data_model.py @@ -89,7 +89,7 @@ def data(self, index, role): # too much data to display, elide the string val = val[:300] try: - return str(val) # convert to unicode + return str(val) # convert to Unicode except UnicodeDecodeError: return str(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any) diff --git a/python/plugins/db_manager/db_plugins/plugin.py b/python/plugins/db_manager/db_plugins/plugin.py index f56a8d2fcc29..8da1344c75a7 100644 --- a/python/plugins/db_manager/db_plugins/plugin.py +++ b/python/plugins/db_manager/db_plugins/plugin.py @@ -424,7 +424,7 @@ def editTableActionSlot(self, item, action, parent): QApplication.restoreOverrideCursor() try: if not isinstance(item, Table) or item.isView: - parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table for editation."), + parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table to edit."), QgsMessageBar.INFO, parent.iface.messageTimeout()) return from ..dlg_table_properties import DlgTableProperties diff --git a/python/plugins/processing/algs/help/qgis.yaml b/python/plugins/processing/algs/help/qgis.yaml index 37d89d4aec04..a454cd6024e7 100644 --- a/python/plugins/processing/algs/help/qgis.yaml +++ b/python/plugins/processing/algs/help/qgis.yaml @@ -93,7 +93,7 @@ qgis:createattributeindex: > Creates an index to speed up queries made against a field in a table. Support for index creation is dependent on the layer's data provider and the field type. qgis:createconstantrasterlayer: > - Given an input raster layer an a value, this algorithm generates a new layer with the same extent and cellsize as the input one, and all cells with the specified value. + Given an input raster layer an a value, this algorithm generates a new layer with the same extent and cell size as the input one, and all cells with the specified value. qgis:creategridlines: This algorithm creates a line vector layer with a grid covering a given extent. @@ -568,9 +568,9 @@ qgis:rastercalculator: > - sin(), cos(), tan(), atan2(), ln(), log10() - The extent and cellsize can be defined by the user. If the extent is not specified, the minimum extent that covers the input layers will be used. If the cellsize is not specified, the minimum cellsize of all input layers will be used. + The extent and cellsize can be defined by the user. If the extent is not specified, the minimum extent that covers the input layers will be used. If the cell size is not specified, the minimum cell size of all input layers will be used. - The cellsize is assumed to be the same in both X and Y axes. + The cell size is assumed to be the same in both X and Y axes. Layers are refered by their name as displayed in the layer list and the number of the band to use (based on 1), using the pattern 'layer_name@band number'. For instance, the first band from a layer named DEM will be referred as DEM@1. diff --git a/python/plugins/processing/algs/help/saga.yaml b/python/plugins/processing/algs/help/saga.yaml index 8068ccbb1495..182c7893ffa1 100644 --- a/python/plugins/processing/algs/help/saga.yaml +++ b/python/plugins/processing/algs/help/saga.yaml @@ -3,7 +3,7 @@ saga:rastercalculator: > It requires a base layer, and a set of additional layers. The base layer is identified as "a" in the formula, while the additional layers are identified as "b, c, d...", using the order in which they appear in the multiple selection dialog. - The resulting layer has the extent and cellsize of the main layer. + The resulting layer has the extent and cell size of the main layer. The following operators and functions are available. diff --git a/python/plugins/processing/algs/lidar/fusion/CanopyModel.py b/python/plugins/processing/algs/lidar/fusion/CanopyModel.py index 7b7982158e81..5d21ceef4fa1 100644 --- a/python/plugins/processing/algs/lidar/fusion/CanopyModel.py +++ b/python/plugins/processing/algs/lidar/fusion/CanopyModel.py @@ -62,7 +62,7 @@ def defineCharacteristics(self): self.addParameter(ParameterFile( self.INPUT, self.tr('Input LAS layer'))) self.addParameter(ParameterNumber( - self.CELLSIZE, self.tr('Cellsize'), 0, None, 10.0)) + self.CELLSIZE, self.tr('Cell Size'), 0, None, 10.0)) self.addParameter(ParameterSelection( self.XYUNITS, self.tr('XY Units'), self.UNITS)) self.addParameter(ParameterSelection( diff --git a/python/plugins/processing/algs/lidar/fusion/Cover.py b/python/plugins/processing/algs/lidar/fusion/Cover.py index 11113e1e02c6..c0c5ca0d2be0 100644 --- a/python/plugins/processing/algs/lidar/fusion/Cover.py +++ b/python/plugins/processing/algs/lidar/fusion/Cover.py @@ -57,7 +57,7 @@ def defineCharacteristics(self): self.addParameter(ParameterFile( self.GROUND, self.tr('Input ground DTM layer'))) self.addParameter(ParameterNumber( - self.CELLSIZE, self.tr('Cellsize'), 0, None, 10.0)) + self.CELLSIZE, self.tr('Cell Size'), 0, None, 10.0)) self.addParameter(ParameterNumber( self.HEIGHTBREAK, self.tr('Heightbreak'), 0, None, 10.0)) self.addParameter(ParameterSelection( diff --git a/python/plugins/processing/algs/lidar/fusion/GridMetrics.py b/python/plugins/processing/algs/lidar/fusion/GridMetrics.py index adc69e7b3893..3917e21a50b6 100644 --- a/python/plugins/processing/algs/lidar/fusion/GridMetrics.py +++ b/python/plugins/processing/algs/lidar/fusion/GridMetrics.py @@ -65,7 +65,7 @@ def defineCharacteristics(self): self.addParameter(ParameterNumber( self.HEIGHT, self.tr('Height break'))) self.addParameter(ParameterNumber( - self.CELLSIZE, self.tr('Cellsize'))) + self.CELLSIZE, self.tr('Cell Size'))) self.addOutput(OutputFile( self.OUTPUT_CSV_ELEVATION, self.tr('Output table with grid metrics'))) diff --git a/python/plugins/processing/algs/lidar/fusion/GridSurfaceCreate.py b/python/plugins/processing/algs/lidar/fusion/GridSurfaceCreate.py index 509346efc030..d93da5ab9153 100644 --- a/python/plugins/processing/algs/lidar/fusion/GridSurfaceCreate.py +++ b/python/plugins/processing/algs/lidar/fusion/GridSurfaceCreate.py @@ -63,7 +63,7 @@ def defineCharacteristics(self): self.addParameter(ParameterFile( self.INPUT, self.tr('Input LAS layer'))) self.addParameter(ParameterNumber( - self.CELLSIZE, self.tr('Cellsize'), 0, None, 10.0)) + self.CELLSIZE, self.tr('Cell Size'), 0, None, 10.0)) self.addParameter(ParameterSelection( self.XYUNITS, self.tr('XY Units'), self.UNITS)) self.addParameter(ParameterSelection( diff --git a/python/plugins/processing/algs/lidar/fusion/GroundFilter.py b/python/plugins/processing/algs/lidar/fusion/GroundFilter.py index f89e8c17ad8d..29d3643de63f 100644 --- a/python/plugins/processing/algs/lidar/fusion/GroundFilter.py +++ b/python/plugins/processing/algs/lidar/fusion/GroundFilter.py @@ -50,7 +50,7 @@ def defineCharacteristics(self): self.addParameter(ParameterFile( self.INPUT, self.tr('Input LAS layer'))) self.addParameter(ParameterNumber(self.CELLSIZE, - self.tr('Cellsize for intermediate surfaces'), 0, None, 10)) + self.tr('Cell size for intermediate surfaces'), 0, None, 10)) self.addOutput(OutputFile( self.OUTPUT, self.tr('Output ground LAS file'))) self.addParameter(ParameterBoolean( diff --git a/python/plugins/processing/algs/lidar/fusion/TinSurfaceCreate.py b/python/plugins/processing/algs/lidar/fusion/TinSurfaceCreate.py index 1732496f42ba..68ba8df055dc 100644 --- a/python/plugins/processing/algs/lidar/fusion/TinSurfaceCreate.py +++ b/python/plugins/processing/algs/lidar/fusion/TinSurfaceCreate.py @@ -54,7 +54,7 @@ def defineCharacteristics(self): self.addParameter(ParameterFile( self.INPUT, self.tr('Input LAS layer'))) self.addParameter(ParameterNumber(self.CELLSIZE, - self.tr('Cellsize'), 0, None, 10.0)) + self.tr('Cell Size'), 0, None, 10.0)) self.addParameter(ParameterSelection(self.XYUNITS, self.tr('XY Units'), self.UNITS)) self.addParameter(ParameterSelection(self.ZUNITS, diff --git a/python/plugins/processing/algs/qgis/Eliminate.py b/python/plugins/processing/algs/qgis/Eliminate.py index 144f5c59e2c5..6b3766eb2c1c 100644 --- a/python/plugins/processing/algs/qgis/Eliminate.py +++ b/python/plugins/processing/algs/qgis/Eliminate.py @@ -133,7 +133,7 @@ def processAlgorithm(self, progress): y = str(comparisonvalue) except ValueError: selectionError = True - msg = self.tr('Cannot convert "%s" to unicode' % str(comparisonvalue)) + msg = self.tr('Cannot convert "%s" to Unicode' % str(comparisonvalue)) elif selectType == QVariant.Date: # date dateAndFormat = comparisonvalue.split(' ') diff --git a/python/plugins/processing/algs/qgis/IdwInterpolation.py b/python/plugins/processing/algs/qgis/IdwInterpolation.py index 783321639ae5..f97a29e625f8 100644 --- a/python/plugins/processing/algs/qgis/IdwInterpolation.py +++ b/python/plugins/processing/algs/qgis/IdwInterpolation.py @@ -128,10 +128,10 @@ def dataToString(data): self.tr('Number of rows'), 0, 10000000, 300)) self.addParameter(ParameterNumber(self.CELLSIZE_X, - self.tr('Cellsize X'), + self.tr('Cell Size X'), 0.0, 999999.000000, 0.0)) self.addParameter(ParameterNumber(self.CELLSIZE_Y, - self.tr('Cellsize Y'), + self.tr('Cell Size Y'), 0.0, 999999.000000, 0.0)) self.addParameter(ParameterExtent(self.EXTENT, self.tr('Extent'))) diff --git a/python/plugins/processing/algs/qgis/RasterCalculator.py b/python/plugins/processing/algs/qgis/RasterCalculator.py index 8eaf5bd328d7..f8d27d9179f4 100644 --- a/python/plugins/processing/algs/qgis/RasterCalculator.py +++ b/python/plugins/processing/algs/qgis/RasterCalculator.py @@ -81,7 +81,7 @@ def evaluateForModeler(self, value, model): multiline=True, metadata={'widget_wrapper': ExpressionWidgetWrapper})) self.addParameter(ParameterNumber(self.CELLSIZE, - self.tr('Cellsize (use 0 or empty to set it automatically)'), + self.tr('Cell size (use 0 or empty to set it automatically)'), minValue=0.0, default=0.0, optional=True)) self.addParameter(ParameterExtent(self.EXTENT, self.tr('Output extent'), diff --git a/python/plugins/processing/algs/qgis/TinInterpolation.py b/python/plugins/processing/algs/qgis/TinInterpolation.py index cad1157df72f..dce6eaca15cb 100644 --- a/python/plugins/processing/algs/qgis/TinInterpolation.py +++ b/python/plugins/processing/algs/qgis/TinInterpolation.py @@ -137,10 +137,10 @@ def dataToString(data): self.tr('Number of rows'), 0, 10000000, 300)) self.addParameter(ParameterNumber(self.CELLSIZE_X, - self.tr('Cellsize X'), + self.tr('Cell size X'), 0.0, 999999.000000, 0.0)) self.addParameter(ParameterNumber(self.CELLSIZE_Y, - self.tr('Cellsize Y'), + self.tr('Cell size Y'), 0.0, 999999.000000, 0.0)) self.addParameter(ParameterExtent(self.EXTENT, self.tr('Extent'))) diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm212.py b/python/plugins/processing/algs/saga/SagaAlgorithm212.py index b4b8787784d3..86dab8738534 100644 --- a/python/plugins/processing/algs/saga/SagaAlgorithm212.py +++ b/python/plugins/processing/algs/saga/SagaAlgorithm212.py @@ -293,7 +293,7 @@ def editCommands(self, commands): return commands def getOutputCellsize(self): - """Tries to guess the cellsize of the output, searching for + """Tries to guess the cell size of the output, searching for a parameter with an appropriate name for it. """ diff --git a/python/plugins/processing/core/ProcessingConfig.py b/python/plugins/processing/core/ProcessingConfig.py index 72254a879594..60111f3d4167 100644 --- a/python/plugins/processing/core/ProcessingConfig.py +++ b/python/plugins/processing/core/ProcessingConfig.py @@ -146,7 +146,7 @@ def initialize(): ProcessingConfig.addSetting(Setting( ProcessingConfig.tr('General'), ProcessingConfig.RECENT_ALGORITHMS, - ProcessingConfig.tr('Recent algs'), '', hidden=True)) + ProcessingConfig.tr('Recent algorithms'), '', hidden=True)) extensions = processing.tools.dataobjects.getSupportedOutputVectorLayerExtensions() ProcessingConfig.addSetting(Setting( ProcessingConfig.tr('General'), diff --git a/python/pyplugin_installer/version_compare.py b/python/pyplugin_installer/version_compare.py index 116ba723b2fb..4071d3091fd7 100644 --- a/python/pyplugin_installer/version_compare.py +++ b/python/pyplugin_installer/version_compare.py @@ -23,7 +23,7 @@ Usage: compareVersions(version1, version2) -The function accepts arguments of any type convertable to unicode string +The function accepts arguments of any type convertable to Unicode string and returns integer value: 0 - the versions are equal 1 - version 1 is higher @@ -31,7 +31,7 @@ ----------------------------------------------------------------------------- HOW DOES IT WORK... -First, both arguments are converted to uppercase unicode and stripped of +First, both arguments are converted to uppercase Unicode and stripped of 'VERSION' or 'VER.' prefix. Then they are chopped into a list of particular numeric and alphabetic elements. The dots, dashes and underlines are recognized as delimiters. Also numbers and non numbers are separated. See example below: diff --git a/resources/function_help/json/regexp_matches b/resources/function_help/json/regexp_matches index 7b77ecfe05b2..68f914564d06 100644 --- a/resources/function_help/json/regexp_matches +++ b/resources/function_help/json/regexp_matches @@ -6,7 +6,7 @@ {"arg":"string", "description":"the string to capture groups from against the regular expression"}, {"arg":"regex","description":"the regular expression used to capture groups"}, {"arg":"empty_value","optional":true,"default":"''","description":"the optional string to use as replacement for empty (zero length) matches"}], - "examples": [ { "expression":"regexp_matches('qgis=>rocks','(.*)=>(.*)')", "returns":"array: 'qgis', 'rocks'"}, + "examples": [ { "expression":"regexp_matches('QGIS=>rocks','(.*)=>(.*)')", "returns":"array: 'QGIS', 'rocks'"}, { "expression":"regexp_matches('key=>','(.*)=>(.*)','empty value')", "returns":"array: 'key', 'empty value'"} ] } diff --git a/scripts/spelling.dat b/scripts/spelling.dat index acb464f5cc7d..4a24e1f1be77 100644 --- a/scripts/spelling.dat +++ b/scripts/spelling.dat @@ -140,6 +140,7 @@ debians:Debian's decompres:decompress definate:definite definately:definitely +definintion:definition deimiter:delimiter delemeter:delimiter delemiter:delimiter @@ -196,6 +197,8 @@ familar:familiar fatser:faster fetaures:features feture:feature +flavour:flavor +flavours:flavors forse:force fortan:fortran forwardig:forwarding @@ -357,6 +360,8 @@ prepaired:prepared primative:primitive princliple:principle priorty:priority +prioritise:prioritize +prioritising:prioritizing proccesors:processors proces:process processessing:processing @@ -459,6 +464,7 @@ supress:suppress surpress:suppress suspicously:suspiciously swaped:swapped +symbo:symbol syle:style symetrical:symmetrical synax:syntax diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp index 294089982ba5..2ca261a1c0e2 100644 --- a/src/app/composer/qgscomposer.cpp +++ b/src/app/composer/qgscomposer.cpp @@ -2488,7 +2488,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode ) "with layers not being clipped to the map " "bounding box.
" ) + tr( "If you require a vector-based output file from " - "Qgis it is suggested that you try printing " + "QGIS it is suggested that you try printing " "to PostScript if the SVG output is not " "satisfactory." "" ) ); diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index ee02b6c41243..7e36b43a8fe1 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -6369,7 +6369,7 @@ void QgisApp::saveAsLayerDefinition() bool saved = QgsLayerDefinition::exportLayerDefinition( path, mLayerTreeView->selectedNodes(), errorMessage ); if ( !saved ) { - messageBar()->pushMessage( tr( "Error saving layer definintion file" ), errorMessage, QgsMessageBar::WARNING ); + messageBar()->pushMessage( tr( "Error saving layer definition file" ), errorMessage, QgsMessageBar::WARNING ); } } diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp index ba7bcf4e22d3..88868b348f67 100644 --- a/src/app/qgspluginregistry.cpp +++ b/src/app/qgspluginregistry.cpp @@ -380,7 +380,7 @@ void QgsPluginRegistry::loadCppPlugin( const QString& theFullPathName ) { // something went wrong QMessageBox::warning( mQgisInterface->mainWindow(), QObject::tr( "Error Loading Plugin" ), - QObject::tr( "There was an error loading a plugin." + QObject::tr( "There was an error loading a plugin. " "The following diagnostic information may help the QGIS developers resolve the issue:\n%1." ) .arg( myError ) ); //disable it to the qsettings file [ts] diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h index 725d2a6892bc..01ed5cc04013 100644 --- a/src/core/pal/feature.h +++ b/src/core/pal/feature.h @@ -143,7 +143,7 @@ namespace pal */ int createCandidatesOverPoint( double x, double y, QList