fix typos

qgis · Feb 1, 2012 · 9e37e34 · 9e37e34
1 parent cc5c8a3
commit 9e37e34
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/doc/CODING.t2t b/doc/CODING.t2t
@@ -34,7 +34,7 @@ Developers guide for QGIS
 %! PostProc(tex): '\\section' '\\newpage\\section'
 %! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
 %! PostProc(tex): NEWPAGE  '\\newpage'
-% Give alternating table rows different colours and use a smaller font in tables (\tiny)
+% Give alternating table rows different colors and use a smaller font in tables (\tiny)
 %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
 %! encoding: iso-8859-1
 

diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
@@ -4,5 +4,5 @@
 RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
 EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c"
 
-egrep --color=always "$RE" -ir .  | egrep -iv "$EX"
-egrep --color=always "$RE" -i resources/context_help/*-en_US
+egrep --exclude-dir=.git --color=always "$RE" -ir .  | egrep -iv "$EX"
+egrep --exclude-dir=.git --color=always "$RE" -i resources/context_help/*-en_US
diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -453,3 +453,4 @@ intersecton:intersection
 intersectons:intersections
 secific:specific
 writeable:writable
+vaild:valid
diff --git a/src/analysis/raster/qgsrelief.cpp b/src/analysis/raster/qgsrelief.cpp
@@ -280,7 +280,7 @@ int QgsRelief::processRaster( QProgressDialog* p )
 bool QgsRelief::processNineCellWindow( float* x1, float* x2, float* x3, float* x4, float* x5, float* x6, float* x7, float* x8, float* x9,
                                        unsigned char* red, unsigned char* green, unsigned char* blue )
 {
-  //1. component: colour and hillshade from 300 degrees
+  //1. component: color and hillshade from 300 degrees
   int r = 0;
   int g = 0;
   int b = 0;

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -344,7 +344,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
     }
 
     // why is this: it overrides the default cursor in the splitter in the dialog
-    // commenting it now till somebody tells us why it is neccesary :-)
+    // commenting it now till somebody tells us why it is necessary :-)
     //QApplication::setOverrideCursor( Qt::ArrowCursor );
 
     if ( mySelector->exec() )
@@ -2496,7 +2496,7 @@ void QgisApp::addWfsLayer()
   connect( wfss , SIGNAL( addWfsLayer( QString, QString ) ),
            this , SLOT( addWfsLayer( QString, QString ) ) );
 
-  //reenable wfs with extent setting: pass canvas info to source select
+  //re-enable wfs with extent setting: pass canvas info to source select
   wfss->setProperty( "MapExtent", mMapCanvas->extent().toString() );
   if ( mMapCanvas->mapRenderer()->hasCrsTransformEnabled() )
   { //if "on the fly" reprojection is active, pass canvas CRS

diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -272,15 +272,15 @@ void QgsFieldCalculator::setOkButtonState()
   okButton->setToolTip("");
 
   bool emptyFieldName = mOutputFieldNameLineEdit->text().isEmpty();
-  bool expressionVaild = builder->isExpressionValid();
+  bool expressionValid = builder->isExpressionValid();
 
   if ( emptyFieldName )
       okButton->setToolTip( tr("Please enter a field name") );
 
-  if ( !expressionVaild )
-      okButton->setToolTip( okButton->toolTip() + tr("\n The expression is invaild see (more info) for details") );
+  if ( !expressionValid )
+      okButton->setToolTip( okButton->toolTip() + tr("\n The expression is invalid see (more info) for details") );
 
-  bool okEnabled = ( !emptyFieldName || mUpdateExistingGroupBox->isChecked() ) && expressionVaild;
+  bool okEnabled = ( !emptyFieldName || mUpdateExistingGroupBox->isChecked() ) && expressionValid;
 
   okButton->setEnabled( okEnabled );
 }