Skip to content

Commit cbf1a50

Browse files
author
jef
committed
fix common typos
git-svn-id: http://svn.osgeo.org/qgis/trunk@12528 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3e7a103 commit cbf1a50

File tree

102 files changed

+648
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+648
-219
lines changed

BUGS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Some hints about when you should file a bug:
2121
- always provide contact details and make sure you are subscribed to the
2222
ticket entry (either by adding yourself to CC field or by logging in before
2323
filing the ticket).
24-
- dont be offended if we don't see tickets as having the same priority as you
24+
- don't be offended if we don't see tickets as having the same priority as you
2525
do. While we appreciate it's inconvenient if some issue prevents you doing
2626
your work, we need to take the big picture view of things and focus on
2727
things that affect the largest proportion of our user base.

CODING

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ To check out QGIS HEAD:
473473

474474
You can use the following commands to perform an anonymous checkout from the
475475
QGIS Subversion repository. Note we recommend checking out the trunk (unless
476-
you are a developer or really HAVE to have the latest changes and dont mind
476+
you are a developer or really HAVE to have the latest changes and don't mind
477477
lots of crashing!).
478478

479479
You must have a subversion client installed prior to checking out the code. See
@@ -684,7 +684,7 @@ patch e.g.
684684
QGIS developers are busy folk. We do scan the incoming patches on bug reports
685685
but sometimes we miss things. Don't be offended or alarmed. Try to identify a
686686
developer to help you - using the ["Project Organigram"] and contact them
687-
asking them if they can look at your patch. If you dont get any response, you
687+
asking them if they can look at your patch. If you don't get any response, you
688688
can escalate your query to one of the Project Steering Committee members
689689
(contact details also available on the ["Project Organigram"]).
690690

@@ -765,7 +765,7 @@ Commit your changes
765765

766766

767767
Your editor (as defined in $EDITOR environment variable) will appear and you
768-
should make a comment at the top of the file (above the area that says 'dont
768+
should make a comment at the top of the file (above the area that says 'don't
769769
change this'. Put a descriptive comment and rather do several small commits if
770770
the changes across a number of files are unrelated. Conversely we prefer you to
771771
group related changes into a single commit.
@@ -970,7 +970,7 @@ the bug and reran the unit test and the regression test passed. I committed the
970970
regression test along with the bug fix. Now if anybody breakes this in the
971971
source code again in the future, we can immediatly identify that the code has
972972
regressed. Better yet before committing any changes in the future, running our
973-
tests will ensure our changes dont have unexpected side effects - like breaking
973+
tests will ensure our changes don't have unexpected side effects - like breaking
974974
existing functionality.
975975

976976
There is one more benifit to regression tests - they can save you time. If you
@@ -1371,7 +1371,7 @@ guidelines are followed in layout and design of GUIs.
13711371
capital letter, and all remaing words written with lower case first letters
13721372
3. Do not end labels for widgets or group boxes with a colon:
13731373
Adding a colon causes visual noise and does not impart additional meaning,
1374-
so dont use them. An exception to this rule is when you have two labels next
1374+
so don't use them. An exception to this rule is when you have two labels next
13751375
to each other e.g.: Label1 Plugin (Path:) Label2 [/path/to/plugins]
13761376
4. Keep harmful actions away from harmless ones:
13771377
If you have actions for 'delete', 'remove' etc, try to impose adequate space

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ POSSIBILITY OF SUCH DAMAGES.
282282
In addition, as a special exception, the QGIS Development Team gives
283283
permission to link the code of this program with the Qt library,
284284
including but not limited to the following versions (both free and
285-
commercial): Qt/Non-commerical Windows, Qt/Windows, Qt/X11, Qt/Mac, and
285+
commercial): Qt/Non-commercial Windows, Qt/Windows, Qt/X11, Qt/Mac, and
286286
Qt/Embedded (or with modified versions of Qt that use the same license
287287
as Qt), and distribute linked combinations including the two. You must
288288
obey the GNU General Public License in all respects for all of the code

ChangeLog

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Version 1.2.0 'Daphnis'
9797
** - add support for data defined symbols
9898
** - add support for font symbol markers (only data defined - no gui yet)
9999
** - add symbol size in map units (ie. symbols that keep the size in mapunits
100-
** independant of the mapscale)
100+
** independent of the mapscale)
101101
**
102102
** Command line arguments:
103103
**
@@ -185,7 +185,7 @@ Version 1.0.0 'Kore'
185185
Version 0.11.0 'Metis'
186186
** This release includes over 60 bug fixes and enhancements over the
187187
** QGIS 0.10.0 release. In addition we have made the following changes:
188-
** Revision of all dialogs for user interface consistancy
188+
** Revision of all dialogs for user interface consistency
189189
** Improvements to unique value renderer vector dialog
190190
** Symbol previews when defining vector classes
191191
** Separation of python support into its own library
@@ -206,7 +206,7 @@ Version 0.10.0 'Io'
206206
** in raster layers. Support for color ramps in raster layers.
207207
** Support for non-north up rasters. Many other raster
208208
** improvements 'under the hood'.
209-
** Updated icons for improved visual consistancy.
209+
** Updated icons for improved visual consistency.
210210
** Support for migration of old projects to work in newer QGIS versions.
211211
Version 0.9.2rc1 'Ganymede'
212212
** This release candidate includes over 40 bug fixes and enchancements
@@ -309,7 +309,7 @@ very well tested at this stage but works for me with my test dataset
309309
2005-04-17 [timlinux] 0.6devel17
310310
** Custom Projection dialog. Various bugfixes plus delete, insert and update of new
311311
records possible. User projections now whow in projection selector but are
312-
still not useable
312+
still not usable
313313
2005-04-16 [ges] 0.6.0devel16
314314
** Fixed bug 1177637 that prevented a PostgreSQL connection from being
315315
completely deleted
@@ -861,7 +861,7 @@ linking with -rdynamic and using dlopen()'s RTLD_GLOBAL flag.
861861

