sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

spelling fixes

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-05-31 02:55:01 +02:00
parent fecc59ae15
commit 797826ea5b
25 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -1,6 +1,6 @@
QGIS News
Change history for the QGIS Project
Tuesday April 12, 2016
Tuesday May 31, 2016
------------------------------------------------------------------------
@ -38,8 +38,8 @@ Tuesday April 12, 2016
------------------------------------------------------------------------
Last Updated: Tuesday April 12, 2016
Last Change : Wednesday April 06, 2016
Last Updated: Tuesday May 31, 2016
Last Change : Tuesday May 31, 2016
1. What's new in Version 2.14 'Essen'?
@ -101,7 +101,7 @@ This release has following new features:
- QGIS Server : STARTINDEX param in WFS GetFeature Request
- QGIS Server : showFeatureCount in GetLegendGraphic
- QGIS Server : Enhance store project keyword list
- QGIS Server : Option to avoid rendering artefacts at edges of tiles
- QGIS Server : Option to avoid rendering artifacts at edges of tiles
- QGIS Server : WMS INSPIRE Capabilities
- QGIS Server : Configuration checker in project properties
- QGIS Server : Add short name to layers, groups and project

10
doc/news.html
View File

@ -77,7 +77,7 @@ label{ background-color: #FFFFCC;
<DIV CLASS="header" ID="header">
<H1>QGIS News</H1>
<H2>Change history for the QGIS Project</H2>
<H3>Tuesday April 12, 2016</H3>
<H3>Tuesday May 31, 2016</H3>
</DIV>
<DIV CLASS="toc">
@ -115,8 +115,8 @@ label{ background-color: #FFFFCC;
</DIV>
<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday April 12, 2016
Last Change : Wednesday April 06, 2016
Last Updated: Tuesday May 31, 2016
Last Change : Tuesday May 31, 2016
</P>
<A NAME="toc1"></A>
@ -181,7 +181,7 @@ This release has following new features:
<LI>QGIS Server : STARTINDEX param in WFS GetFeature Request
<LI>QGIS Server : showFeatureCount in GetLegendGraphic
<LI>QGIS Server : Enhance store project keyword list
<LI>QGIS Server : Option to avoid rendering artefacts at edges of tiles
<LI>QGIS Server : Option to avoid rendering artifacts at edges of tiles
<LI>QGIS Server : WMS INSPIRE Capabilities
<LI>QGIS Server : Configuration checker in project properties
<LI>QGIS Server : Add short name to layers, groups and project
@ -2990,5 +2990,5 @@ July 6, 2002
</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -odoc/news.html -t html doc/news.t2t -->
<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build-master-master/doc/news.html -t html /home/fischer/src/qgis/doc/news.t2t -->
</BODY></HTML>

2
doc/news.t2t
View File

@ -96,7 +96,7 @@ This release has following new features:
- QGIS Server : STARTINDEX param in WFS GetFeature Request
- QGIS Server : showFeatureCount in GetLegendGraphic
- QGIS Server : Enhance store project keyword list
- QGIS Server : Option to avoid rendering artefacts at edges of tiles
- QGIS Server : Option to avoid rendering artifacts at edges of tiles
- QGIS Server : WMS INSPIRE Capabilities
- QGIS Server : Configuration checker in project properties
- QGIS Server : Add short name to layers, groups and project

2
python/plugins/processing/core/parameters.py
View File

@ -359,7 +359,7 @@ class ParameterMultipleInput(ParameterDataObject):
return True
if _minNumInputs < 1 and not self.optional:
# dont allow to set negative or null number of inputs if parameter isn't optional
# don't allow to set negative or null number of inputs if parameter isn't optional
return False
self.minNumInputs = int(_minNumInputs)

2
python/plugins/processing/gui/BatchPanel.py
View File

@ -216,7 +216,7 @@ class BatchPanel(BASE, WIDGET):
QMessageBox.critical(
self,
self.tr('Error'),
self.tr('An error occured while reading your file.'))
self.tr('An error occurred while reading your file.'))
def setValueInWidget(self, widget, value):
if isinstance(widget, (BatchInputSelectionPanel, QLineEdit, FileSelectionPanel)):

2
scripts/chkspelling.sh
View File

@ -19,4 +19,4 @@
RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
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=*.{png,svg,db,bz2,pdf,qgs,qml,api} --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"
egrep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api,pyc} --exclude-dir=.git --exclude-dir=debian/build* --color=always "$RE" -ir . | egrep -iv "$EX"

2
src/core/qgsaction.h
View File

