spelling fixes

qgis · Jun 23, 2013 · 146233388c6086dcb274b0a9741c34f167e4650e · 1462333
1 parent 3854086
commit 146233388c6086dcb274b0a9741c34f167e4650e
diff --git a/python/core/composer/qgscomposition.sip b/python/core/composer/qgscomposition.sip
@@ -229,7 +229,7 @@ class QgsComposition : QGraphicsScene
     /**Remove custom snap line (and delete the object)*/
     void removeSnapLine( QGraphicsLineItem* line );
     /**Get nearest snap line
-     * @note not availabel in python bindings
+     * @note not available in python bindings
      */
     // QGraphicsLineItem* nearestSnapLine( bool horizontal, double x, double y, double tolerance, QList< QPair< QgsComposerItem*, QgsComposerItem::ItemPositionMode > >& snappedItems );
     /**Hides / shows custom snap lines*/

diff --git a/python/pyplugin_installer/installer_data.py b/python/pyplugin_installer/installer_data.py
@@ -70,14 +70,14 @@
     "status" unicode,                           # ( not installed | new ) | ( installed | upgradeable | orphan | newer )
     "error" unicode,                            # NULL | broken | incompatible | dependent
     "error_details" unicode,                    # more details
-    "experimental" boolean,                     # choosen version: experimental or stable?
-    "version_available" unicode,                # choosen version: version
-    "zip_repository" unicode,                   # choosen version: the remote repository id
-    "download_url" unicode,                     # choosen version: url for downloading
-    "filename" unicode,                         # choosen version: the zip file to be downloaded
-    "downloads" unicode,                        # choosen version: number of dowloads
-    "average_vote" unicode,                     # choosen version: average vote
-    "rating_votes" unicode,                     # choosen version: number of votes
+    "experimental" boolean,                     # chosen version: experimental or stable?
+    "version_available" unicode,                # chosen version: version
+    "zip_repository" unicode,                   # chosen version: the remote repository id
+    "download_url" unicode,                     # chosen version: url for downloading
+    "filename" unicode,                         # chosen version: the zip file to be downloaded
+    "downloads" unicode,                        # chosen version: number of dowloads
+    "average_vote" unicode,                     # chosen version: average vote
+    "rating_votes" unicode,                     # chosen version: number of votes
     "stable:version_available" unicode,         # stable version found in repositories
     "stable:download_source" unicode,
     "stable:download_url" unicode,

diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
@@ -17,7 +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)|context_help|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"
+EX="\.(svn-base|tmp|xpm|ts)|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"
 
 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
@@ -32,6 +32,7 @@ neccesary:necessary
 devided:divided
 variantions:variations
 availale:available
+availabel:available
 attemps:attempts
 forse:force
 adresses:addresses

diff --git a/src/app/pluginmanager/metadata b/src/app/pluginmanager/metadata
@@ -21,7 +21,7 @@ available           true | false
 status              not installed | new    |   upgradeable | orphan | downgradeable *
 error               NULL | broken | incompatible | dependent
 error_details
-experimental        choosen version status
+experimental        chosen version status
 version_available
 zip_repository      the remote repository id
 download_url
@@ -34,4 +34,4 @@ rating_votes        number of votes
 available, installed. version_available, version_installed.
 orphan = installed and not available to download;
 new = not installed and seen for the first time;
-downgradeable = the available version is lower than installed one.
+downgradeable = the available version is lower than installed one.
diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -283,7 +283,7 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
     /**Remove custom snap line (and delete the object)*/
     void removeSnapLine( QGraphicsLineItem* line );
     /**Get nearest snap line
-     * @note not availabel in python bindings
+     * @note not available in python bindings
      */
     QGraphicsLineItem* nearestSnapLine( bool horizontal, double x, double y, double tolerance, QList< QPair< QgsComposerItem*, QgsComposerItem::ItemPositionMode > >& snappedItems );
     /**Hides / shows custom snap lines*/

diff --git a/src/core/raster/qgsrasterdrawer.cpp b/src/core/raster/qgsrasterdrawer.cpp
@@ -84,7 +84,7 @@ void QgsRasterDrawer::drawImage( QPainter* p, QgsRasterViewPort* viewPort, const
   p->save();
   p->setRenderHint( QPainter::Antialiasing, false );
 
-  // Blending problem was reported with PDF output if backgroud color has alpha < 255
+  // Blending problem was reported with PDF output if background color has alpha < 255
   // in #7766, it seems to be a bug in Qt, setting a brush with alpha 255 is a workaround
   // which should not harm anything
   p->setBrush( QBrush( QColor( Qt::white ), Qt::NoBrush ) );