862862
** Moved raster load stuff to a group at the end of qgisapp.cpp file.
863863

864-
** Removed generically useable raster fns from qgisapp to static methods of qgsrasterlayer.
864+
** Removed generically usable raster fns from qgisapp to static methods of qgsrasterlayer.
865865

866866
** Some renaming of variable names etc.
867867

@@ -870,7 +870,7 @@ linking with -rdynamic and using dlopen()'s RTLD_GLOBAL flag.
870870

871871
2004-06-13 [ts] 0.3.0devel33
872872

873-
** Globally changed legen item fonts to arial 10pt for consistancy with rest of ui. Will soft
873+
** Globally changed legen item fonts to arial 10pt for consistency with rest of ui. Will soft
874874
code in qgsoptions in next release.
875875

876876
2004-06-13 [ts] 0.3.0devel32
@@ -1113,7 +1113,7 @@ of qt designer...
11131113
2004-05-18 [ts] 0.2.0devel24
11141114
** Relax checking of raster filetype extensions to cater for filetypes where
11151115
extension is unpredictable (e.g. grass).
1116-
Now I use gdal to quickly check if a file is useable so pretty much anything
1116+
Now I use gdal to quickly check if a file is usable so pretty much anything
11171117
gdal iscompile with should get through if you have chosen wildcard
11181118
filter in add raster dialog.
11191119

@@ -1343,7 +1343,7 @@ Probably more cleaning in the Makefiles needed
13431343
drawn!) before snapshot is taken.
13441344

13451345
2004-03-27 [jobi] 0.1.0devel17
1346-
** autogen.sh now passes paramters to configure
1346+
** autogen.sh now passes parameters to configure
13471347
** fixed tools/qgiscommit by using mktemp, thanx mcoletti
13481348
** pluginpath is now taken of libdir to be 64bit compliant (e.g. /usr/lib64/qgis)
13491349

@@ -1471,7 +1471,7 @@ Version 0.1 'Moroz' February 25, 2004
14711471
based on Everaldo's Crystal icon set.
14721472
**QGIS can load layers and / or a project on start up by specifying these
14731473
on the command line.
1474-
**Symbol renderers for simple, graduated, and continous symbols
1474+
**Symbol renderers for simple, graduated, and continuous symbols
14751475
**Raster support for most GDAL formats
14761476
**Raster implementation supports a variety of rendering settings including
14771477
semi transparent overlays, pallette inversion, flexible band to colour mapping