@ -114,7 +114,7 @@ class CORE_EXPORT QgsAction
//! Whether to capture output for display when this action is run
bool capture() const { return mCaptureOutput; }
//! Wheter this action should be shown on the attribute table
//! Whether this action should be shown on the attribute table
bool showInAttributeTable() const { return mShowInAttributeTable; }
//! Checks if the action is runable on the current platform

2
src/core/qgsactionmanager.h
View File

@ -90,7 +90,7 @@ class CORE_EXPORT QgsActionManager
* @param index action index
* @param feature feature to run action for
* @param context expression context to evalute expressions under
* @param substitutionMap deprecated - kept for compatibilty with projects, will be removed for 3.0
* @param substitutionMap deprecated - kept for compatibility with projects, will be removed for 3.0
*/
// TODO QGIS 3.0 remove substition map - force use of expression variables
void doAction( int index,

2
src/core/qgsdataprovider.h
View File

@ -338,7 +338,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
*
* This is aimed at providers that can open differently the connection to
* the datasource, according it to be in update mode or in read-only mode.
* This method shall be balanced with a succesful call to enterUpdateMode().
* This method shall be balanced with a successful call to enterUpdateMode().
*
* Most providers will have an empty implementation for that method.
*

2
src/core/qgssqlstatement.h
View File

@ -55,7 +55,7 @@ class CORE_EXPORT QgsSQLStatement
/** Performs basic validity checks. Basically checking that columns referencing
* a table, references a specified table. Returns true if the validation is
* succesful */
* successful */
bool doBasicValidationChecks( QString& errorMsgOut ) const;
class Node;

4
src/gui/editorwidgets/qgsrelationreferencefactory.cpp
View File

@ -130,13 +130,13 @@ QString QgsRelationReferenceFactory::representValue( QgsVectorLayer* vl, int fie
QgsVectorLayer* referencingLayer = relation.referencingLayer();
if ( vl != referencingLayer )
{
QgsDebugMsg( "representValue() with inconsistant vl parameter w.r.t relation referencingLayer" );
QgsDebugMsg( "representValue() with inconsistent vl parameter w.r.t relation referencingLayer" );
return value.toString();
}
int referencingFieldIdx = referencingLayer->fieldNameIndex( relation.fieldPairs().at( 0 ).first );
if ( referencingFieldIdx != fieldIdx )
{
QgsDebugMsg( "representValue() with inconsistant fieldIdx parameter w.r.t relation referencingFieldIdx" );
QgsDebugMsg( "representValue() with inconsistent fieldIdx parameter w.r.t relation referencingFieldIdx" );
return value.toString();
}
QgsVectorLayer* referencedLayer = relation.referencedLayer();

2
src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
View File

@ -78,7 +78,7 @@ QgsSearchWidgetWrapper::FilterFlags QgsValueMapSearchWidgetWrapper::defaultFlags
QString QgsValueMapSearchWidgetWrapper::createExpression( QgsSearchWidgetWrapper::FilterFlags flags ) const
{
//if unselect value, always pass
//if deselect value, always pass
if ( mComboBox->currentIndex() == 0 )
return QString();

4
src/gui/qgsgradientstopeditor.h
View File

@ -112,10 +112,10 @@ class GUI_EXPORT QgsGradientStopEditor : public QWidget
signals:
//! Emmitted when the gradient ramp is changed by a user
//! Emitted when the gradient ramp is changed by a user
void changed();
/** Emmitted when the current selected stop changes.
/** Emitted when the current selected stop changes.
* @param stop details about newly selected stop
*/
void selectedStopChanged( const QgsGradientStop& stop );

4
src/gui/qgssqlcomposerdialog.cpp
View File

@ -118,7 +118,7 @@ QgsSQLComposerDialog::QgsSQLComposerDialog( QWidget * parent, Qt::WindowFlags fl
QgsSQLComposerDialog::~QgsSQLComposerDialog()
{
// Besides avoid memory leaks, this is usefull since QSciAPIs::prepare()
// Besides avoid memory leaks, this is useful since QSciAPIs::prepare()
// starts a thread. If the dialog was killed before the thread had started,
// he could run against a dead widget. This can happen in unit tests.
delete mQueryEdit->lexer()->apis();
@ -162,7 +162,7 @@ void QgsSQLComposerDialog::accept()
if ( !mSQLValidatorCallback->isValid( sql(), errorMsg ) )
{
if ( errorMsg.isEmpty() )
errorMsg = tr( "An error occured during evaluation of the SQL statement" );
errorMsg = tr( "An error occurred during evaluation of the SQL statement" );
QMessageBox::critical( this, tr( "SQL error" ), errorMsg );
return;
}

2
src/gui/raster/qgsrasterhistogramwidget.h
View File

@ -62,7 +62,7 @@ class GUI_EXPORT QgsRasterHistogramWidget : public QWidget, private Ui::QgsRaste
signals:
/**
* Emmited when something on the widget has changed.
* Emitted when something on the widget has changed.
* All widgets will fire this event to notify of an internal change.
*/
void widgetChanged();

2
src/gui/raster/qgsrasterrendererwidget.h
View File

@ -61,7 +61,7 @@ class GUI_EXPORT QgsRasterRendererWidget: public QWidget
signals:
/**
* Emmited when something on the widget has changed.
* Emitted when something on the widget has changed.
* All widgets will fire this event to notify of an internal change.
*/
void widgetChanged();

2
src/gui/raster/qgsrastertransparencywidget.h
View File

@ -29,7 +29,7 @@ class GUI_EXPORT QgsRasterTransparencyWidget : public QWidget, private Ui::QgsRa
signals:
/**
* Emmited when something on the widget has changed.
* Emitted when something on the widget has changed.
* All widgets will fire this event to notify of an internal change.
*/
void widgetChanged();

2
src/gui/raster/qgsrendererrasterpropertieswidget.h
View File

@ -38,7 +38,7 @@ class GUI_EXPORT QgsRendererRasterPropertiesWidget : public QWidget, private Ui:
signals:
/**
* Emmited when something on the widget has changed.
* Emitted when something on the widget has changed.
* All widgets will fire this event to notify of an internal change.
*/
void widgetChanged();

2
src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
View File

@ -56,7 +56,7 @@ class GUI_EXPORT QgsRendererV2PropertiesDialog : public QDialog, private Ui::Qgs
void layerVariablesChanged();
/**
* Emmited when something on the widget has changed.
* Emitted when something on the widget has changed.
* All widgets will fire this event to notify of an internal change.
*/
void widgetChanged();

2
src/gui/symbology-ng/qgsrendererv2widget.h
View File

@ -83,7 +83,7 @@ class GUI_EXPORT QgsRendererV2Widget : public QWidget
void layerVariablesChanged();
/**
* Emmited when something on the widget has changed.
* Emitted when something on the widget has changed.
* All widgets will fire this event to notify of an internal change.
*/
void widgetChanged();

2
src/providers/wfs/qgswfscapabilities.cpp
View File

@ -41,7 +41,7 @@ bool QgsWFSCapabilities::requestCapabilities( bool synchronous )
const QString& version = mUri.version();
if ( version == QgsWFSConstants::VERSION_AUTO )
// MapServer honours the order with the first value being the prefered one
// MapServer honours the order with the first value being the preferred one
url.addQueryItem( "ACCEPTVERSIONS", "2.0.0,1.1.0,1.0.0" );
else
url.addQueryItem( "VERSION", version );

2
src/providers/wfs/qgswfscapabilities.h
View File

@ -105,7 +105,7 @@ class QgsWFSCapabilities : public QgsWFSRequest
const Capabilities& capabilities() const { return mCaps; }
signals:
//! emitted when the capabilities have been fully parsed, or an error occured */
//! emitted when the capabilities have been fully parsed, or an error occurred */
void gotCapabilities();
private slots:

2
src/providers/wfs/qgswfsfeatureiterator.cpp
View File

@ -830,7 +830,7 @@ void QgsWFSFeatureIterator::featureReceivedSynchronous( QVector<QgsWFSFeatureGml
thisStr.sprintf( "%p", this );
++ mCounter;
mWriterFilename = QDir( QgsWFSUtils::acquireCacheDirectory() ).filePath( QString( "iterator_%1_%2.bin" ).arg( thisStr ).arg( mCounter ) );
QgsDebugMsg( QString( "Transfering feature iterator cache to %1" ).arg( mWriterFilename ) );
QgsDebugMsg( QString( "Transferring feature iterator cache to %1" ).arg( mWriterFilename ) );
mWriterFile = new QFile( mWriterFilename );
if ( !mWriterFile->open( QIODevice::WriteOnly ) )
{

2
src/providers/wfs/qgswfsprovider.cpp
View File

@ -1425,7 +1425,7 @@ bool QgsWFSProvider::getCapabilities()
if ( !foundLayer )
{
QgsMessageLog::logMessage( tr( "Could not find typename %1 in capabilites for url %2" ).
QgsMessageLog::logMessage( tr( "Could not find typename %1 in capabilities for url %2" ).
arg( thisLayerName ).arg( dataSourceUri() ), tr( "WFS" ) );
}

2
src/ui/composer/qgscompositionwidgetbase.ui
View File

@ -454,7 +454,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>If checked, a seperate world file which georeferences exported images will be created</string>
<string>If checked, a separate world file which georeferences exported images will be created</string>
</property>
<property name="text">
<string>Save world file</string>