diff --git a/python/core/qgstracer.sip b/python/core/qgstracer.sip
index df31060d93c..12e1cd1c863 100644
--- a/python/core/qgstracer.sip
+++ b/python/core/qgstracer.sip
@@ -48,7 +48,7 @@ class QgsTracer : QObject
enum PathError
{
ErrNone, //!< No error
- ErrTooManyFeatures, //!< Max feature count treshold was reached while reading features
+ ErrTooManyFeatures, //!< Max feature count threshold was reached while reading features
ErrPoint1, //!< Start point cannot be joined to the graph
ErrPoint2, //!< End point cannot be joined to the graph
ErrNoPath, //!< Points are not connected in the graph
diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
index b007caa2a1c..d14be66ca96 100755
--- a/scripts/chkspelling.sh
+++ b/scripts/chkspelling.sh
@@ -17,6 +17,6 @@
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|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0|debian/tmp|src/plugins/dxf2shp_converter/dxflib"
+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"
egrep --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
index 6f7f06a90d1..fb2a85115b1 100644
--- a/src/app/qgslabelinggui.cpp
+++ b/src/app/qgslabelinggui.cpp
@@ -1115,7 +1115,7 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
"6=Below Left|7=Below|8=Below Right]" ) );
mPointPositionOrderDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::PredefinedPositionOrder ),
QgsDataDefinedButton::String,
- tr( "Comma seperated list of placements in order of priority
" )
+ tr( "Comma separated list of placements in order of priority
" )
+ QLatin1String( "[TL=Top left|TSL=Top, slightly left|T=Top middle|
"
"TSR=Top, slightly right|TR=Top right|
"
"L=Left|R=Right|
"
diff --git a/src/core/qgstracer.cpp b/src/core/qgstracer.cpp
index e22709719eb..80ea2b0019f 100644
--- a/src/core/qgstracer.cpp
+++ b/src/core/qgstracer.cpp
@@ -428,7 +428,7 @@ void extractLinework( const QgsGeometry* g, QgsMultiPolyline& mpl )
break;
default:
- break; // unkown type - do nothing
+ break; // unknown type - do nothing
}
}
diff --git a/src/core/qgstracer.h b/src/core/qgstracer.h
index 433eb2d4089..620e12f3ba4 100644
--- a/src/core/qgstracer.h
+++ b/src/core/qgstracer.h
@@ -75,7 +75,7 @@ class CORE_EXPORT QgsTracer : public QObject
enum PathError
{
ErrNone, //!< No error
- ErrTooManyFeatures, //!< Max feature count treshold was reached while reading features
+ ErrTooManyFeatures, //!< Max feature count threshold was reached while reading features
ErrPoint1, //!< Start point cannot be joined to the graph
ErrPoint2, //!< End point cannot be joined to the graph
ErrNoPath, //!< Points are not connected in the graph
diff --git a/src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui b/src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui
index 9d32a20b3a6..53a21ff6918 100644
--- a/src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui
+++ b/src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui
@@ -194,7 +194,7 @@
-
- Display ressource path
+ Display resource path
true