Skip to content

Commit

Permalink
spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 23, 2013
1 parent 3854086 commit 1462333
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposition.sip
Expand Up @@ -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*/
Expand Down
16 changes: 8 additions & 8 deletions python/pyplugin_installer/installer_data.py
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions scripts/chkspelling.sh
Expand Up @@ -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
1 change: 1 addition & 0 deletions scripts/spelling.dat
Expand Up @@ -32,6 +32,7 @@ neccesary:necessary
devided:divided
variantions:variations
availale:available
availabel:available
attemps:attempts
forse:force
adresses:addresses
Expand Down
4 changes: 2 additions & 2 deletions src/app/pluginmanager/metadata
Expand Up @@ -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
Expand All @@ -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.
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposition.h
Expand Up @@ -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*/
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterdrawer.cpp
Expand Up @@ -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 ) );
Expand Down

0 comments on commit 1462333

Please sign in to comment.