INSTALL

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2199,9 +2199,6 @@ Build the ALL_BUILD project. This will build all the QGIS binaries along with al
21992199
8. Building under Windows using MSVC Express
22002200
============================================
22012201

2202-
/!\ Note: Building under MSVC is still a work in progress. In particular the
2203-
following dont work yet: python, grass, postgis connections.
2204-
22052202
/!\ This section of the document is in draft form and is not ready to be used
22062203
yet.
22072204

@@ -2268,7 +2265,7 @@ First thing we need to get is MSVC Express from here:
22682265

22692266
http://msdn2.microsoft.com/en-us/express/aa975050.aspx
22702267

2271-
The page is really confusing so dont feel bad if you cant actually find the
2268+
The page is really confusing so don't feel bad if you cant actually find the
22722269
download at first! There are six coloured blocks on the page for the various
22732270
studio family members (vb / c# / j# etc). Simply choose your language under
22742271
the 'select your language' combo under the yellow C++ block, and your download
@@ -2485,7 +2482,7 @@ and replace it with this one:
24852482
==========================
24862483

24872484
Right click on 'My computer' then select the 'Advanced' tab. Click environment variables and
2488-
create or augment the following '''System''' variables (if they dont already exist):
2485+
create or augment the following '''System''' variables (if they don't already exist):
24892486

24902487

24912488
Variable Name: Value:

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ README for QGIS version 1.4 'Enceladus'
33
Quantum GIS (QGIS) is an Open Source Geographic Information System. The
44
project was born in May of 2002 and was established as a project on
55
SourceForge in June of the same year. We've worked hard to make GIS
6-
software (which is traditionaly expensive commerical software) a viable
6+
software (which is traditionaly expensive commercial software) a viable
77
prospect for anyone with basic access to a Personal Computer. QGIS
88
currently runs on most Unix platforms, Windows, and OS X. QGIS is
99
developed using the Qt toolkit (http://www.trolltech.com) and C++. This

debian/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ qgis (1.1.0) UNRELEASED; urgency=low
6666
* gridmaker plugin removed from package
6767
* updated mime support
6868
* sync with debian-gis debian/ tree
69-
- introduce arch-independant qgis-common and
69+
- introduce arch-independent qgis-common and
7070
qgis-plugin-grass-common
7171
- policy updated to 3.8.0
7272
- join libqgis1-core and libqgis1-gui to libqgis1
7373
- add debian/watch
7474
- dh_lintian overrides
7575
- fix qgis.desktop
7676
- fix license reference in copyright
77-
* introduce arch-independant python-qgis-common
77+
* introduce arch-independent python-qgis-common
7878
* added sharedmimeinfo
7979
* remove dpatch
8080

doc/CODING.t2t

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Developers guide for QGIS
2020
%moinmoin formatted documentation by running txt2tags on this document. See the
2121
%txt2tags home page for more details. Please insert manual line breaks in this
2222
%document as it makes diffing for changes much easier. To do this in vim
23-
%automatically, select a section then issue (gq) command. Please dont
23+
%automatically, select a section then issue (gq) command. Please don't
2424
%apply vim formatting to the whole document as it screws up some formatting
2525
%rather apply it selectively to paragraphs where needed.
2626

@@ -389,7 +389,7 @@ To check out QGIS HEAD:
389389
== Anonymous Access ==
390390
You can use the following commands to perform an anonymous checkout from the
391391
QGIS Subversion repository. Note we recommend checking out the trunk (unless
392-
you are a developer or really HAVE to have the latest changes and dont mind
392+
you are a developer or really HAVE to have the latest changes and don't mind
393393
lots of crashing!).
394394

395395
You must have a subversion client installed prior to checking out the code. See
@@ -578,7 +578,7 @@ svn diff > bug7887fix.diff
578578
QGIS developers are busy folk. We do scan the incoming patches on bug reports
579579
but sometimes we miss things. Don't be offended or alarmed. Try to identify a
580580
developer to help you - using the ["Project Organigram"] and contact them
581-
asking them if they can look at your patch. If you dont get any response, you
581+
asking them if they can look at your patch. If you don't get any response, you
582582
can escalate your query to one of the Project Steering Committee members
583583
(contact details also available on the ["Project Organigram"]).
584584

@@ -660,7 +660,7 @@ svn commit src/pluguns/grass/modules/foo.xml
660660
```
661661

662662
Your editor (as defined in $EDITOR environment variable) will appear and you
663-
should make a comment at the top of the file (above the area that says 'dont
663+
should make a comment at the top of the file (above the area that says 'don't
664664
change this'. Put a descriptive comment and rather do several small commits if
665665
the changes across a number of files are unrelated. Conversely we prefer you to
666666
group related changes into a single commit.
@@ -861,7 +861,7 @@ the bug and reran the unit test and the regression test passed. I committed the
861861
regression test along with the bug fix. Now if anybody breakes this in the
862862
source code again in the future, we can immediatly identify that the code has
863863
regressed. Better yet before committing any changes in the future, running our
864-
tests will ensure our changes dont have unexpected side effects - like breaking
864+
tests will ensure our changes don't have unexpected side effects - like breaking
865865
existing functionality.
866866

867867
There is one more benifit to regression tests - they can save you time. If you
@@ -1253,7 +1253,7 @@ guidelines are followed in layout and design of GUIs.
12531253
capital letter, and all remaing words written with lower case first letters
12541254
+ Do not end labels for widgets or group boxes with a colon:
12551255
Adding a colon causes visual noise and does not impart additional meaning,
1256-
so dont use them. An exception to this rule is when you have two labels next
1256+
so don't use them. An exception to this rule is when you have two labels next
12571257
to each other e.g.: Label1 [Plugin Path:] Label2 [/path/to/plugins]
12581258
+ Keep harmful actions away from harmless ones:
12591259
If you have actions for 'delete', 'remove' etc, try to impose adequate space

doc/INSTALL.t2t

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Building QGIS from source - step by step
1818
%moinmoin formatted documentation by running txt2tags on this document. See the
1919
%txt2tags home page for more details. Please insert manual line breaks in this
2020
%document as it makes diffing for changes much easier. To do this in vim
21-
%automatically, select a section then issue (gq) command. Please dont
21+
%automatically, select a section then issue (gq) command. Please don't
2222
%apply vim formatting to the whole document as it screws up some formatting
2323
%rather apply it selectively to paragraphs where needed.
2424

@@ -1938,9 +1938,6 @@ Build the ALL_BUILD project. This will build all the QGIS binaries along with al
19381938

19391939
= Building under Windows using MSVC Express =
19401940

1941-
/!\ Note: Building under MSVC is still a work in progress. In particular the
1942-
following dont work yet: python, grass, postgis connections.
1943-
19441941
/!\ This section of the document is in draft form and is not ready to be used
19451942
yet.
19461943

@@ -2001,7 +1998,7 @@ First thing we need to get is MSVC Express from here:
20011998

20021999
http://msdn2.microsoft.com/en-us/express/aa975050.aspx
20032000

2004-
The page is really confusing so dont feel bad if you cant actually find the
2001+
The page is really confusing so don't feel bad if you cant actually find the
20052002
download at first! There are six coloured blocks on the page for the various
20062003
studio family members (vb / c# / j# etc). Simply choose your language under
20072004
the 'select your language' combo under the yellow C++ block, and your download
@@ -2215,7 +2212,7 @@ and replace it with this one:
22152212
== Environment Variables ==
22162213

22172214
Right click on 'My computer' then select the 'Advanced' tab. Click environment variables and
2218-
create or augment the following '''System''' variables (if they dont already exist):
2215+
create or augment the following '''System''' variables (if they don't already exist):
22192216

22202217
```
22212218
Variable Name: Value:

doc/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ <h2>Whats new in Version 1.2.0?</h2>
222222
- add support for data defined symbol(name)s
223223
- add support for font symbol markers (only data defined - no gui yet)
224224
- add symbol size in map units (ie. symbols that keep the size in mapunits
225-
independant of the mapscale)
225+
independent of the mapscale)
226226

227227
Command line arguments:
228228

ms-windows/Installer-Files/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
In addition, as a special exception, the QGIS Development Team gives
1919
permission to link the code of this program with the Qt library,
2020
including but not limited to the following versions (both free and
21-
commercial): Qt/Non-commerical Windows, Qt/Windows, Qt/X11, Qt/Mac,
21+
commercial): Qt/Non-commercial Windows, Qt/Windows, Qt/X11, Qt/Mac,
2222
and Qt/Embedded (or with modified versions of Qt that use the same
2323
license as Qt), and distribute linked combinations including the two.
2424
You must obey the GNU General Public License in all respects for all

python/core/qgscoordinatereferencesystem.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ class QgsCoordinateReferenceSystem
121121
*/
122122
bool createFromProj4 (const QString theProjString);
123123

124-
/*! Find out whether this CRS is correctly initialised and useable */
124+
/*! Find out whether this CRS is correctly initialised and usable */
125125
bool isValid() const;
126126
/*! Perform some validation on this CRS. If the sts doesnt validate the
127127
* default behaviour settings for layers with unknown CRS will be
128128
* consulted and acted on accordingly. By hell or high water this
129129
* method will do its best to make sure that this CRS is valid - even
130130
* if that involves resorting to a hard coded default of geocs:wgs84.
131131
*
132-
* @note It is not usually neccessary to use this function, unless you
132+
* @note It is not usually necessary to use this function, unless you
133133
* are trying to force theis srs to be valid.
134134
*/
135135
void validate();

python/core/qgsgeometry.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ not disjoint with existing polygons of the feature*/
199199
@return 0 in case of success*/
200200
int transform( const QgsCoordinateTransform& ct );
201201

202-
/**Splits this geometry according to a given line. Note that the geometry is only splitted once. If there are several intersections
202+
/**Splits this geometry according to a given line. Note that the geometry is only split once. If there are several intersections
203203
between geometry and splitLine, only the first one is considered.
204204
@param splitLine the line that splits the geometry
205205
@param newGeometrys OUT: list of new geometries that have been created with the split

python/core/qgsgraduatedsymbolrenderer.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ class QgsGraduatedSymbolRenderer : QgsRenderer
2222

2323
/** Get the mode - which is only really used to be able to reinstate
2424
* the graduated dialog properties properly, so we
25-
* dont do anything else besides accessors and mutators in
25+
* don't do anything else besides accessors and mutators in
2626
* this class.
2727
*/
2828
const Mode mode() const;
2929

3030
/** Set the mode - which is only really used to be able to reinstate
3131
* the graduated dialog properties properly, so we
32-
* dont do anything else besides accessors and mutators in
32+
* don't do anything else besides accessors and mutators in
3333
* this class.
3434
*/
3535
void setMode( Mode theMode );

python/core/qgssnapper.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public:
5050
{
5151
/**Only one snapping result is retured*/
5252
SnapWithOneResult,
53-
/**Several snapping results which have the same position are returned. This is usefull for topological
53+
/**Several snapping results which have the same position are returned. This is useful for topological
5454
editing*/
5555
SnapWithResultsForSamePosition,
5656
/**All results within the given layer tolerances are returned*/

python/core/qgsvectorlayer.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,14 @@ public:
273273

274274
/**Adds a vertex to segments which intersect point p but don't
275275
already have a vertex there. If a feature already has a vertex at position p,
276-
no additional vertex is inserted. This method is usefull for topological
276+
no additional vertex is inserted. This method is useful for topological
277277
editing.
278278
@param p position of the vertex
279279
@return 0 in case of success*/
280280
int addTopologicalPoints(const QgsPoint& p);
281281

282282
/**Inserts vertices to the snapped segments.
283-
This is usefull for topological editing if snap to segment is enabled.
283+
This is useful for topological editing if snap to segment is enabled.
284284
@param snapResults results collected from the snapping operation
285285
@return 0 in case of success*/
286286
int insertSegmentVerticesForSnap(const QList<QgsSnappingResult>& snapResults);

0 commit comments

Comments
 (0)